docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,550 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

71 Commits

Author SHA1 Message Date
John Mulhausen cc60beb64d Formatting fixes 2016-10-18 13:00:10 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Sebastiaan van Stijn fc6db798d1 Merge pull request #232 from milindchawre/doc-change 
Fixes #26818 : Removing bad reference in docker volumes tutorial
 2016-10-17 16:51:46 -07:00
milindchawre 9ce069647a Fixes #26818 : Removing bad reference in docker volumes tutorial 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-10-17 11:54:32 +00:00
yuexiao-wang adbe6d1dac Fix the command and typo for trust_sandbox 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-14 17:35:13 +08:00
drlukeangel d0eaa59c88 Small update to the scale documentation (#142) 
* Small update to the scale documentation

Just a small update to make it a bit clearer with a bit more functionality.
 2016-10-13 08:57:33 -07:00
Misty Stanley-Jones 2ea55d74ad Provide a backup for old config when configuring devicemapper (#149) 
* Provide a backup for old config when configuring devicemapper

* Adding blank line to avoid rendering issues
 2016-10-12 15:44:18 -07:00
Misty Stanley-Jones 232043cfa6 Merge pull request #148 from mstanleyjones/swarm_add_node_clarify 
Clarify what happens when a failed swarm node recovers
 2016-10-11 16:14:52 -07:00
Misty Stanley-Jones 62f4a04e39 Clarify what happens when a failed swarm node recovers 
Fixes #105
 2016-10-11 16:13:04 -07:00
Misty Stanley-Jones 6955815d23 Merge pull request #111 from yuj/patch-1 
Update restart.md
 2016-10-11 15:53:52 -07:00
Ben Firshman e4dfc61fab
Update Go client to docker/docker/client 
This has moved from docker/engine-api.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-10-11 13:59:27 +02:00
John Mulhausen 2b6cbd8255 Merge pull request #150 from BSCheshir/patch-2 
node1
 2016-10-11 01:39:48 -07:00
John Mulhausen fd905d3b26 Merge pull request #124 from RStrydom/patch-1 
Update step_four.md
 2016-10-11 01:26:45 -07:00
John Mulhausen 1dc817611b Formatting fixes 2016-10-11 01:24:55 -07:00
John Mulhausen 0937284ec7 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 01:10:21 -07:00
John Mulhausen ac39558cb1 Formatting fix 2016-10-11 01:10:13 -07:00
John Mulhausen 9ee229caca Update index.md 2016-10-11 01:02:07 -07:00
Misty Stanley-Jones e916f7f88e Change 'draft: true' to 'published: false' for Jekyll 2016-10-10 16:19:47 -07:00
Misty Stanley-Jones a41d952d78 Merge pull request #117 from mbentley/add-deferred-deletion 
Add deferred deletion to recommended dm options
 2016-10-10 15:52:42 -07:00
Misty Stanley-Jones f0b832357f Merge pull request #141 from mstanleyjones/choosing_port_vs_automatic 
Fix incorrect information about swarm port assignment
 2016-10-10 15:32:12 -07:00
Matt Bentley 5423de94f0
Add deferred deletion to recommended dm options 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-10-10 18:05:11 -04:00
BSCheshir a1edd7ce09 node1 
little bit before
ID                         NAME      IMAGE  NODE   DESIRED STATE  CURRENT STATE               ERROR
63s86gf6a0ms34mvboniev7bs  my-web.1  nginx  node1  Running        Running 58 seconds ago
 2016-10-11 01:40:51 +04:00
John Mulhausen 4b71ffe966 Merge pull request #140 from candita/patch-1 
Update deprecated.md
 2016-10-10 11:42:32 -07:00
Misty Stanley-Jones 220bbed0e4 Fix incorrect information about swarm port assignment 2016-10-10 10:02:15 -07:00
candita b5ca8860b9 Update deprecated.md 
Format as one sentence rather than 2 columns.
 2016-10-10 11:46:51 -04:00
vishesh92 78ff6bf07e fix formatting in container-communication.md 
fix formatting in container-communication.md so page is rendered perfectly at https://docs.docker.com/engine/userguide/networking/default_network/container-communication/
 2016-10-10 17:58:48 +05:30
Renier Strydom 6603c48cde Update step_four.md 
It is not normal to provide the file you are looking for when running `ls`
 2016-10-08 10:36:56 +02:00
John Mulhausen 8bfa1bda07 Merge pull request #114 from benizi/fix/raw-variables-targeted 
Prevent Liquid from mangling `{{` in a more targeted way
 2016-10-07 13:30:05 -07:00
John Mulhausen aab444d99b Update cloud-ex-machine-ocean.md 2016-10-07 12:51:16 -07:00
Andrew Starr-Bochicchio 3f7a061d99 Fix broken images in DigitalOcean examples. Closes: #118 2016-10-07 14:55:06 -04:00
John Mulhausen 4ab65ba3a4 Merge pull request #92 from dragonndev/master 
Documentation Update
 2016-10-06 22:26:52 -07:00
John Mulhausen d6794bf9fc Update trust_sandbox.md 2016-10-06 22:25:54 -07:00
John Mulhausen dec694d0d3 Update configure-dns.md 2016-10-06 21:59:42 -07:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{` 
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
 2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48 
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
 2016-10-07 00:56:17 -04:00
John Mulhausen 1357a4486d Merge pull request #113 from mbentley/fix-devicemapper-docs 
Fixed jekyll formatting for dm docs; fixed #112
 2016-10-06 21:55:35 -07:00
Matt Bentley 73fac8acb7
Fixed jekyll formatting for dm docs; fixed #112 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-10-06 22:33:41 -04:00
John Mulhausen bdc4a3b934 Fix for Embedded DNS server 2016-10-06 17:12:47 -07:00
John Mulhausen a2ff02a96a Fix for relative-path redirects causing infinite loops 2016-10-06 17:00:03 -07:00
James Yu 0688247f2e Update restart.md 2016-10-06 14:19:47 -07:00
John Mulhausen cb3f6f04a1 Merge pull request #48 from benizi/fix/raw-variables 
Fix formatting for Markdown files containing `{{`
 2016-10-06 09:46:51 -07:00
John Mulhausen 32f3885686 Update log_tags.md 2016-10-06 09:39:32 -07:00
John Mulhausen 3d08488dc4 Update log_tags.md 2016-10-06 09:32:22 -07:00
BSCheshir 7fd3d4e956 fix url 2016-10-06 18:05:44 +04:00
Matthew Lapworth 6129e9d3f9
Updated documentation on using the trust sandbox to fix an issue where the notary server tag was not found. 
Signed-off-by: Matthew Lapworth <matthewl@bit-shift.net>
 2016-10-05 21:15:45 -07:00
John Mulhausen 154bc45ab7 Merge pull request #87 from emcniece/fix-build-markdown 
Adding fix for builder reference markdown
 2016-10-05 17:02:40 -07:00
Eric McNiece 8c6c5a0e63 Adding fix for builder reference markdown 2016-10-05 16:50:29 -07:00
John Mulhausen e0280abc9a Update plugin_api.md 2016-10-05 16:12:47 -07:00
John Mulhausen f6562cf92a Update last_page.md 2016-10-05 16:10:52 -07:00
John Mulhausen 5389e6cb12 Update https.md 2016-10-05 16:07:08 -07:00