diff --git a/docs/install.rst b/docs/install.rst index f9592ccc7eab027a418b45a1b97a16688dcf3355..b1ab92427a53a3ea6ea7476d2331afb1253a2f51 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -1,10 +1,10 @@ Installation ^^^^^^^^^^^^ -This guide describes how to install snf-image-creator on an Ubuntu 12.04 LTS -system. It is highly recommended to have virtualization capable hardware. -snf-image-creator will work on processors that do not support virtualization -but it will be extremely slow. +This guide describes how to install snf-image-creator on your machine. It is +highly recommended to have virtualization capable hardware. snf-image-creator +will work on processors that do not support virtualization but it will be +extremely slow. Dependencies ============ @@ -22,11 +22,14 @@ snf-image-creator depends on the following programs: * Python interface to sendfile [http://pypi.python.org/pypi/pysendfile] The above dependencies are resolved differently, depending on the installation -method you choose. +method you choose. There are two installation methods available: -There are two installation methods. The first uses official packages whereas -the second installs snf-image-creator and its dependencies from source. Both -methods are presented below. +#. `Install snf-image-creator using official packages`_ (currently only for + Ubuntu 12.04, more OSes will be supported soon) +#. `Install snf-image-creator from source`_ (provided you meet the above + dependencies) + +Both methods are presented below. Install snf-image-creator using official packages ================================================= diff --git a/docs/usage.rst b/docs/usage.rst index 219911620b3760e8758244f8babf2158a1b53e3d..6fee2417062c217d15728c664e22c4cfe1c85eab 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -58,7 +58,7 @@ found, before extracting the image. Both can be disabled by specifying *--no-sysprep* and *--no-shrink* respectively. If *--print-sysprep* is defined, the program will exit after outputing a -list of enabled and disabled system preparation operation appliable to this +list of enabled and disabled system preparation operation applicable to this media source. The user can enable or disable specific *syspreps* when creating an image, using *-{enable,disable}-sysprep* options. You can specify those options multiple times to enable or disable multiple *syspreps*. @@ -287,7 +287,7 @@ to the user to do it. Swap partitions --------------- -If you want your image to have a swap partitions, make sure this is the last +If you want your image to have a swap partition, make sure this is the last partition on the disk. If snf-image-creator detects a swap partition in the end of the input media, it will remove the partition when shrinking and will save enough information to be able to recreate it during image deployment. This will