I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.
Signed-off-by: Jessica Frazelle <princess@docker.com>
| ... | ... |
@@ -180,7 +180,7 @@ Contributing to Docker |
| 180 | 180 |
====================== |
| 181 | 181 |
|
| 182 | 182 |
[](https://godoc.org/github.com/docker/docker) |
| 183 |
-[](https://jenkins.dockerproject.com/job/Docker%20Master/) |
|
| 183 |
+[](https://jenkins.dockerproject.org/job/Docker%20Master/) |
|
| 184 | 184 |
|
| 185 | 185 |
Want to hack on Docker? Awesome! We have [instructions to help you get |
| 186 | 186 |
started contributing code or documentation.](https://docs.docker.com/project/who-written-for/). |
| ... | ... |
@@ -192,12 +192,12 @@ Getting the development builds |
| 192 | 192 |
============================== |
| 193 | 193 |
|
| 194 | 194 |
Want to run Docker from a master build? You can download |
| 195 |
-master builds at [master.dockerproject.com](https://master.dockerproject.com). |
|
| 195 |
+master builds at [master.dockerproject.org](https://master.dockerproject.org). |
|
| 196 | 196 |
They are updated with each commit merged into the master branch. |
| 197 | 197 |
|
| 198 | 198 |
Don't know how to use that super cool new feature in the master build? Check |
| 199 | 199 |
out the master docs at |
| 200 |
-[docs.master.dockerproject.com](http://docs.master.dockerproject.com). |
|
| 200 |
+[docs.master.dockerproject.org](http://docs.master.dockerproject.org). |
|
| 201 | 201 |
|
| 202 | 202 |
How the project is run |
| 203 | 203 |
====================== |
| ... | ... |
@@ -12,7 +12,7 @@ Docker has two primary branches for documentation: |
| 12 | 12 |
| Branch | Description | URL (published via commit-hook) | |
| 13 | 13 |
|----------|--------------------------------|------------------------------------------------------------------------------| |
| 14 | 14 |
| `docs` | Official release documentation | [https://docs.docker.com](https://docs.docker.com) | |
| 15 |
-| `master` | Merged but unreleased development work | [http://docs.master.dockerproject.com](http://docs.master.dockerproject.com) | |
|
| 15 |
+| `master` | Merged but unreleased development work | [http://docs.master.dockerproject.org](http://docs.master.dockerproject.org) | |
|
| 16 | 16 |
|
| 17 | 17 |
Additions and updates to upcoming releases are made in a feature branch off of |
| 18 | 18 |
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 |
| 22 | 22 |
they occur. This work includes new documentation for forthcoming features, bug |
| 23 | 23 |
fixes, and other updates. Docker's CI system automatically builds and updates |
| 24 | 24 |
the `master` documentation after each merge and posts it to |
| 25 |
-[http://docs.master.dockerproject.com](http://docs.master.dockerproject.com). |
|
| 25 |
+[http://docs.master.dockerproject.org](http://docs.master.dockerproject.org). |
|
| 26 | 26 |
|
| 27 | 27 |
Periodically, the Docker maintainers update `docs.docker.com` between official |
| 28 | 28 |
releases of Docker. They do this by cherry-picking commits from `master`, |
| ... | ... |
@@ -86,8 +86,8 @@ program code and documentation code. |
| 86 | 86 |
|
| 87 | 87 |
## Merges after pull requests |
| 88 | 88 |
|
| 89 |
-* After a merge, [a master build](https://master.dockerproject.com/) is |
|
| 89 |
+* After a merge, [a master build](https://master.dockerproject.org/) is |
|
| 90 | 90 |
available almost immediately. |
| 91 | 91 |
|
| 92 | 92 |
* If you made a documentation change, you can see it at |
| 93 |
- [docs.master.dockerproject.com](http://docs.master.dockerproject.com/). |
|
| 93 |
+ [docs.master.dockerproject.org](http://docs.master.dockerproject.org/). |
| ... | ... |
@@ -108,7 +108,7 @@ It can take time to see a merged pull request in Docker's official release. |
| 108 | 108 |
A master build is available almost immediately though. Docker builds and |
| 109 | 109 |
updates its development binaries after each merge to `master`. |
| 110 | 110 |
|
| 111 |
-1. Browse to <a href="https://master.dockerproject.com/" target="_blank">https://master.dockerproject.com/</a>. |
|
| 111 |
+1. Browse to <a href="https://master.dockerproject.org/" target="_blank">https://master.dockerproject.org/</a>. |
|
| 112 | 112 |
|
| 113 | 113 |
2. Look for the binary appropriate to your system. |
| 114 | 114 |
|
| ... | ... |
@@ -117,7 +117,7 @@ updates its development binaries after each merge to `master`. |
| 117 | 117 |
You might want to run the binary in a container though. This |
| 118 | 118 |
will keep your local host environment clean. |
| 119 | 119 |
|
| 120 |
-4. View any documentation changes at <a href="http://docs.master.dockerproject.com/" target="_blank">docs.master.dockerproject.com</a>. |
|
| 120 |
+4. View any documentation changes at <a href="http://docs.master.dockerproject.org/" target="_blank">docs.master.dockerproject.org</a>. |
|
| 121 | 121 |
|
| 122 | 122 |
Once you've verified everything merged, feel free to delete your feature branch |
| 123 | 123 |
from your fork. For information on how to do this, |
| ... | ... |
@@ -38,7 +38,7 @@ notation. Use the following guidelines to name your keys: |
| 38 | 38 |
reverse DNS notation of a domain controlled by the author. For |
| 39 | 39 |
example, `com.example.some-label`. |
| 40 | 40 |
|
| 41 |
-- The `com.docker.*`, `io.docker.*` and `com.dockerproject.*` namespaces are |
|
| 41 |
+- The `com.docker.*`, `io.docker.*` and `org.dockerproject.*` namespaces are |
|
| 42 | 42 |
reserved for Docker's internal use. |
| 43 | 43 |
|
| 44 | 44 |
- Keys should only consist of lower-cased alphanumeric characters, |
| ... | ... |
@@ -5,7 +5,7 @@ the Docker project. |
| 5 | 5 |
|
| 6 | 6 |
### CI |
| 7 | 7 |
|
| 8 |
-The Docker project uses [Jenkins](https://jenkins.dockerproject.com/) as our |
|
| 8 |
+The Docker project uses [Jenkins](https://jenkins.dockerproject.org/) as our |
|
| 9 | 9 |
continuous integration server. Each Pull Request to Docker is tested by running the |
| 10 | 10 |
equivalent of `make all`. We chose Jenkins because we can host it ourselves and |
| 11 | 11 |
we run Docker in Docker to test. |