Victor Vieux c81662eae4 Merge branch 'master' into 1237-improve_docker_top-feature ...

Conflicts:
	docs/sources/api/docker_remote_api.rst

2013-07-22 16:22:11 +00:00

..

api

Merge branch 'master' into 1237-improve_docker_top-feature

2013-07-22 16:22:11 +00:00

commandline

Merge pull request #1259 from dsissitka/patch-3

2013-07-22 06:59:02 -07:00

concepts

Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627

2013-07-02 15:10:07 -07:00

contributing

Fixed a couple of minor syntax errors.

2013-07-20 21:27:55 -04:00

examples

Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.

2013-06-19 00:57:43 +02:00

installation

Fix installation link from welcome page.

2013-07-02 16:48:57 -07:00

static_files

Major rearrange of the documentation.

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

terms

Cleaning up the welcome page, terminology, and images.

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

use

Update ADD documentation to specify new behavior.

2013-07-21 23:32:06 -07:00

conf.py

Bugfixes on docs

2013-06-25 15:31:22 -07:00

faq.rst

Fixed some links

2013-06-05 18:06:51 -07:00

index.rst

Make docs build without warnings or errors. Minor additional cleanup.

2013-07-18 19:04:51 -07:00

toctree.rst

Cleaning up the welcome page, terminology, and images.

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