Commit Graph

42448 Commits

Author SHA1 Message Date
John Mulhausen cbeb53dd83 Dockerfiles for staging/archives 2016-10-11 02:10:12 -07:00
John Mulhausen 6db7389e57 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 01:52:49 -07:00
John Mulhausen e1a71b72d2 Add search icon from local src 2016-10-11 01:52:41 -07:00
John Mulhausen e9dce58edd Merge pull request #160 from thaxy/patch-2
Update 3_prepare_the_app.md
2016-10-11 01:44:12 -07:00
John Mulhausen f8bd7ce117 Merge pull request #127 from BSCheshir/patch-1
example pls
2016-10-11 01:41:30 -07: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
thaxy ff2875dc35 Update 3_prepare_the_app.md
Wrong directory names for the repository. Change directory command wouldn't work if copy pasted.
2016-10-11 10:11:24 +02: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
John Mulhausen 561a35d031 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 01:00:40 -07:00
John Mulhausen d9701c4b51 Fix for 404 bg object, right-nav 2016-10-11 01:00:32 -07:00
John Mulhausen 74e7f7b392 Delete rightnav.md 2016-10-10 21:54:01 -07:00
John Mulhausen 6b2de29fa7 Fix for nesting of TOC 2016-10-10 20:15:50 -07:00
John Mulhausen cc2092d2fa Allows version-specific forwarding to inherit from master 2016-10-10 19:39:22 -07:00
John Mulhausen 466e65dd56 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-10 18:42:27 -07:00
John Mulhausen 778f02e599 Fix for substring matching in redirects 2016-10-10 18:42:17 -07:00
John Mulhausen fea6d53f1f Merge pull request #155 from mstanleyjones/draft_to_published_false
Change 'draft: true' to 'published: false' for Jekyll
2016-10-10 16:30:48 -07:00
John Mulhausen 6d4047c3e9 Sitemap fix 2016-10-10 16:25:26 -07:00
John Mulhausen 4a2953dcc6 Update _config.yml 2016-10-10 16:23:13 -07:00
John Mulhausen f1bdec69ec Create sitemap.xml 2016-10-10 16:22:46 -07:00
Misty Stanley-Jones e916f7f88e Change 'draft: true' to 'published: false' for Jekyll 2016-10-10 16:19:47 -07:00
John Mulhausen bdaafb8dac Website verification 2016-10-10 15:55:09 -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
John Mulhausen 6760a6a88b Update get-help.md 2016-10-10 14:55:20 -07: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 863772ceb1 Merge pull request #130 from jaredrcarlson/opensource_workflow_find-an-issue.md
Fixed Issue #128 - Syntax Error in: opensource/workflow/find-an-issue…
2016-10-10 11:43:31 -07:00
John Mulhausen 4b71ffe966 Merge pull request #140 from candita/patch-1
Update deprecated.md
2016-10-10 11:42:32 -07:00
John Mulhausen 95d32f79b2 Merge pull request #139 from vishesh92/patch-1
fix formatting in container-communication.md
2016-10-10 11:42:14 -07:00
John Mulhausen a30aa7d320 Delete robots.txt 2016-10-10 11:41:32 -07:00
LRubin 4fb9c084cb Merge pull request #132 from hsluoyz/master
Fix the wrong links in opensource/code.md
2016-10-10 11:17:19 -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
Yang Luo df99fe96f6
Fix the wrong links in opensource/code.md 2016-10-09 09:44:35 -07:00
Jared Carlson 9fd3cf4cad Fixed Issue #128 - Syntax Error in: opensource/workflow/find-an-issue.md --> I removed the extra table heading tag I found on line 113
Signed-off-by: Jared Carlson <jaredrcarlson@gmail.com>
2016-10-08 16:46:50 -06:00
BSCheshir c98a6d8902 example pls 2016-10-08 23:35:37 +04:00
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 4a833da9f3 Checking in part 4 stopping place 2016-10-07 17:02:03 -07:00
John Mulhausen 68b813c68a Update advanced_usage.md 2016-10-07 14:48:48 -07:00
John Mulhausen ef4448d6b4 Merge branch 'master' of https://github.com/docker/docker.github.io
the commit.
2016-10-07 13:48:28 -07:00
John Mulhausen 8ea375e1d7 Fix for list in compose-file, CSS fixes for blockquotes 2016-10-07 13:48:23 -07: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 dc8ac3cc4e 404 fix for Safari 2016-10-07 13:11:38 -07:00
John Mulhausen aab444d99b Update cloud-ex-machine-ocean.md 2016-10-07 12:51:16 -07:00
John Mulhausen b5a42327f2 Merge pull request #120 from andrewsomething/issues/118
Fix broken images in DigitalOcean examples. Closes: #118
2016-10-07 12:24:14 -07:00