1. docker
  2. Commit f8d9ecfb2ceda0cc2aed3d8fd3fbcbf625a8fcdd
Browse code

missed these merge conflicts when manually rebasing too many files

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

SvenDowideit authored on 2014/07/03 10:07:42
Showing 13 changed files
docs/man/docker-pull.1.md
History View file @ f8d9ecf
... ... 
@@ -51,10 +51,5 @@ There are no available options.
51 51
52 52 
 # HISTORY
53 53 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
54 
-<<<<<<< HEAD
55 
-based on docker.io source material and internal work.
56 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
57 
-=======
58 54 
 based on docker.com source material and internal work.
59 
-
60 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
55 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-push.1.md
History View file @ f8d9ecf
... ... 
@@ -45,9 +45,5 @@ listed.
45 45
46 46 
 # HISTORY
47 47 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
48 
-<<<<<<< HEAD
49 
-based on docker.io source material and internal work.
50 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
51 
-=======
52 48 
 based on docker.com source material and internal work.
53 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
49 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-restart.1.md
History View file @ f8d9ecf
... ... 
@@ -18,10 +18,5 @@ Restart each container listed.
18 18
19 19 
 # HISTORY
20 20 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
21 
-<<<<<<< HEAD
22 
-based on docker.io source material and internal work.
23 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
24 
-=======
25 21 
 based on docker.com source material and internal work.
26 
-
27 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
22 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-rm.1.md
History View file @ f8d9ecf
... ... 
@@ -47,9 +47,5 @@ command. The use that name as follows:
47 47
48 48 
 # HISTORY
49 49 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
50 
-<<<<<<< HEAD
51 
-based on docker.io source material and internal work.
52 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
53 
-=======
54 50 
 based on docker.com source material and internal work.
55 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
51 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-rmi.1.md
History View file @ f8d9ecf
... ... 
@@ -34,9 +34,5 @@ Here is an example of removing and image:
34 34
35 35 
 # HISTORY
36 36 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
37 
-<<<<<<< HEAD
38 
-based on docker.io source material and internal work.
39 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
40 
-=======
41 37 
 based on docker.com source material and internal work.
42 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
38 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-run.1.md
History View file @ f8d9ecf
... ... 
@@ -369,9 +369,5 @@ changes will also be reflected on the host in /var/db.
369 369
370 370 
 # HISTORY
371 371 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
372 
-<<<<<<< HEAD
373 
-based on docker.io source material and internal work.
374 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
375 
-=======
376 372 
 based on docker.com source material and internal work.
377 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
373 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-save.1.md
History View file @ f8d9ecf
... ... 
@@ -33,10 +33,5 @@ fedora image to a fedora-latest.tar:
33 33
34 34 
 # HISTORY
35 35 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
36 
-<<<<<<< HEAD
37 
-based on docker.io source material and internal work.
38 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
39 
-=======
40 36 
 based on docker.com source material and internal work.
41 
-
42 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
37 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-search.1.md
History View file @ f8d9ecf
... ... 
@@ -54,9 +54,5 @@ ranked 1 or higher:
54 54
55 55 
 # HISTORY
56 56 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
57 
-<<<<<<< HEAD
58 
-based on docker.io source material and internal work.
59 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
60 
-=======
61 57 
 based on docker.com source material and internal work.
62 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
58 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-start.1.md
History View file @ f8d9ecf
... ... 
@@ -23,9 +23,5 @@ Start a stopped container.
23 23
24 24 
 # HISTORY
25 25 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
26 
-<<<<<<< HEAD
27 
-based on docker.io source material and internal work.
28 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
29 
-=======
30 26 
 based on docker.com source material and internal work.
31 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
27 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-stop.1.md
History View file @ f8d9ecf
... ... 
@@ -19,9 +19,5 @@ Stop a running container (Send SIGTERM, and then SIGKILL after
19 19
20 20 
 # HISTORY
21 21 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
22 
-<<<<<<< HEAD
23 
-based on docker.io source material and internal work.
24 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
25 
-=======
26 22 
 based on docker.com source material and internal work.
27 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
23 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-tag.1.md
History View file @ f8d9ecf
... ... 
@@ -54,9 +54,5 @@ registry you must tag it with the registry hostname and port (if needed).
54 54
55 55 
 # HISTORY
56 56 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
57 
-<<<<<<< HEAD
58 
-based on docker.io source material and internal work.
59 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
60 
-=======
61 57 
 based on docker.com source material and internal work.
62 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
58 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-top.1.md
History View file @ f8d9ecf
... ... 
@@ -27,10 +27,5 @@ Run **docker top** with the ps option of -x:
27 27
28 28 
 # HISTORY
29 29 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
30 
-<<<<<<< HEAD
31 
-based on docker.io source material and internal work.
32 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
33 
-=======
34 30 
 based on docker.com source material and internal work.
35 
-
36 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
31 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
docs/man/docker-wait.1.md
History View file @ f8d9ecf
... ... 
@@ -24,10 +24,5 @@ There are no available options.
24 24
25 25 
 # HISTORY
26 26 
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
27 
-<<<<<<< HEAD
28 
-based on docker.io source material and internal work.
29 
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
30 
-=======
31 27 
 based on docker.com source material and internal work.
32 
-
33 
->>>>>>> 834ef8a... I'm going to wish I didn't do this
28 
+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>