diff --git a/README.md b/README.md index 37eb7d1043..87149c9e66 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Contributing to Docker ====================== [![GoDoc](https://godoc.org/github.com/docker/docker?status.svg)](https://godoc.org/github.com/docker/docker) -[![Jenkins Build Status](https://jenkins.dockerproject.com/job/Docker%20Master/badge/icon)](https://jenkins.dockerproject.com/job/Docker%20Master/) +[![Jenkins Build Status](https://jenkins.dockerproject.org/job/Docker%20Master/badge/icon)](https://jenkins.dockerproject.org/job/Docker%20Master/) Want to hack on Docker? Awesome! We have [instructions to help you get started contributing code or documentation.](https://docs.docker.com/project/who-written-for/). @@ -192,12 +192,12 @@ Getting the development builds ============================== Want to run Docker from a master build? You can download -master builds at [master.dockerproject.com](https://master.dockerproject.com). +master builds at [master.dockerproject.org](https://master.dockerproject.org). They are updated with each commit merged into the master branch. Don't know how to use that super cool new feature in the master build? Check out the master docs at -[docs.master.dockerproject.com](http://docs.master.dockerproject.com). +[docs.master.dockerproject.org](http://docs.master.dockerproject.org). How the project is run ====================== diff --git a/docs/README.md b/docs/README.md index 8ff25adab7..bb41dbf10a 100755 --- a/docs/README.md +++ b/docs/README.md @@ -12,7 +12,7 @@ Docker has two primary branches for documentation: | Branch | Description | URL (published via commit-hook) | |----------|--------------------------------|------------------------------------------------------------------------------| | `docs` | Official release documentation | [https://docs.docker.com](https://docs.docker.com) | -| `master` | Merged but unreleased development work | [http://docs.master.dockerproject.com](http://docs.master.dockerproject.com) | +| `master` | Merged but unreleased development work | [http://docs.master.dockerproject.org](http://docs.master.dockerproject.org) | Additions and updates to upcoming releases are made in a feature branch off of the `master` branch. The Docker maintainers also support a `docs` branch that @@ -22,7 +22,7 @@ After a release, documentation updates are continually merged into `master` as they occur. This work includes new documentation for forthcoming features, bug fixes, and other updates. Docker's CI system automatically builds and updates the `master` documentation after each merge and posts it to -[http://docs.master.dockerproject.com](http://docs.master.dockerproject.com). +[http://docs.master.dockerproject.org](http://docs.master.dockerproject.org). Periodically, the Docker maintainers update `docs.docker.com` between official releases of Docker. They do this by cherry-picking commits from `master`, diff --git a/docs/sources/project/coding-style.md b/docs/sources/project/coding-style.md index 57f6389365..7bc21e7376 100644 --- a/docs/sources/project/coding-style.md +++ b/docs/sources/project/coding-style.md @@ -86,8 +86,8 @@ program code and documentation code. ## Merges after pull requests -* After a merge, [a master build](https://master.dockerproject.com/) is +* After a merge, [a master build](https://master.dockerproject.org/) is available almost immediately. * If you made a documentation change, you can see it at - [docs.master.dockerproject.com](http://docs.master.dockerproject.com/). + [docs.master.dockerproject.org](http://docs.master.dockerproject.org/). diff --git a/docs/sources/project/review-pr.md b/docs/sources/project/review-pr.md index b143c30b21..0dba1465bf 100644 --- a/docs/sources/project/review-pr.md +++ b/docs/sources/project/review-pr.md @@ -108,7 +108,7 @@ It can take time to see a merged pull request in Docker's official release. A master build is available almost immediately though. Docker builds and updates its development binaries after each merge to `master`. -1. Browse to https://master.dockerproject.com/. +1. Browse to https://master.dockerproject.org/. 2. Look for the binary appropriate to your system. @@ -117,7 +117,7 @@ updates its development binaries after each merge to `master`. You might want to run the binary in a container though. This will keep your local host environment clean. -4. View any documentation changes at docs.master.dockerproject.com. +4. View any documentation changes at docs.master.dockerproject.org. Once you've verified everything merged, feel free to delete your feature branch from your fork. For information on how to do this, diff --git a/docs/sources/userguide/labels-custom-metadata.md b/docs/sources/userguide/labels-custom-metadata.md index 79ac42ebf4..40b200f86b 100644 --- a/docs/sources/userguide/labels-custom-metadata.md +++ b/docs/sources/userguide/labels-custom-metadata.md @@ -38,7 +38,7 @@ notation. Use the following guidelines to name your keys: reverse DNS notation of a domain controlled by the author. For example, `com.example.some-label`. -- The `com.docker.*`, `io.docker.*` and `com.dockerproject.*` namespaces are +- The `com.docker.*`, `io.docker.*` and `org.dockerproject.*` namespaces are reserved for Docker's internal use. - Keys should only consist of lower-cased alphanumeric characters, diff --git a/hack/make/.build-deb/control b/hack/make/.build-deb/control index ac6541a73e..dc7e5c5f51 100644 --- a/hack/make/.build-deb/control +++ b/hack/make/.build-deb/control @@ -1,6 +1,6 @@ Source: docker-engine Maintainer: Docker -Homepage: https://dockerproject.com +Homepage: https://dockerproject.org Vcs-Browser: https://github.com/docker/docker Vcs-Git: git://github.com/docker/docker.git diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 8cb7c11184..33dca23173 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec @@ -6,7 +6,7 @@ Summary: The open-source application container engine License: ASL 2.0 Source: %{name}.tar.gz -URL: https://dockerproject.com +URL: https://dockerproject.org Vendor: Docker Packager: Docker diff --git a/project/TOOLS.md b/project/TOOLS.md index 79bd28374d..87c6cde8d3 100644 --- a/project/TOOLS.md +++ b/project/TOOLS.md @@ -5,7 +5,7 @@ the Docker project. ### CI -The Docker project uses [Jenkins](https://jenkins.dockerproject.com/) as our +The Docker project uses [Jenkins](https://jenkins.dockerproject.org/) as our continuous integration server. Each Pull Request to Docker is tested by running the equivalent of `make all`. We chose Jenkins because we can host it ourselves and we run Docker in Docker to test.