toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess

Browse Source 
missed these merge conflicts when manually rebasing too many files
Upstream-commit: 6eda9f3207b349b0d2759c70174185bf0d0c09a1
Component: engine
This commit is contained in:
Sven Dowideit
2014-07-03 11:12:13 +10:00
parent 3309d6e15c a07084dd27
commit 6c13e82462
13 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/docs/man/docker-pull.1.md
+1 -6
View File
@@ -51,10 +51,5 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-push.1.md
+1 -5
View File
@@ -45,9 +45,5 @@ listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-restart.1.md
+1 -6
View File
@@ -18,10 +18,5 @@ Restart each container listed.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-rm.1.md
+1 -5
View File
@@ -47,9 +47,5 @@ command. The use that name as follows:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-rmi.1.md
+1 -5
View File
@@ -34,9 +34,5 @@ Here is an example of removing and image:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-run.1.md
+1 -5
View File
@@ -369,9 +369,5 @@ changes will also be reflected on the host in /var/db.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-save.1.md
+1 -6
View File
@@ -33,10 +33,5 @@ fedora image to a fedora-latest.tar:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-search.1.md
+1 -5
View File
@@ -54,9 +54,5 @@ ranked 1 or higher:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-start.1.md
+1 -5
View File
@@ -23,9 +23,5 @@ Start a stopped container.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-stop.1.md
+1 -5
View File
@@ -19,9 +19,5 @@ Stop a running container (Send SIGTERM, and then SIGKILL after
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-tag.1.md
+1 -5
View File
@@ -54,9 +54,5 @@ registry you must tag it with the registry hostname and port (if needed).
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-top.1.md
+1 -6
View File
@@ -27,10 +27,5 @@ Run **docker top** with the ps option of -x:
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
components/engine/docs/man/docker-wait.1.md
+1 -6
View File
@@ -24,10 +24,5 @@ There are no available options.
# HISTORY
April 2014, Originally compiled by William Henry (whenry at redhat dot com)
<<<<<<< HEAD
based on docker.io source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
=======
based on docker.com source material and internal work.
>>>>>>> 834ef8a... I'm going to wish I didn't do this
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>