Commit Graph

219 Commits

Author SHA1 Message Date
3db0ad0993 Improve code/comment/output markings & display consistency
This PR aims to increase the consistency across the docs for
code blocks and code/comment/output markings.

Rule followed here is "what's visible on the screen should be reflected"

Issue:

 - Docs had various code blocks showing: comments, commands & outputs.
 - All three of these items were inconsistently marked.

Some examples as to how this PR aims to introduce improvements:

1. Removed `> ` from in front of the "outputs". Eg,
`    > REPOSITORY                 TAG       ID              CREATED` replaced with:
`    REPOSITORY                 TAG       ID              CREATED`.

2. Introduced `$` for commands. Eg,
`    sudo chkconfig docker on` replaced with:
`    $ sudo chkconfig docker on`

3. Comments:
`    > # ` replaced with:
`    # `.

> Please note:
> Due to a vast amount of items reviewed and changed for this PR, there
> might be some individually incorrect replacements OR patterns of incorrect
> replacements. This PR needs to be reviewed and if there is anything missing,
> it should be improved or amended.

Closes:
https://github.com/dotcloud/docker/issues/5286

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: f87a97f7df838742a602f1984f4552b803e3f92d
Component: engine
2014-05-01 17:52:01 +03:00
549ce4c50e remove rst/sphinx documentation
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: adf04681b4bd7293675b77b2397d87a5361b383b
Component: engine
2014-05-01 15:31:58 +10:00
4821b84026 Addressed regression of private repository documentation.
This adds back in the references to private repositories and
provides some refactoring to the Working with repositories
documentation including updating references to the "Central"
registry to Docker.io.

It also:

* Fixes some links and references to Central Index
* Fixes anchors in other files to updated titles in Working with Repositories.
* Renamed Central Index in the remaining places.
* Updated terms documentation to reflect Docker.io
* Updated some Docker Index naming to be consistent.
* Updates menu labels and hyperlinks.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: a8871b93b95d1220c860987ae1da4e49c943bfea
Component: engine
2014-04-28 16:08:55 -04:00
b6080f6f5b Looking into some broken links, I noticed that we don't need to use
relative paths, and also fixed some broken images.

There are still more todo - next PR I think :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ada86fc5b736d8b3209429c584384fd9974a148a
Component: engine
2014-04-24 22:20:04 +10:00
772ac62a9b Docs auto-conversion fixes and MD marking and structure improvements.
- Remove redundant chars and all errors caused by RST->MD conversion.
   e.g. [/#, /\, \<, />, etc.]
 - Fix broken inter-document links
 - Fix outbound links no-longer active or changed
 - Fix lists
 - Fix code blocks
 - Correct apostrophes
 - Replace redundant inline note marks for code with code marks
 - Fix broken image links
 - Remove non-functional title links
 - Correct broken cross-docs links
 - Improve readability

Note: This PR does not try to fix/amend:

 - Grammatical errors
 - Lexical errors
 - Linguistic-logic errors etc.

It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Fix backtick issues

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c932667cd26f00bb64ddf0c1a7c7de3ac95aa4be
Component: engine
2014-04-24 22:19:32 +10:00
ba98365746 fixed broken link to chef community site
Upstream-commit: 086b3208ea0f152f5c9501805fd0d8d1c95c7aad
Component: engine
2014-04-23 09:17:57 +02:00
e5c2e2ce0f Merge pull request #5312 from ostezer/docs-illusion-confusion
Urgent fix for crazy docs error on volumes.
Upstream-commit: f10bb364bedab7060657f313996fd7fecf50c67d
Component: engine
2014-04-20 12:02:47 +10:00
c61da19ea2 Urgent fix for crazy docs error on volumes.
Elaborate on the volumes example to prevent confusion.

Update: Amend the example so it is executable by the reader.
This includes fixing the erring "/var/logs" statement with "/var/log".

Update: Fix sentence structuring to better suit the 80chrs. limit.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 97daf9864d835ae0883b3c03382ac5dca11b4cc9
Component: engine
2014-04-19 19:35:00 +03:00
e0138ab848 Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 2d6324e06a1e2ea8bb2236472a99c3dc4b5f66d1
Component: engine
2014-04-19 03:35:45 +03:00
c565574306 Mark notes and warnings, fix broken link renderings within.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 7935850005b775e0cd1a99f9bab1b8cd53784c3a
Component: engine
2014-04-18 23:31:38 +03:00
abf4ece9b5 Merge pull request #5287 from jamtur01/tickets/5283
Fixed #5283 - literal leftover from cutover
Upstream-commit: fb2110b465f0431a8271a9243693a8fddcf75a0f
Component: engine
2014-04-18 09:04:16 +10:00
88ed8dd5d7 Merge pull request #5284 from jamtur01/tickets/5282
Fixed #5282 - deprecated -name syntax
Upstream-commit: bb0262414569d9e5409357a69534cadd5809f70e
Component: engine
2014-04-18 09:03:55 +10:00
1bbbedd397 Fixed #5283 - literal leftover from cutover
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 2f3cb370dfaca1f1c41bbd7af5f064f70ad8267b
Component: engine
2014-04-17 18:58:02 -04:00
e5935bd923 Fixed #5282 - deprecated -name syntax
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a75758fcf648ed22fe979cbb625c209a92c5d873
Component: engine
2014-04-17 18:43:06 -04:00
4e25aa80e6 Fix for broken in-document links which got scrambled during conversion.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 1ff66d27b5b35b9782d6d6cdd5fc5ec95bdda07d
Component: engine
2014-04-17 18:09:08 +03:00
c4684e29f0 now, with shiney markdown
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ac999a9cb2b0976e021aeb8825bb051df6bd0976
Component: engine
2014-04-16 11:04:14 +10:00
b3cdaaecc8 Merge pull request #4799 from tianon/no-more-inotifywait
Remove the inotifywait hack from our upstart host-integration example
Upstream-commit: a4b4448009587e79a7a2ddef0178860fd3c01de7
Component: engine
2014-04-06 08:34:50 +10:00
f32e1ed77b Merge pull request #4814 from noducks/master
Reminder for OSX users not to use SUDO
Upstream-commit: 30d25a3d27a80f0fcf0b9641e5d811f98e225d20
Component: engine
2014-03-25 20:15:39 +10:00
df52e0a2f8 Reminder for OSX users not to use SUDO
Useful for those who haven't made it to the examples page yet. dad4a998dc

Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
Upstream-commit: 69087f2d2397b18d6dd2d7b994e24ea9814e4bcd
Component: engine
2014-03-25 09:42:59 +00:00
1bb9a4e471 Fix typo in Using Chef documentation description
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
Upstream-commit: c84ff187c62060f20b7039a5005a44012898df7b
Component: engine
2014-03-24 22:29:54 -04:00
68d9a195f9 Add Chef usage documentation
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
Upstream-commit: bb034c6b42c347ffdfae834960bf2386429e1980
Component: engine
2014-03-24 21:39:15 -04:00
aae2fd84d8 Remove the inotifywait hack from our upstart host-integration example that is no longer necessary
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ab0c9b385c47d818a2105c2114573f5beedbd3ba
Component: engine
2014-03-20 14:59:40 -06:00
0164d2be10 Fix double single dash arg issues in docs
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
fb7b463fb2 add env hint
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e5cbb5c906d37b14dbf0180d253f58f8995de571
Component: engine
2014-03-18 22:29:11 +10:00
c48adc6929 Update to double-dash everywhere
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
ec32d7aa38 Update port_redirection.rst
Fix flags
Upstream-commit: 2a5e1abaa93b0081446420cae9d6d7d3892b6d75
Component: engine
2014-03-12 15:42:10 +01:00
b1cd97bc5d Correct typo
Upstream-commit: 6d9a7d6bc3edb8294e05a9903d5fa97239ed12e2
Component: engine
2014-03-07 08:45:08 -05:00
4948f76f10 removing redundant dot
Maybe it's a typo
Upstream-commit: 29079f03cfb0653316b07c58d24f4d547b3de1cc
Component: engine
2014-03-07 18:19:18 +08:00
a45e674934 Fix name parameter
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 476c290b079d94b1da02c6e72ed15b7f9bd7fce5
Component: engine
2014-03-06 22:51:44 +00:00
e13d9e18a0 Merge pull request #4444 from SvenDowideit/update-host-integration-docs
update to use --name, and add a little more detail to how docker start -a works
Upstream-commit: 34fe14f1746903e5775a2e34ebb1176a885dc380
Component: engine
2014-03-05 12:30:55 -08:00
59e55af69a Closes #4374
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: )
Upstream-commit: 83de8bb842b97094651207202a5474b8fec5259f
Component: engine
2014-03-05 02:41:14 +00:00
eed6462b7a update to use --name, and add a little more detail to how docker start -a works
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 3acbd758d84294e3434609ae3ecf52cd5ed9ee4b
Component: engine
2014-03-05 00:57:08 +00:00
47387bf105 Merge pull request #4406 from funkymonkeymonk/voldocs
adding note that host-volumes must be defined using absolute paths
Upstream-commit: 37893c3db08eb563af89939ca5f545ddd038f69f
Component: engine
2014-03-02 23:19:09 -05:00
b706d63e16 adding note that host-volumes must be defined using absolute paths
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com> (github: funkymonkeymonk)
Upstream-commit: 3ddfbf68802b7a62dcdefd46decb3f7f6faebabe
Component: engine
2014-03-01 20:43:53 -05:00
40e0f3f694 add some info wrt backup and restore of volumes
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5fde31ba9cca63a6bdf0a11fffa64aa16229ef66
Component: engine
2014-03-01 08:44:01 +10:00
d011a4181c Fixed typo in Dockerfile example
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com> (github: robpc)

The 'true' command is located in /bin not /usr/bin in the busybox image.
Upstream-commit: 1475dafd5204a6df2e69dec5214270020edf5e50
Component: engine
2014-02-26 19:38:51 -05:00
6ec2f02312 Fix misspelling
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com> (github: amouat)
Upstream-commit: 88d24df6687d64bf0e19c23973da32eed32fda28
Component: engine
2014-02-20 16:55:07 +01:00
2894395a09 Add basics for controlling a container's lifecycle
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6dc2f5513648c42b2e71e55c4a4ea6cd3073ce55
Component: engine
2014-02-18 22:11:29 -05:00
24eab2e417 Add extra info regarding docker run funcationality
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 349adf4d4df63cd35ecfd74aa21de01629964ea5
Component: engine
2014-02-18 15:08:09 -05:00
90a166ff8b try out @metalivedev's suggestion, including FQIN
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: a049e93a4c164de25ce1fc1113f2929aa0aa0b5b
Component: engine
2014-02-18 20:16:09 +10:00
3700ea5ec4 my attempt to disentagle repository and registry (Issue #1439)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
2014-02-18 20:16:08 +10:00
ec297483f8 change the -H TCP / docker group warning to not reference a resolved issue
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8871fd3a317240dbd6d5a9ae3309726281572bc1
Component: engine
2014-02-17 10:02:23 +10:00
93967c393a Merge pull request #4111 from merriam/patch-4
Minor error in example code (resubmit #4109)
Upstream-commit: cddea301ab4a4d5ba32c1d1bb22f029fcf1a8edd
Component: engine
2014-02-12 18:34:17 -08:00
60f7a02d07 Minor error in example code (resubmit #4109)
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com> (github: merriam)
Upstream-commit: ba650e05177bcc2597606b998a104a29698d5064
Component: engine
2014-02-12 18:13:46 -08:00
8934e64a02 (resubmit) Add notes about OS/X and remote daemons
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com> (github: merriam)
Upstream-commit: 2a17bdce9e6e25e9be225fede7aac0b12729d82f
Component: engine
2014-02-12 18:11:01 -08:00
1cb1e79554 fix underline/heading
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 6fd8e5d976e872447447d8c25d20d525305f281d
Component: engine
2014-02-11 16:53:08 -08:00
d33fce79f6 add a little more information about the docker run -P option
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b2146cb0e7a23553d1520ed87837a1b5455c9130
Component: engine
2014-02-11 20:34:26 +10:00
d680ae54b5 Merge pull request #3781 from mattymo/patch-1
Clean up grammar on puppet.rst
Upstream-commit: 093531ddb7f4ee53cd166bfd9316af0c1de7424c
Component: engine
2014-01-27 12:06:43 -08:00
b231028354 Update puppet.rst
Upstream-commit: 551e1a766c8aaec190972e3542fd8a1c7452b6b2
Component: engine
2014-01-27 18:21:48 +03:00
11aa2d4639 Clean up grammar on puppet.rst
Upstream-commit: 03d9984f177ec1d093011bcf3693338dabecc19e
Component: engine
2014-01-27 15:13:17 +03:00