瀏覽代碼

Clean up image text, minor updates to docs.

Andy Rothfusz 12 年之前
父節點
當前提交
b47873c5ac

+ 7 - 6
docs/sources/concepts/manifesto.rst

@@ -2,13 +2,14 @@
 :description: An overview of Docker and standard containers
 :keywords: containers, lxc, concepts, explanation
 
-The Big Picture
-===============
+.. _dockermanifesto:
 
-What is Docker now, and what do we want Docker to become? Read on!
+*(This was our original Welcome page, but it is a bit forward-looking
+for docs, and maybe not enough vision for a true manifesto. We'll
+reveal more vision in the future to make it more Manifesto-y.)*
 
-Docker -- The Linux container runtime
--------------------------------------
+Docker Manifesto
+----------------
 
 Docker complements LXC with a high-level API which operates at the
 process level. It runs unix processes with strong guarantees of
@@ -28,7 +29,7 @@ systems, private PaaS, service-oriented architectures, etc.
 
 
 What is a Standard Container?
------------------------------
+.............................
 
 Docker defines a unit of software delivery called a Standard Container. The goal of a Standard Container is to encapsulate a software component and all its dependencies in
 a format that is self-describing and portable, so that any compliant runtime can run it without extra dependency, regardless of the underlying machine and the contents of the container.

+ 6 - 1
docs/sources/index.rst

@@ -9,7 +9,12 @@ Welcome
 
 .. image:: concepts/images/dockerlogo-h.png
 
-``docker``, the Linux Container Runtime, runs three ways:
+``docker``, the Linux Container Runtime, runs Unix processes with
+strong guarantees of isolation across servers. Your software runs
+repeatably everywhere because its :ref:`container_def` includes any
+dependencies.
+
+``docker`` runs three ways:
 
 * as a daemon to manage LXC containers on your :ref:`Linux host <kernel>` (``sudo docker -d``)
 * as a :ref:`CLI <cli>` which talks to the daemon's `REST API <api/docker_remote_api>`_ (``docker run ...``)

+ 2 - 0
docs/sources/terms/container.rst

@@ -2,6 +2,8 @@
 :description: Definitions of a container
 :keywords: containers, lxc, concepts, explanation, image, container
 
+.. _container_def:
+
 Container
 =========
 

+ 2 - 2
docs/sources/terms/filesystem.rst

@@ -4,8 +4,8 @@
 
 .. _filesystem_def:
 
-File Systems
-============
+File System
+===========
 
 .. image:: images/docker-filesystems-generic.png
 

二進制
docs/sources/terms/images/docker-filesystems-busyboxrw.png


二進制
docs/sources/terms/images/docker-filesystems-debian.png


二進制
docs/sources/terms/images/docker-filesystems-debianrw.png


二進制
docs/sources/terms/images/docker-filesystems-generic.png


二進制
docs/sources/terms/images/docker-filesystems-multilayer.png


二進制
docs/sources/terms/images/docker-filesystems-multiroot.png


File diff suppressed because it is too large
+ 37 - 23
docs/sources/terms/images/docker-filesystems.svg


+ 8 - 7
docs/sources/terms/layer.rst

@@ -2,20 +2,21 @@
 :description: Organizing the Docker Root File System
 :keywords: containers, lxc, concepts, explanation, image, container
 
-Layers and Union Mounts
-=======================
+Layers
+======
 
-In a traditional Linux boot, the kernel first mounts the root `file
-system <filesystem>`_ as read-only, checks its integrity, and then
-switches the whole rootfs volume to read-write mode. 
+In a traditional Linux boot, the kernel first mounts the root
+:ref:`filesystem_def` as read-only, checks its integrity, and then
+switches the whole rootfs volume to read-write mode.
 
 .. _layer_def:
 
 Layer
 .....
 
-Docker does something similar, *except* that instead of changing the
-file system to read-write mode, it takes advantage of a `union mount
+When Docker mounts the rootfs, it starts read-only, as in a tradtional
+Linux boot, but then, instead of changing the file system to
+read-write mode, it takes advantage of a `union mount
 <http://en.wikipedia.org/wiki/Union_mount>`_ to add a read-write file
 system *over* the read-only file system. In fact there may be multiple
 read-only file systems stacked on top of each other. We think of each

Some files were not shown because too many files changed in this diff