Commit Graph

24 Commits

Author SHA1 Message Date
892e46c364 fixes as requested
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: db165f7d2c3e05bbd7bac8c1188145370c7b1171
Component: engine
2014-12-23 11:06:45 +10:00
4725a40462 Changing the windows installation doc to include instructions how to login
using putty instead of CMD

Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk>

Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk> (github: SvenDowideit)
Upstream-commit: 948f33263e95997a9c6596d695c92ab03c630899
Component: engine
2014-12-23 11:06:44 +10:00
02bd8df632 Link directly to the 'latest' release alias
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 380fe94614cecad6af85263af17245c5fc4103e8
Component: engine
2014-10-14 09:20:55 +10:00
35e71a0cd0 Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 6ae07e24104af6eb245339dae3a878fb983d112e
Component: engine
2014-07-17 11:54:35 +10:00
b83a4a02c5 Windows needs hardware virtualization
VirtualBox needs hardware virtualization for
64-bit guests.

Docker-DCO-1.1-Signed-off-by: Robert Bachmann <rb@robertbachmann.at> (github: robertbachmann)
Upstream-commit: ba7245f07271d5ccba70ef659b3e88424cf36887
Component: engine
2014-06-21 23:14:23 +02:00
fcdeff83df Merge pull request #6565 from shaunol/patch-1
Update windows.md
Upstream-commit: b2eb79b7dad44fcbfac31565bec3763bb7ec796c
Component: engine
2014-06-20 23:27:12 +10:00
c160f0471c Update windows.md
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
Upstream-commit: db9bf744ab93f1e688bf986794c852abc40b873e
Component: engine
2014-06-20 19:23:35 +12:00
fd6ce6d68b Fix installation docs to use the new boot2docker command: ip
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: 40966fa0966b3acd1893852a5297526374b690f2
Component: engine
2014-06-19 13:00:45 +02:00
74a8a70c93 Merge pull request #6468 from jstoja/6374-docs-apache-image
Docs: apache image on installation
Upstream-commit: 2294294e19798a1c2ceb90c5a31a532bb85869c7
Component: engine
2014-06-18 08:19:58 -05:00
da74dc358a Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
Upstream-commit: 207d7807af35a3f1ee98e6401bff83146d2450f8
Component: engine
2014-06-18 00:38:04 +08:00
1dbb9e510c Note user name and password in docs on boot2docker
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com> (github: nathanleclaire)
Upstream-commit: 073382a9c61fb73b8d1915bf53fa6e8c5bd8fbb8
Component: engine
2014-06-13 15:38:45 -07:00
9c48187761 Update windows.md
Replace "OS X" by "Windows"
Upstream-commit: 875d0b776d0ec4ba68491f82143e6f099a03944a
Component: engine
2014-06-09 11:23:54 +02:00
56d2049094 Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
Upstream-commit: 9e2e8188ae8e2c566b3e10c1b23ae3fff8f9d64a
Component: engine
2014-06-08 17:36:49 -07:00
9064f1cd9a Simplify the windows docs and fix formatting
The mention of NAT is confusing for those coming from pre-host-only networking b2d

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 744d39a46683909b95ac5a769ae5f839a992d59a
Component: engine
2014-06-09 09:10:41 +10:00
0f870fc34d Fixed issues in Mac or Windows
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: bb7baf183557fd963f4d1b36ac6a0253a3a0e717
Component: engine
2014-06-08 15:53:20 -07:00
10c982a15a Removed re-appearing production warnings
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 78426304803bc651fec3ae9b42cf5983d6e03370
Component: engine
2014-06-08 15:35:32 -07:00
6380330c31 Videos for installing b2d
Mac and Windows video embeds from YouTube

Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
Upstream-commit: fa7946a510f75a118aaf0d419c0d6c2f6d3b8d73
Component: engine
2014-06-08 13:11:50 -07:00
13f5758035 sync the initial docs from b2d
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 23dd221e5250398d4120a1f3d1bcb591923f4892
Component: engine
2014-05-30 11:16:38 +10:00
9f78769fba Rewrite the mac and windows docs to use the boot2docker installers.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5f5d66ade63f8040dd14114f2c7161b16a806c5c
Component: engine
2014-05-28 07:56:15 +10:00
96096d6c1f Add instructions for persisting data
Docker-DCO-1.1-Signed-off-by: Benny Ng <benny.tpng@gmail.com> (github: tpng)
Upstream-commit: accea18920e856fc1099d85a3fced06dc7b53799
Component: engine
2014-05-21 16:45:41 +08:00
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
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
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
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