kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #13709 from jfrazelle/update-url

Browse source 
Update urls from .com to .org.
This commit is contained in:
Jessie Frazelle 2015-06-03 14:21:38 -07:00
commit ca66419522
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -180,7 +180,7 @@ Contributing to Docker
====================== ======================
[![GoDoc](https://godoc.org/github.com/docker/docker?status.svg)](https://godoc.org/github.com/docker/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 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/). 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 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. 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 Don't know how to use that super cool new feature in the master build? Check
out the master docs at 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 How the project is run
====================== ======================

4
docs/README.md
View file

@ -12,7 +12,7 @@ Docker has two primary branches for documentation:
| Branch | Description | URL (published via commit-hook) | | Branch | Description | URL (published via commit-hook) |
|----------|--------------------------------|------------------------------------------------------------------------------| |----------|--------------------------------|------------------------------------------------------------------------------|
| `docs` | Official release documentation | [https://docs.docker.com](https://docs.docker.com) | | `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 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 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 they occur. This work includes new documentation for forthcoming features, bug
fixes, and other updates. Docker's CI system automatically builds and updates fixes, and other updates. Docker's CI system automatically builds and updates
the `master` documentation after each merge and posts it to 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 Periodically, the Docker maintainers update `docs.docker.com` between official
releases of Docker. They do this by cherry-picking commits from `master`, releases of Docker. They do this by cherry-picking commits from `master`,

4
docs/sources/project/coding-style.md
View file

@ -86,8 +86,8 @@ program code and documentation code.
## Merges after pull requests ## 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. available almost immediately.
* If you made a documentation change, you can see it at * 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/).

4
docs/sources/project/review-pr.md
View file

@ -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 A master build is available almost immediately though. Docker builds and
updates its development binaries after each merge to `master`. updates its development binaries after each merge to `master`.
1. Browse to <a href="https://master.dockerproject.com/" target="_blank">https://master.dockerproject.com/</a>. 1. Browse to <a href="https://master.dockerproject.org/" target="_blank">https://master.dockerproject.org/</a>.
2. Look for the binary appropriate to your system. 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 You might want to run the binary in a container though. This
will keep your local host environment clean. will keep your local host environment clean.
4. View any documentation changes at <a href="http://docs.master.dockerproject.com/" target="_blank">docs.master.dockerproject.com</a>. 4. View any documentation changes at <a href="http://docs.master.dockerproject.org/" target="_blank">docs.master.dockerproject.org</a>.
Once you've verified everything merged, feel free to delete your feature branch Once you've verified everything merged, feel free to delete your feature branch
from your fork. For information on how to do this, from your fork. For information on how to do this,

2
docs/sources/userguide/labels-custom-metadata.md
View file

@ -38,7 +38,7 @@ notation. Use the following guidelines to name your keys:
reverse DNS notation of a domain controlled by the author. For reverse DNS notation of a domain controlled by the author. For
example, `com.example.some-label`. 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. reserved for Docker's internal use.
- Keys should only consist of lower-cased alphanumeric characters, - Keys should only consist of lower-cased alphanumeric characters,

2
hack/make/.build-deb/control
View file

@ -1,6 +1,6 @@
Source: docker-engine Source: docker-engine
Maintainer: Docker <support@docker.com> Maintainer: Docker <support@docker.com>
Homepage: https://dockerproject.com Homepage: https://dockerproject.org
Vcs-Browser: https://github.com/docker/docker Vcs-Browser: https://github.com/docker/docker
Vcs-Git: git://github.com/docker/docker.git Vcs-Git: git://github.com/docker/docker.git

2
hack/make/.build-rpm/docker-engine.spec
View file

@ -6,7 +6,7 @@ Summary: The open-source application container engine
License: ASL 2.0 License: ASL 2.0
Source: %{name}.tar.gz Source: %{name}.tar.gz
URL: https://dockerproject.com URL: https://dockerproject.org
Vendor: Docker Vendor: Docker
Packager: Docker <support@docker.com> Packager: Docker <support@docker.com>

2
project/TOOLS.md
View file

@ -5,7 +5,7 @@ the Docker project.
### CI ### 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 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 equivalent of `make all`. We chose Jenkins because we can host it ourselves and
we run Docker in Docker to test. we run Docker in Docker to test.