moby/docs
Sven Dowideit ce7d251d52 rst->md conversion fix
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-16 14:43:52 +10:00
..
sources rst->md conversion fix 2014-04-16 14:43:52 +10:00
theme Changed heading colors and some alignments (no longer center and justification in left column) 2014-04-15 19:15:13 -07:00
asciinema.patch move the documentation to markdown 2014-04-16 11:04:01 +10:00
convert.sh move the documentation to markdown 2014-04-16 11:04:01 +10:00
convert_with_sphinx.patch move the documentation to markdown 2014-04-16 11:04:01 +10:00
Dockerfile move the documentation to markdown 2014-04-16 11:04:01 +10:00
MAINTAINERS Adding myself to the MAINTAINERS file. 2014-04-16 00:33:14 +03:00
Makefile Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page 2013-11-19 10:10:42 -07:00
mkdocs.yml move the documentation to markdown 2014-04-16 11:04:01 +10:00
pr4923.patch move the documentation to markdown 2014-04-16 11:04:01 +10:00
README.md move the documentation to markdown 2014-04-16 11:04:01 +10:00
release.sh move the documentation to markdown 2014-04-16 11:04:01 +10:00
requirements.txt Fix Travis build errors by bumping our python module versions to be newer 2014-01-20 12:30:18 -07:00
s3_website.json move the documentation to markdown 2014-04-16 11:04:01 +10:00

Docker Documentation

Overview

The source for Docker documentation is here under sources/ and uses extended Markdown, as implemented by mkdocs.

The HTML files are built and hosted on https://docs.docker.io, and update automatically after each change to the master or release branch of the docker files on GitHub thanks to post-commit hooks. The "release" branch maps to the "latest" documentation and the "master" (unreleased development) branch maps to the "master" documentation.

Branches

There are two branches related to editing docs: master and a doc* branch (currently doc0.8.1). You should normally edit docs on a local branch of the master branch. That way your fixes will automatically get included in later releases, and docs maintainers can easily cherry-pick your changes to bring over to the current docs branch. In the rare case where your change is not forward-compatible, then you could base your change on the appropriate doc* branch.

Now that we have a doc* branch, we can keep the latest docs up to date with any bugs found between docker code releases.

Warning: When reading the docs, the master documentation may include features not yet part of any official docker release. Master docs should be used only for understanding bleeding-edge development and latest (which points to the doc* branch``) should be used for the latest official release.

Getting Started

Docker documentation builds are done in a docker container, which installs all the required tools, adds the local docs/ directory and builds the HTML docs. It then starts a simple HTTP server on port 8000 so that you can connect and see your changes.

In the docker source directory, run: make docs

If you have any issues you need to debug, you can use make docs-shell and then run mkdocs serve

Contributing

Normal Case:

  • Follow the contribution guidelines (see ../CONTRIBUTING.md).
  • Remember to sign your work!
  • Work in your own fork of the code, we accept pull requests.
  • Change the .md files with your favorite editor -- try to keep the lines short (80 chars) and respect Markdown conventions.
  • Run make clean docs to clean up old files and generate new ones, or just make docs to update after small changes.
  • Your static website can now be found in the _build directory.
  • To preview what you have generated run make server and open http://localhost:8000/ in your favorite browser.

make clean docs must complete without any warnings or errors.

Working using GitHub's file editor

Alternatively, for small changes and typos you might want to use GitHub's built in file editor. It allows you to preview your changes right online (though there can be some differences between GitHub Markdown and mkdocs Markdown). Just be careful not to create many commits. And you must still sign your work!

Images

When you need to add images, try to make them as small as possible (e.g. as gif). Usually images should go in the same directory as the .md file which references them, or in a subdirectory if one already exists.

Publishing Documentation

To publish a copy of the documentation you need a docs/awsconfig file containing AWS settings to deploy to. The release script will create an s3 if needed, and will then push the files to it.

[profile dowideit-docs]
aws_access_key_id = IHOIUAHSIDH234rwf....
aws_secret_access_key = OIUYSADJHLKUHQWIUHE......
region = ap-southeast-2

The profile name must be the same as the name of the bucket you are deploying to - which you call from the docker directory:

make AWS_S3_BUCKET=dowideit-docs docs-release