Commit Graph
24 Commits
Author SHA1 Message Date
Robin Speekenbrink 62daf025f0 updated documentation for mentioning images vs containers
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
Sven Dowideit 775ca94cb2 Merge pull request #5957 from cgwalters/manpage-typo
docker-run.1: Fix typo 'priviledged'
Upstream-commit: f00c2e5007cb7843c2bcea53e4a86835d3d5a958
Component: engine
2014-05-28 22:43:46 +10:00
Zac Dover 2d0986f24f fixed spacing, removed extraneous line
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Upstream-commit: 2bbf87504bc9eb6ee9a4694ce4d1d98287bccbc9
Component: engine
2014-05-28 03:32:52 +10:00
Zac Dover 4c7d9e6500 Dockerfile.5.md stub
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
Upstream-commit: 41a913b3906348f6ec3f1929e6d33926c84c1bf1
Component: engine
2014-05-26 15:57:20 +10:00
Brian Goff a2fa77b792 Fixes some docs issues with using single-dash arguments where they should be double
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6d9e64b27bbee9bb699ebc0f0ff98bb7f56961b3
Component: engine
2014-05-21 09:35:22 -04:00
Colin Walters 5793c36d34 man/docker-run.1: Fix typo 'priviledged', add missing closing brackets
Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org> (github: cgwalters)
Upstream-commit: cfe7211a2241b5e898af11445a2470032b0ab242
Component: engine
2014-05-21 07:00:38 -04:00
Dan Walsh 09681d4edc Add description of --volume read-only/read-write to docker-run man page.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 2e0d47e5c4c63323623c38cf0ca8d63efab8b493
Component: engine
2014-05-16 15:06:34 -04:00
Dan Keder bd987eeae1 Fix a typo in contrib/man/md/docker.1.md
Upstream-commit: 653328c6cef8bab89343587b134ba7676ee39867
Component: engine
2014-05-13 11:17:42 +02:00
Dan Walsh acd8c3ad90 Fix docker man page to reference selinux-enable flag
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: e625bad3d7e5eb08568cbd09d9d574b8c63fd203
Component: engine
2014-05-05 08:41:21 -04:00
William Henry 6f36448e8e Fixed some missing ']' and the TAG
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.1.md
Upstream-commit: a6fd2c237ecca330554ec8bdaf7b2acfe68de1ce
Component: engine
2014-04-22 22:35:59 -06:00
William Henry ef2162c78d Merge branch 'man1-assumption' of https://github.com/tianon/docker into manpages
Upstream-commit: 687653e59980e35e07521aff7a5cd87b4b0d3be6
Component: engine
2014-04-22 22:21:39 -06:00
William Henry 107ba1c425 Fixed an missing '-' on the "--rm"
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.md
Upstream-commit: a5b4a907485c76088d02226df62b0a27bd76117f
Component: engine
2014-04-22 22:17:33 -06:00
Tianon Gravi 20d84aa049 Update contributed man page file names and compilation script for the eventual possibility of non-man1 man pages (hopefully a Dockerfile.5.md, for example)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f763075c74aeb8a829cb310164f36015fb4bc806
Component: engine
2014-04-22 06:43:08 -06:00
William Henry c9094c699e Changed Image to image.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/README.md
Upstream-commit: ac8c705c952b7151cc0bf075742146cac3b93cac
Component: engine
2014-04-21 14:37:08 -06:00
William Henry 8fc8d36610 Further edtis based on comments.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/README.md
	modified:   contrib/man/md/docker-build.md
	modified:   contrib/man/md/docker-cp.md
	modified:   contrib/man/md/docker-logs.md
	modified:   contrib/man/md/docker-push.md
Upstream-commit: 73257a72ea15cbe67f40cf516129695fae65be33
Component: engine
2014-04-21 14:28:25 -06:00
William Henry 486dbb873e Edits based on Sven's comments.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.md
	modified:   contrib/man/md/docker-commit.md
Upstream-commit: bbde4298a5c8e12afb6a7bc81c3634b97c2a3c7d
Component: engine
2014-04-21 11:55:06 -06:00
William Henry 943ce0ecc6 Fixed a sentence for ostezer.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

	modified:   contrib/man/md/README.md
Upstream-commit: 7922e67870a393417c88c2d27f0e8fac47e4596e
Component: engine
2014-04-21 10:42:46 -07:00
William Henry aaa3eed5ae Made some edits and removed the alternative, manual generation instructions.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/README.md
Upstream-commit: 95c311c8b4c63d81792c8683da677b790edf4000
Component: engine
2014-04-21 10:42:46 -07:00
William Henry 8b619b4b65 Edits based on ostezer's feedback.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Upstream-commit: 1b2b783b52d76c7dae2958e6c53dcc3e665cd2fb
Component: engine
2014-04-21 10:42:46 -07:00
Tianon Gravi 221acbe18c Update hack/make/ubuntu to use the new markdown-based manpages
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e55ed741c24fe9e974d08f4893c79752fb279dc4
Component: engine
2014-04-21 10:42:46 -07:00
William Henry e297e06a1e Added a tag to FROM fedora (fedora:20)
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Upstream-commit: 67a73917c10bfaa265698f3bb054f9af43c61d5d
Component: engine
2014-04-21 10:42:46 -07:00
William Henry 7c5451c8cf Created all manual pages in Markdown. Container for conversion.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

All Docker commands have a Markdown page.
Dockerfile used to build a Fedora based pandoc container.
md2man-all.sh is used inside the container.
README.sh includes an explaination on how to build the fedora/pandoc
          image and how to run the container directly.

 Changes to be committed:
	new file:   contrib/man/md/Dockerfile
	new file:   contrib/man/md/README.md
	new file:   contrib/man/md/docker-attach.md
	new file:   contrib/man/md/docker-build.md
	new file:   contrib/man/md/docker-commit.md
	new file:   contrib/man/md/docker-cp.md
	new file:   contrib/man/md/docker-diff.md
	new file:   contrib/man/md/docker-events.md
	new file:   contrib/man/md/docker-export.md
	new file:   contrib/man/md/docker-history.md
	new file:   contrib/man/md/docker-images.md
	new file:   contrib/man/md/docker-import.md
	new file:   contrib/man/md/docker-info.md
	new file:   contrib/man/md/docker-inspect.md
	new file:   contrib/man/md/docker-kill.md
	new file:   contrib/man/md/docker-load.md
	new file:   contrib/man/md/docker-login.md
	new file:   contrib/man/md/docker-logs.md
	new file:   contrib/man/md/docker-port.md
	new file:   contrib/man/md/docker-ps.md
	new file:   contrib/man/md/docker-pull.md
	new file:   contrib/man/md/docker-push.md
	new file:   contrib/man/md/docker-restart.md
	new file:   contrib/man/md/docker-rm.md
	new file:   contrib/man/md/docker-rmi.md
	new file:   contrib/man/md/docker-run.md
	new file:   contrib/man/md/docker-save.md
	new file:   contrib/man/md/docker-search.md
	new file:   contrib/man/md/docker-start.md
	new file:   contrib/man/md/docker-stop.md
	new file:   contrib/man/md/docker-tag.md
	new file:   contrib/man/md/docker-top.md
	new file:   contrib/man/md/docker-wait.md
	new file:   contrib/man/md/docker.md
	new file:   contrib/man/md/md2man-all.sh
Upstream-commit: 0a0dd1163294bfa92f37c41289e697f0ee4d9747
Component: engine
2014-04-21 10:42:46 -07:00
Tianon Gravi 0de230c821 Fix a few minor man formatting consistency issues
Some flags ended with a colon, some didn't.  For man pages, the prevailing normal practice is not to end the flags lines with colons.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7908725e3f8b3c8a69fc6533f28c6789e4669eb0
Component: engine
2014-04-07 21:38:30 -06:00
William Henry b44d3f0991 Added man pages for several docker commands.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

	new file:   contrib/man/man1/docker-attach.1
	new file:   contrib/man/man1/docker-build.1
	new file:   contrib/man/man1/docker-images.1
	new file:   contrib/man/man1/docker-info.1
	new file:   contrib/man/man1/docker-inspect.1
	new file:   contrib/man/man1/docker-rm.1
	new file:   contrib/man/man1/docker-rmi.1
	new file:   contrib/man/man1/docker-run.1
	new file:   contrib/man/man1/docker-tag.1
	new file:   contrib/man/man1/docker.1
Upstream-commit: da8231a26bc4532ded49f93a82e731694ee6587c
Component: engine
2014-04-07 19:15:28 -06:00