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

Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst

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

..

images

Cleaning up the welcome page, terminology, and images.

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

index.rst

Cleaning up the welcome page, terminology, and images.

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

manifesto.rst

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

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