From d6995e4c6245089a9fea9224cd4ec45345ebeee6 Mon Sep 17 00:00:00 2001
From: John Mulhausen <john@docker.com>
Date: Thu, 20 Apr 2017 21:08:50 -0700
Subject: [PATCH] Various link/fwding fixes

---
 404.md                                       |  2 +-
 CONTRIBUTING.md                              | 14 +++++++-------
 README.md                                    | 14 +++++++-------
 apidocs/cloud-api-source/README.md           |  2 +-
 edge/engine/reference/commandline/README.md  |  2 +-
 engine/examples/mongodb.md                   |  2 +-
 engine/reference/commandline/README.md       |  2 +-
 get-started/index.md                         |  2 ++
 get-started/part6.md                         |  2 +-
 glossary.md                                  |  2 +-
 hackathon.md                                 |  8 ++++----
 index.md                                     |  2 +-
 machine/get-started-cloud.md                 |  2 +-
 opensource/project/test-and-docs.md          |  4 ++--
 opensource/workflow/advanced-contributing.md |  2 +-
 opensource/workflow/review-pr.md             |  2 +-
 16 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/404.md b/404.md
index 34861c5382..2d5328fc74 100644
--- a/404.md
+++ b/404.md
@@ -68,7 +68,7 @@ if (gonnaFwd) {
   console.log("Showing 404 choices");
   var ghIssueQueryString = "title=404%20at%20" + path + "&body=URL%3A%20" + path;
   var output = new Array();
-  output.push("<ul><li><a href='https://github.com/moby/moby.github.io/issues/new?" + ghIssueQueryString + "' class='nomunge'>File a ticket</a></li>");
+  output.push("<ul><li><a href='https://github.com/docker/docker.github.io/issues/new?" + ghIssueQueryString + "' class='nomunge'>File a ticket</a></li>");
   output.push("<li><a href='/search/?q=" + phrase + "'</a>Search for <tt>&quot;" + phrase + "&quot;</tt></a></li>");
   output.push("<li><a href='/search/'>Try a different search</a></li>");
   output.push("<li><a href='/'>Go to the index</a></li></ul>");
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8f97691171..f55ea9cfe8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,31 +59,31 @@ work will be visible on docs.docker.com.
 
 The following `vnext` branches currently exist:
 
-- **[vnext-engine](https://github.com/moby/moby.github.io/tree/vnext-engine):**
+- **[vnext-engine](https://github.com/docker/docker.github.io/tree/vnext-engine):**
   docs for upcoming features in the [docker/docker](https://github.com/moby/moby/)
   project
 
-- **[vnext-compose](https://github.com/moby/moby.github.io/tree/vnext-compose):**
+- **[vnext-compose](https://github.com/docker/docker.github.io/tree/vnext-compose):**
   docs for upcoming features in the [docker/compose](https://github.com/docker/compose/)
   project
 
-- **[vnext-distribution](https://github.com/moby/moby.github.io/tree/vnext-distribution):**
+- **[vnext-distribution](https://github.com/docker/docker.github.io/tree/vnext-distribution):**
   docs for upcoming features in the [docker/distribution](https://github.com/docker/distribution/)
   project
 
-- **[vnext-opensource](https://github.com/moby/moby.github.io/tree/vnext-opensource):**
+- **[vnext-opensource](https://github.com/docker/docker.github.io/tree/vnext-opensource):**
   docs for upcoming features in the [docker/opensource](https://github.com/docker/opensource/)
   project
 
-- **[vnext-swarm](https://github.com/moby/moby.github.io/tree/vnext-swarm):**
+- **[vnext-swarm](https://github.com/docker/docker.github.io/tree/vnext-swarm):**
   docs for upcoming features in the [docker/swarm](https://github.com/docker/swarm/)
   project
 
-- **[vnext-toolbox](https://github.com/moby/moby.github.io/tree/vnext-toolbox):**
+- **[vnext-toolbox](https://github.com/docker/docker.github.io/tree/vnext-toolbox):**
   docs for upcoming features in the [docker/toolbox](https://github.com/docker/toolbox/)
   project
 
-- **[vnext-kitematic](https://github.com/moby/moby.github.io/tree/vnext-kitematic):**
+- **[vnext-kitematic](https://github.com/docker/docker.github.io/tree/vnext-kitematic):**
   docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/)
   project
 
diff --git a/README.md b/README.md
index 56be3bc87d..be3e7bd37d 100644
--- a/README.md
+++ b/README.md
@@ -74,23 +74,23 @@ work will be visible on [https://docs.docker.com/](https://docs.docker.com/).
 
 The following `vnext` branches currently exist:
 
-- **[vnext-engine](https://github.com/moby/moby.github.io/tree/vnext-engine):**
+- **[vnext-engine](https://github.com/docker/docker.github.io/tree/vnext-engine):**
   docs for upcoming features in the [docker/docker](https://github.com/moby/moby/)
   project
 
-- **[vnext-compose](https://github.com/moby/moby.github.io/tree/vnext-compose):**
+- **[vnext-compose](https://github.com/docker/docker.github.io/tree/vnext-compose):**
   docs for upcoming features in the [docker/compose](https://github.com/docker/compose/)
   project
 
-- **[vnext-distribution](https://github.com/moby/moby.github.io/tree/vnext-distribution):**
+- **[vnext-distribution](https://github.com/docker/docker.github.io/tree/vnext-distribution):**
   docs for upcoming features in the [docker/distribution](https://github.com/docker/distribution/)
   project
 
-- **[vnext-swarm](https://github.com/moby/moby.github.io/tree/vnext-swarm):**
+- **[vnext-swarm](https://github.com/docker/docker.github.io/tree/vnext-swarm):**
   docs for upcoming features in the [docker/swarm](https://github.com/docker/swarm/)
   project
 
-- **[vnext-toolbox](https://github.com/moby/moby.github.io/tree/vnext-toolbox):**
+- **[vnext-toolbox](https://github.com/docker/docker.github.io/tree/vnext-toolbox):**
   docs for upcoming features in the [docker/toolbox](https://github.com/docker/toolbox/)
   project
 
@@ -111,7 +111,7 @@ You have three options:
 1.  On your local machine, clone this repo and run our staging container:
 
     ```bash
-    git clone https://github.com/moby/moby.github.io.git
+    git clone https://github.com/docker/docker.github.io.git
     cd docker.github.io
     docker-compose up
     ```
@@ -134,7 +134,7 @@ You have three options:
     a. Clone this repo by running:
 
        ```bash
-       git clone https://github.com/moby/moby.github.io.git
+       git clone https://github.com/docker/docker.github.io.git
        ```
 
     b. Install Ruby 2.3 or later as described in [Installing Ruby]
diff --git a/apidocs/cloud-api-source/README.md b/apidocs/cloud-api-source/README.md
index ab0c42d070..7b96c777a0 100644
--- a/apidocs/cloud-api-source/README.md
+++ b/apidocs/cloud-api-source/README.md
@@ -11,7 +11,7 @@ If you find a typo or mismatch between the API and this documentation, please se
 To run it locally:
 
 ```none
-$ git clone https://github.com/moby/moby.github.io.git
+$ git clone https://github.com/docker/docker.github.io.git
 $ make release
 ```
 
diff --git a/edge/engine/reference/commandline/README.md b/edge/engine/reference/commandline/README.md
index ff59d8fe0f..aff6f8f155 100644
--- a/edge/engine/reference/commandline/README.md
+++ b/edge/engine/reference/commandline/README.md
@@ -25,5 +25,5 @@ The process for generating the YAML files is still in flux. Check with
 branch of `docker/docker` checked out (probably not `master`).
 
 After generating the YAML files, replace the YAML files in
-[https://github.com/moby/moby.github.io/tree/master/_data/engine-cli](https://github.com/moby/moby.github.io/tree/master/_data/engine-cli)
+[https://github.com/docker/docker.github.io/tree/master/_data/engine-cli](https://github.com/docker/docker.github.io/tree/master/_data/engine-cli)
 with the newly-generated files. Submit a pull request.
diff --git a/engine/examples/mongodb.md b/engine/examples/mongodb.md
index c5cf228f9b..e3edf44cb2 100644
--- a/engine/examples/mongodb.md
+++ b/engine/examples/mongodb.md
@@ -102,7 +102,7 @@ ENTRYPOINT ["/usr/bin/mongod"]
 
 Now save the file and let's build our image.
 
-> **Note**:  The full version of this `Dockerfile` can be found [here](https://github.com/moby/moby.github.io/blob/master/engine/examples/mongodb/Dockerfile).
+> **Note**:  The full version of this `Dockerfile` can be found [here](https://github.com/docker/docker.github.io/blob/master/engine/examples/mongodb/Dockerfile).
 
 ## Building the MongoDB Docker image
 
diff --git a/engine/reference/commandline/README.md b/engine/reference/commandline/README.md
index ff59d8fe0f..aff6f8f155 100644
--- a/engine/reference/commandline/README.md
+++ b/engine/reference/commandline/README.md
@@ -25,5 +25,5 @@ The process for generating the YAML files is still in flux. Check with
 branch of `docker/docker` checked out (probably not `master`).
 
 After generating the YAML files, replace the YAML files in
-[https://github.com/moby/moby.github.io/tree/master/_data/engine-cli](https://github.com/moby/moby.github.io/tree/master/_data/engine-cli)
+[https://github.com/docker/docker.github.io/tree/master/_data/engine-cli](https://github.com/docker/docker.github.io/tree/master/_data/engine-cli)
 with the newly-generated files. Submit a pull request.
diff --git a/get-started/index.md b/get-started/index.md
index 3c7a56e074..6b4f755b06 100644
--- a/get-started/index.md
+++ b/get-started/index.md
@@ -3,6 +3,8 @@ title: "Get Started, Part 1: Orientation and Setup"
 keywords: get started, setup, orientation, quickstart, intro, concepts, containers
 description: Get oriented on some basics of Docker before diving into the walkthrough.
 redirect_from:
+- /getstarted/
+- /get-started/part1/
 - /engine/getstarted/
 - /learn/
 - /engine/getstarted/step_one/
diff --git a/get-started/part6.md b/get-started/part6.md
index c9ff18028e..e32af92443 100644
--- a/get-started/part6.md
+++ b/get-started/part6.md
@@ -121,7 +121,7 @@ Enterprise on each of these providers:
 * [Docker Enterprise for Azure](https://store.docker.com/editions/enterprise/docker-ee-azure?tab=description){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'EE for Azure');"}
 
 > **Note**: Having trouble with these? View [our setup guide for AWS](/datacenter/install/aws/){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'AWS setup guide');"}.
-> You can also [view the WIP guide for Microsoft Azure](https://github.com/moby/moby.github.io/pull/2796){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'Azure setup guide');"}.
+> You can also [view the WIP guide for Microsoft Azure](https://github.com/docker/docker.github.io/pull/2796){: onclick="ga('send', 'event', 'Get Started Referral', 'Enterprise', 'Azure setup guide');"}.
 
 {{ enterprisedeployapp }}
 {% endcapture %}
diff --git a/glossary.md b/glossary.md
index ad5dc7d43f..c28e98b34f 100644
--- a/glossary.md
+++ b/glossary.md
@@ -7,7 +7,7 @@ noratings: true
 ---
 <!--
 To edit/add/remove glossary entries, visit the YAML file at:
-https://github.com/moby/moby.github.io/blob/master/_data/glossary.yaml
+https://github.com/docker/docker.github.io/blob/master/_data/glossary.yaml
 
 To get a specific entry while writing a page in the docs, enter Liquid text
 like so:
diff --git a/hackathon.md b/hackathon.md
index 1501f53ef6..7240d7da3e 100644
--- a/hackathon.md
+++ b/hackathon.md
@@ -30,7 +30,7 @@ All participants who show up in the 4th floor hack room at DockerCon will get
 ## Quick links
 
 - [Event page on DockerCon website](https://dockercon.smarteventscloud.com/connect/sessionDetail.ww?SESSION_ID=116676)
-- [View hackathon bugs on GitHub](https://github.com/moby/moby.github.io/milestone/9)
+- [View hackathon bugs on GitHub](https://github.com/docker/docker.github.io/milestone/9)
 - [Report your hackathon work](https://goo.gl/forms/oEaQOlKvQj8iJbn53)
 - [Browse prizes](http://www.cafepress.com/dockerdocshackathon)
 - [#docs on Slack, if you have questions](https://dockercommunity.slack.com/messages/C2V58TASE)
@@ -40,7 +40,7 @@ All participants who show up in the 4th floor hack room at DockerCon will get
 
 We have a number of bugs that have built up in our docs queue on GitHub, and
 we have labeled a whole slew of them with [the tag `hackathon`, which you can
-see here](https://github.com/moby/moby.github.io/labels/hackathon).
+see here](https://github.com/docker/docker.github.io/labels/hackathon).
 
 Submit fixes for these bugs, or close them if you do a bit of research it turns
 out they aren't actually valid. Every action you take gets you more points, and
@@ -103,7 +103,7 @@ Wednesday from 1pm to 6pm**. We'll be there to answer questions and help you.
 ### Online
 
 Drop into [the community Slack channel for the docs](https://dockercommunity.slack.com/messages/C2V58TASE) and ask any questions
-you have. Otherwise, just go to GitHub and [look at our `hackathon` label](https://github.com/moby/moby.github.io/milestone/9)
+you have. Otherwise, just go to GitHub and [look at our `hackathon` label](https://github.com/docker/docker.github.io/milestone/9)
 and come here to claim your points when you're done.
 
 ## Claiming a bug
@@ -112,7 +112,7 @@ Whether attending in-person or online, to claim a bug as one that you are
 working on (so nobody else grabs it out from under you) you must type a comment
 saying you claim it. Respect it when you see other comments claiming a bug.
 
-[View available bugs](https://github.com/moby/moby.github.io/milestone/9){: class="button primary-btn"}
+[View available bugs](https://github.com/docker/docker.github.io/milestone/9){: class="button primary-btn"}
 
 ## Claiming your points
 
diff --git a/index.md b/index.md
index a248111b4b..3ec75094bb 100644
--- a/index.md
+++ b/index.md
@@ -14,7 +14,7 @@ notags: true
 
 Fix docs bugs to claim the points, and cash in your points for prizes in [the swag store](http://www.cafepress.com/dockerdocshackathon). Every 10 points is worth $1 USD in store credit. Happening all DockerCon week, from April 17-21, 2017. <font color="#ef4d53">Hack room at the conference Tuesday, Wednesday 1pm to end of day: 4th floor, room 13A-13B.</font>
 
-[Hackathon details](/hackathon/){: class="button outline-btn" style="margin:20px"}[View available bugs on GitHub](https://github.com/moby/moby.github.io/milestone/9){: class="button outline-btn" style="margin:20px"} [Visit the rewards store](http://www.cafepress.com/dockerdocshackathon){: class="button outline-btn" style="margin:20px"}
+[Hackathon details](/hackathon/){: class="button outline-btn" style="margin:20px"}[View available bugs on GitHub](https://github.com/docker/docker.github.io/milestone/9){: class="button outline-btn" style="margin:20px"} [Visit the rewards store](http://www.cafepress.com/dockerdocshackathon){: class="button outline-btn" style="margin:20px"}
 
 ## Get started with Docker
 
diff --git a/machine/get-started-cloud.md b/machine/get-started-cloud.md
index ff5c80c64b..9900fd2cff 100644
--- a/machine/get-started-cloud.md
+++ b/machine/get-started-cloud.md
@@ -52,7 +52,7 @@ See <a href="../machine/drivers/" target="_blank">Docker Machine driver referenc
 
   Several Docker Machine driver plugins for use with other cloud platforms are available from 3rd party contributors. These are use-at-your-own-risk plugins, not maintained by or formally associated with Docker.
 
-  See <a href="https://github.com/moby/moby.github.io/blob/master/machine/AVAILABLE_DRIVER_PLUGINS.md" target="_blank">Available driver plugins</a>.
+  See <a href="https://github.com/docker/docker.github.io/blob/master/machine/AVAILABLE_DRIVER_PLUGINS.md" target="_blank">Available driver plugins</a>.
 
 ## Adding a host without a driver
 
diff --git a/opensource/project/test-and-docs.md b/opensource/project/test-and-docs.md
index b25a78d64d..27d84245ab 100644
--- a/opensource/project/test-and-docs.md
+++ b/opensource/project/test-and-docs.md
@@ -241,7 +241,7 @@ make any changes, just run these commands again.
 ## Build and test the documentation
 
 The Docker documentation source files are in a centralized repository at
-[https://github.com/moby/moby.github.io](https://github.com/moby/moby.github.io). The content is
+[https://github.com/docker/docker.github.io](https://github.com/docker/docker.github.io). The content is
 written using extended Markdown, which you can edit in a plain text editor such as
 Atom or Notepad. The docs are built using [Jekyll](https://jekyllrb.com/).
 
@@ -311,7 +311,7 @@ If for some reason you are unable to use Docker Compose, you can use Jekyll dire
 
 -  Use `bundle` to install Jekyll and its dependencies from the bundle in the
    centralized documentation repository. Within your clone of the
-   [https://github.com/moby/moby.github.io](https://github.com/moby/moby.github.io)
+   [https://github.com/docker/docker.github.io](https://github.com/docker/docker.github.io)
    repository, issue the following command:
 
    ```bash
diff --git a/opensource/workflow/advanced-contributing.md b/opensource/workflow/advanced-contributing.md
index 1709cc5b54..0198d09e39 100644
--- a/opensource/workflow/advanced-contributing.md
+++ b/opensource/workflow/advanced-contributing.md
@@ -66,7 +66,7 @@ The following provides greater detail on the process:
 2.  Review existing issues and proposals to make sure no other user is proposing a similar idea.
 
     The design proposals are
-    [all online in our GitHub pull requests](https://github.com/moby/moby.github.io/pulls).
+    [all online in our GitHub pull requests](https://github.com/docker/docker.github.io/pulls).
 
 3.  Talk to the community about your idea.
 
diff --git a/opensource/workflow/review-pr.md b/opensource/workflow/review-pr.md
index e4429061aa..7924c7a32b 100644
--- a/opensource/workflow/review-pr.md
+++ b/opensource/workflow/review-pr.md
@@ -15,7 +15,7 @@ work on Docker.  You need to understand and work with both the "bots" and the
 > **Note**: These guidelines apply to Docker code submissions. If you want to
 > contribute to the Docker documentation itself, see the guidelines in the
 > `docker.github.io` repository's
-> [README.md](https://github.com/moby/moby.github.io).
+> [README.md](https://github.com/docker/docker.github.io).
 
 ## How we process your review