From 2ed1092dad9d2dec30945b06572befbba003ed1d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 30 May 2013 11:26:47 -0700 Subject: [PATCH] * Documentation: removed 'building blocks' for now. --- docs/sources/concepts/buildingblocks.rst | 25 ------------------------ docs/sources/concepts/index.rst | 1 - 2 files changed, 26 deletions(-) delete mode 100644 docs/sources/concepts/buildingblocks.rst diff --git a/docs/sources/concepts/buildingblocks.rst b/docs/sources/concepts/buildingblocks.rst deleted file mode 100644 index 5f752ea47b..0000000000 --- a/docs/sources/concepts/buildingblocks.rst +++ /dev/null @@ -1,25 +0,0 @@ -:title: Building Blocks -:description: An introduction to docker and standard containers? -:keywords: containers, lxc, concepts, explanation - - -Building blocks -=============== - -.. _images: - -Images ------- -An original container image. These are stored on disk and are comparable with what you normally expect from a stopped virtual machine image. Images are stored (and retrieved from) repository - -Images are stored on your local file system under /var/lib/docker/graph - - -.. _containers: - -Containers ----------- -A container is a local version of an image. It can be running or stopped, The equivalent would be a virtual machine instance. - -Containers are stored on your local file system under /var/lib/docker/containers - diff --git a/docs/sources/concepts/index.rst b/docs/sources/concepts/index.rst index ba1f9f4718..8b02d15d33 100644 --- a/docs/sources/concepts/index.rst +++ b/docs/sources/concepts/index.rst @@ -13,5 +13,4 @@ Contents: :maxdepth: 1 ../index - buildingblocks