p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine
This commit is contained in:
Andy Rothfusz
2013-07-02 15:10:07 -07:00
parent 92fbe05ddb 4deb63608f
commit d5551edef2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/docs/sources/concepts/manifesto.rst
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