Skip to content

Commit

Permalink
Merge pull request #6825 from SvenDowideit/fix-man-page-merge-mess
Browse files Browse the repository at this point in the history 
missed these merge conflicts when manually rebasing too many files
  • Loading branch information
Sven Dowideit authored and Sven Dowideit committed Jul 3, 2014
2 parents 9fe95f1 + f8d9ecf commit 6eda9f3
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 70 deletions.
7 changes: 1 addition & 6 deletions docs/man/docker-pull.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-push.1.md
View file
Expand Up @@ -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>
7 changes: 1 addition & 6 deletions docs/man/docker-restart.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-rm.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-rmi.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-run.1.md
View file
Expand Up @@ -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>
7 changes: 1 addition & 6 deletions docs/man/docker-save.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-search.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-start.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-stop.1.md
View file
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions docs/man/docker-tag.1.md
View file
Expand Up @@ -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>
7 changes: 1 addition & 6 deletions docs/man/docker-top.1.md
View file
Expand Up @@ -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>
7 changes: 1 addition & 6 deletions docs/man/docker-wait.1.md
View file
Expand Up @@ -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>

0 comments on commit 6eda9f3

Please sign in to comment.