Commit Graph

42467 Commits

Author SHA1 Message Date
LRubin f03912bb86 fix fixed links
revert change to top link, fix links to hub ui
2016-10-17 14:08:16 -07:00
QwertyZW ffcaef8803 Fix broken links
Fixed a link pointing to the same page and 2 other links that are returning 404s
2016-10-12 15:19:58 -04:00
John Mulhausen bd4ac27f7c Keyword fix 2016-10-11 19:22:12 -07:00
John Mulhausen 4189a9fe7f Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 19:15:11 -07:00
John Mulhausen b9f22af9be Fix for docker-compose up and incorrect canonical URLs 2016-10-11 19:15:00 -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
John Mulhausen 2c6da7d896 Merge branch 'mstanleyjones-jekyll-seo-tag' 2016-10-11 14:31:27 -07:00
John Mulhausen d832bfc3d5 Cleanup of metadata 2016-10-11 14:31:10 -07:00
John Mulhausen 6be7f53413 Merge branch 'jekyll-seo-tag' of https://github.com/mstanleyjones/docker.github.io into mstanleyjones-jekyll-seo-tag 2016-10-11 12:57:56 -07:00
John Mulhausen 1e4d9dd0cf Merge pull request #166 from bfirsh/add-go-client-to-api-client-libraries-page
Update Go API client to docker/docker/client
2016-10-11 12:44:36 -07:00
John Mulhausen d87aeac703 Merge pull request #170 from sanjay-varanasi/patch-1
Remote API link broken. Fixing.
2016-10-11 12:28:06 -07:00
John Mulhausen ffbbfc9be7 Update overview.md 2016-10-11 12:27:52 -07:00
Sanjay Varanasi 221ae941d5 Remote API link broken. Fixing. 2016-10-11 15:10:28 -04:00
John Mulhausen 645edc350d Delete api.md.tmpl
Deleting per comments in https://github.com/docker/distribution/pull/1985
2016-10-11 12:00:08 -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 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
Misty Stanley-Jones 2e4d66999b Add jekyll-seo-tag to Jekyll template
Makes title, description, and keywords populate the right tags
See https://github.com/jekyll/jekyll-seo-tag

An example of this in action:
```
<!-- Begin Jekyll SEO tag v2.0.0 -->
<title>Docker Engine - Docker</title>
<meta property="og:title" content="Docker Engine" />
<meta name="description" content="Engine" />
<meta property="og:description" content="Engine" />
<meta property="og:site_name" content="Docker" />
<script type="application/ld+json">
  {
    "@context": "http://schema.org",
    "@type": "WebPage",
    "headline": "Docker Engine",
    "description": "Engine",
    "url": "/engine/"
  }
</script>
<!-- End Jekyll SEO tag -->
```
2016-10-10 17:13:33 -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