Thatcher Peskens 45e3eef148 Resolved conflict in conf.py ...

ps. also changed navigation (swapped community and getting started)
Upstream-commit: 6c87db97a629f3d7b7f6e276a515506bcca8dbb1
Component: engine

2013-08-13 16:28:24 -07:00

..

api

Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.

2013-08-13 13:45:07 -07:00

commandline

Fix typo in docs for docker run -dns

2013-08-11 02:04:04 +01:00

concepts

Clean up 'manifesto' in docs

2013-07-26 10:21:17 -07:00

contributing

Fixed typos

2013-08-12 18:53:06 +01:00

examples

Merge pull request #1508 from pborreli/typos

2013-08-12 15:17:02 -07:00

installation

Fixed typos

2013-08-12 18:53:06 +01:00

static_files

Major rearrange of the documentation.

2013-05-10 12:00:12 -07:00

terms

Fixed typos

2013-08-12 18:53:06 +01:00

use

Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.

2013-08-13 13:45:07 -07:00

conf.py

Resolved conflict in conf.py

2013-08-13 16:28:24 -07:00

faq.rst

Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.

2013-08-13 13:45:07 -07:00

index.rst

Fixed typos

2013-08-12 18:53:06 +01:00

toctree.rst

Cleaning up the welcome page, terminology, and images.

2013-07-02 15:03:29 -07:00