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

Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine

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

..

api

Issue #1087 Docker Java API client -- added java to Docker Remote API Client document

2013-07-01 11:28:40 -07:00

commandline

Add Entrypoint to builder and container config

2013-07-01 05:34:27 -09:00

concepts

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

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

contributing

Merge branch 'master' into remove_bsdtar

2013-06-14 14:34:30 -07: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

the kernel needs "swapaccount=1" set - some docs are updated, this one seems to have slipped through

2013-06-19 14:45:03 -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

Cleaning up the welcome page, terminology, and images.

2013-07-02 15:03:29 -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

Cleaning up the welcome page, terminology, and images.

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

toctree.rst

Cleaning up the welcome page, terminology, and images.

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