Skip to content

Commit

Permalink
HTTPS URLs for docs top-level & man pages
Browse files Browse the repository at this point in the history
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <[email protected]>
  • Loading branch information
ewindisch committed Apr 11, 2015
1 parent df9ee6d commit ac65c8c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
The source for Docker documentation is in this directory under `sources/`. Our
documentation uses extended Markdown, as implemented by
[MkDocs](http://mkdocs.org). The current release of the Docker documentation
resides on [http://docs.docker.com](http://docs.docker.com).
resides on [https://docs.docker.com](https://docs.docker.com).

## Understanding the documentation branches and processes

Docker has two primary branches for documentation:

| Branch | Description | URL (published via commit-hook) |
|----------|--------------------------------|------------------------------------------------------------------------------|
| `docs` | Official release documentation | [http://docs.docker.com](http://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) |

Additions and updates to upcoming releases are made in a feature branch off of
Expand Down
2 changes: 1 addition & 1 deletion docs/man/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ The `md2man` 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.com/use/working_with_volumes/).
(https://docs.docker.com/use/working_with_volumes/).
2 changes: 1 addition & 1 deletion docs/man/docker-run.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ you’d like to connect instead, as in:

## Sharing IPC between containers

Using shm_server.c available here: http://www.cs.cf.ac.uk/Dave/C/node27.html
Using shm_server.c available here: https://www.cs.cf.ac.uk/Dave/C/node27.html

Testing `--ipc=host` mode:

Expand Down
2 changes: 1 addition & 1 deletion docs/mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
site_name: Docker Documentation
#site_url: http://docs.docker.com/
#site_url: https://docs.docker.com/
site_url: /
site_description: Documentation for fast and lightweight Docker container based virtualization framework.
site_favicon: img/favicon.png
Expand Down

0 comments on commit ac65c8c

Please sign in to comment.