I'm going to wish I didn't do this

Docker-DCO-1.1-Signed-off-by: SvenDowideit <[email protected]> (github: SvenDowideit)

CONTRIBUTING.md

@@ -17,7 +17,7 @@ This information will help us review and fix your issue faster.
 
 For instructions on setting up your development environment, please
 see our dedicated [dev environment setup
-docs](http://docs.docker.io/en/latest/contributing/devenvironment/).
+docs](http://docs.docker.com/contributing/devenvironment/).
 
 ## Contribution guidelines
 
@@ -190,7 +190,7 @@ There are several exceptions to the signing requirement. Currently these are:
 * Your patch fixes Markdown formatting or syntax errors in the
   documentation contained in the `docs` directory.
 
-If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.io)
+If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.com)
 
 ### How can I become a maintainer?
 

README.md

@@ -160,7 +160,7 @@ Docker can be used to run short-lived commands, long-running daemons
 (app servers, databases etc.), interactive shell sessions, etc.
 
 You can find a [list of real-world
-examples](http://docs.docker.io/en/latest/examples/) in the
+examples](http://docs.docker.com/examples/) in the
 documentation.
 
 Under the hood

contrib/completion/zsh/_docker

@@ -1,6 +1,6 @@
 #compdef docker 
 #
-# zsh completion for docker (http://docker.io)
+# zsh completion for docker (http://docker.com)
 #
 # version:  0.2.2
 # author:   Felix Riedel

contrib/init/systemd/docker.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Docker Application Container Engine
-Documentation=http://docs.docker.io
+Documentation=http://docs.docker.com
 After=network.target
 
 [Service]

contrib/init/systemd/socket-activation/docker.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Docker Application Container Engine
-Documentation=http://docs.docker.io
+Documentation=http://docs.docker.com
 After=network.target
 
 [Service]

contrib/init/sysvinit-redhat/docker

@@ -2,10 +2,10 @@
 #
 #       /etc/rc.d/init.d/docker
 #
-#       Daemon for docker.io
+#       Daemon for docker.com
 #
 # chkconfig:   2345 95 95
-# description: Daemon for docker.io
+# description: Daemon for docker.com
 
 ### BEGIN INIT INFO
 # Provides:       docker
@@ -16,7 +16,7 @@
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 # Short-Description: start and stop docker
-# Description: Daemon for docker.io
+# Description: Daemon for docker.com
 ### END INIT INFO
 
 # Source function library.

daemon/daemon.go

@@ -836,7 +836,7 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
 	localCopy := path.Join(config.Root, "init", fmt.Sprintf("dockerinit-%s", dockerversion.VERSION))
 	sysInitPath := utils.DockerInitPath(localCopy)
 	if sysInitPath == "" {
-		return nil, fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See http://docs.docker.io/en/latest/contributing/devenvironment for official build instructions.")
+		return nil, fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See http://docs.docker.com/contributing/devenvironment for official build instructions.")
 	}
 
 	if sysInitPath != localCopy {

docs/README.md

@@ -3,7 +3,7 @@
 The source for Docker documentation is here under `sources/` and uses extended
 Markdown, as implemented by [MkDocs](http://mkdocs.org).
 
-The HTML files are built and hosted on `https://docs.docker.io`, and update
+The HTML files are built and hosted on `https://docs.docker.com`, and update
 automatically after each change to the master or release branch of [Docker on
 GitHub](https://github.com/dotcloud/docker) thanks to post-commit hooks. The
 `docs` branch maps to the "latest" documentation and the `master` (unreleased
@@ -21,14 +21,14 @@ In the rare case where your change is not forward-compatible, you may need to
 base your changes on the `docs` branch.
 
 Also, now that we have a `docs` branch, we can keep the
-[http://docs.docker.io](http://docs.docker.io) docs up to date with any bugs
+[http://docs.docker.com](http://docs.docker.com) docs up to date with any bugs
 found between Docker code releases.
 
 **Warning**: When *reading* the docs, the
-[http://beta-docs.docker.io](http://beta-docs.docker.io) documentation may
+[http://docs-stage.docker.com](http://docs-stage.docker.com) documentation may
 include features not yet part of any official Docker release. The `beta-docs`
 site should be used only for understanding bleeding-edge development and
-`docs.docker.io` (which points to the `docs` branch`) should be used for the
+`docs.docker.com` (which points to the `docs` branch`) should be used for the
 latest official release.
 
 ## Contributing

docs/man/Dockerfile.5.md

@@ -203,4 +203,4 @@ or
  run later, during the next build stage.  
 
 # HISTORY
-*May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.io Dockerfile documentation.
+*May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.com Dockerfile documentation.

docs/man/README.md

@@ -68,4 +68,4 @@ The Pandoc Docker container will process the Markdown files and generate
 the man pages inside the `docker/docs/man/man1` directory using
 Docker volumes. For more information on Docker volumes see the man page for
 `docker run` and also look at the article [Sharing Directories via Volumes]
-(http://docs.docker.io/use/working_with_volumes/).
+(http://docs.docker.com/use/working_with_volumes/).

docs/man/docker-attach.1.md

@@ -57,5 +57,5 @@ attach** command:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-build.1.md

@@ -117,5 +117,5 @@ Note: You can set an arbitrary Git repository via the `git://` schema.
 
 # HISTORY
 March 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-commit.1.md

@@ -35,5 +35,5 @@ create a new image run docker ps to find the container's ID and then run:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and in
+based on docker.com source material and in
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-cp.1.md

@@ -24,5 +24,5 @@ the exited container to the current dir on the host:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-diff.1.md

@@ -43,5 +43,5 @@ Inspect the changes to on a nginx container:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-events.1.md

@@ -49,5 +49,5 @@ Again the output container IDs have been shortened for the purposes of this docu
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-export.1.md

@@ -26,5 +26,5 @@ called test.tar:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-history.1.md

@@ -30,5 +30,5 @@ Show the history of when and how an image was created.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-images.1.md

@@ -86,5 +86,5 @@ tools.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-import.1.md

@@ -39,5 +39,5 @@ Import to docker via pipe and stdin:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-info.1.md

@@ -44,5 +44,5 @@ Here is a sample output:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-inspect.1.md

@@ -225,5 +225,5 @@ Use an image's ID or name (e.g., repository/name[:tag]) to get information
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-kill.1.md

@@ -20,5 +20,5 @@ The main process inside each container specified will be sent SIGKILL,
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
- based on docker.io source material and internal work.
+ based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-load.1.md

@@ -34,5 +34,5 @@ Restores both images and tags.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-login.1.md

@@ -34,5 +34,5 @@ login to a private registry you can specify this by adding the server name.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-logs.1.md

@@ -29,5 +29,5 @@ then continue streaming new output from the container’s stdout and stderr.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-port.1.md

@@ -13,5 +13,4 @@ There are no available options.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-ps.1.md

@@ -66,5 +66,5 @@ the running containers.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.io source material and internal work.
+based on docker.com source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>

docs/man/docker-pull.1.md

@@ -51,5 +51,10 @@ There are no available options.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-push.1.md

@@ -10,7 +10,7 @@ NAME[:TAG]
 
 # DESCRIPTION
 Push an image or a repository to a registry. The default registry is the Docker 
-Index located at [index.docker.io](https://index.docker.io/v1/). However the 
+Hub located at [hub.docker.com](https://hub.docker.com/). However the 
 image can be pushed to another, perhaps private, registry as demonstrated in 
 the example below.
 
@@ -28,7 +28,7 @@ and then committing it to a new image name:
 
 Now push the image to the registry using the image ID. In this example
 the registry is on host named registry-host and listening on port 5000.
-Default Docker commands will push to the default `index.docker.io`
+Default Docker commands will push to the default `hub.docker.com`
 registry. Instead, push to the local registry, which is on a host called
 registry-host*. To do this, tag the image with the host name or IP
 address, and the port of the registry:
@@ -45,5 +45,9 @@ listed.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-restart.1.md

@@ -18,5 +18,10 @@ Restart each container listed.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-rm.1.md

@@ -47,5 +47,9 @@ command. The use that name as follows:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-rmi.1.md

@@ -34,5 +34,9 @@ Here is an example of removing and image:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-run.1.md

@@ -369,5 +369,9 @@ changes will also be reflected on the host in /var/db.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-save.1.md

@@ -33,5 +33,10 @@ fedora image to a fedora-latest.tar:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-search.1.md

@@ -54,5 +54,9 @@ ranked 1 or higher:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-start.1.md

@@ -23,5 +23,9 @@ Start a stopped container.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-stop.1.md

@@ -19,5 +19,9 @@ Stop a running container (Send SIGTERM, and then SIGKILL after
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-tag.1.md

@@ -54,5 +54,9 @@ registry you must tag it with the registry hostname and port (if needed).
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-top.1.md

@@ -27,5 +27,10 @@ Run **docker top** with the ps option of -x:
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+
+>>>>>>> 834ef8a... I'm going to wish I didn't do this

docs/man/docker-wait.1.md

@@ -24,5 +24,10 @@ There are no available options.
 
 # HISTORY
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
+<<<<<<< HEAD
 based on docker.io source material and internal work.
 June 2014, updated by Sven Dowideit <[email protected]>
+=======
+based on docker.com source material and internal work.
+
+>>>>>>> 834ef8a... I'm going to wish I didn't do this