missed these merge conflicts when manually rebasing too many files

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

13 files changed, 13 insertions, 70 deletions

diff --git a/docs/man/docker-pull.1.md b/docs/man/docker-pull.1.md
index 6fb0dc1000..465c97aadd 100644
--- a/docs/man/docker-pull.1.md
+++ b/docs/man/docker-pull.1.md
@@ -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>
diff --git a/docs/man/docker-push.1.md b/docs/man/docker-push.1.md
index 56d814181d..8523cb539e 100644
--- a/docs/man/docker-push.1.md
+++ b/docs/man/docker-push.1.md
@@ -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>
diff --git a/docs/man/docker-restart.1.md b/docs/man/docker-restart.1.md
index 6f93858ba1..2a08caa5e8 100644
--- a/docs/man/docker-restart.1.md
+++ b/docs/man/docker-restart.1.md
@@ -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>
diff --git a/docs/man/docker-rm.1.md b/docs/man/docker-rm.1.md
index 9195137ec1..1b45376976 100644
--- a/docs/man/docker-rm.1.md
+++ b/docs/man/docker-rm.1.md
@@ -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>
diff --git a/docs/man/docker-rmi.1.md b/docs/man/docker-rmi.1.md
index 7a2973f873..08d740a3be 100644
--- a/docs/man/docker-rmi.1.md
+++ b/docs/man/docker-rmi.1.md
@@ -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>
diff --git a/docs/man/docker-run.1.md b/docs/man/docker-run.1.md
index fa73d8eee4..e7571ac21a 100644
--- a/docs/man/docker-run.1.md
+++ b/docs/man/docker-run.1.md
@@ -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>
diff --git a/docs/man/docker-save.1.md b/docs/man/docker-save.1.md
index 403c3fb614..533b4c8435 100644
--- a/docs/man/docker-save.1.md
+++ b/docs/man/docker-save.1.md
@@ -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>
diff --git a/docs/man/docker-search.1.md b/docs/man/docker-search.1.md
index 061042c7ac..3937b870a3 100644
--- a/docs/man/docker-search.1.md
+++ b/docs/man/docker-search.1.md
@@ -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>
diff --git a/docs/man/docker-start.1.md b/docs/man/docker-start.1.md
index ed9f77b43e..e23fd70ab4 100644
--- a/docs/man/docker-start.1.md
+++ b/docs/man/docker-start.1.md
@@ -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>
diff --git a/docs/man/docker-stop.1.md b/docs/man/docker-stop.1.md
index 14bd7b30e6..0cc19918c3 100644
--- a/docs/man/docker-stop.1.md
+++ b/docs/man/docker-stop.1.md
@@ -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>
diff --git a/docs/man/docker-tag.1.md b/docs/man/docker-tag.1.md
index aae222085f..041c9e1cb5 100644
--- a/docs/man/docker-tag.1.md
+++ b/docs/man/docker-tag.1.md
@@ -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>
diff --git a/docs/man/docker-top.1.md b/docs/man/docker-top.1.md
index 5ba44d697d..9781739cde 100644
--- a/docs/man/docker-top.1.md
+++ b/docs/man/docker-top.1.md
@@ -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>
diff --git a/docs/man/docker-wait.1.md b/docs/man/docker-wait.1.md
index cfa19ef861..798f6d652c 100644
--- a/docs/man/docker-wait.1.md
+++ b/docs/man/docker-wait.1.md
@@ -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>