1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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

Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
This commit is contained in:
Andy Rothfusz 2013-07-02 15:10:07 -07:00
commit 96ab3c540d

View file

@ -92,7 +92,7 @@ regions.
Designed for automation
~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~
Because they offer the same standard operations regardless of content
and infrastructure, Standard Containers, just like their physical
@ -117,9 +117,8 @@ half-broken. The process was slow, inefficient and cost a fortune -
and was entirely different depending on the language and
infrastructure provider.
Industrial-grade delivery
~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~
There are 17 million shipping containers in existence, packed with
every physical good imaginable. Every single one of them can be loaded