about summary refs log tree commit diff
path: root/doc/manual/introduction.xml
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-11-01T16·03+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-11-01T16·03+0000
commitee5dcfade2a1c5ee47313b4a971245ec6c07cfa2 (patch)
tree81eb9946dd61a9d730eb41f999f1aabba0977e45 /doc/manual/introduction.xml
parentcbe8de592d747e603c8657247d280faf5eb584a3 (diff)
* Section about garbage collection.
Diffstat (limited to 'doc/manual/introduction.xml')
-rw-r--r--doc/manual/introduction.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual/introduction.xml b/doc/manual/introduction.xml
index 5c968edfc8e8..e0f834385615 100644
--- a/doc/manual/introduction.xml
+++ b/doc/manual/introduction.xml
@@ -41,11 +41,11 @@ during an upgrade in which part of the old version and part of the new
 version are simultaneously visible (which might well cause the
 component to fail).</para></listitem>
 
-<listitem><para>Likewise, it is possible to atomically roll-back after
+<listitem><para>Likewise, it is possible to atomically roll back after
 an install, upgrade, or uninstall action.  That is, in a fast (O(1))
-operation the previous configuration of the system will be
-restored.  This is because upgrade or uninstall actions doesn't
-actually remove components from the system.</para></listitem>
+operation the previous configuration of the system will be restored.
+This is because upgrade or uninstall actions doesn't actually remove
+components from the system.</para></listitem>
 
 <listitem><para>Unused components can be
 <emphasis>garbage-collected</emphasis> automatically and safely.
@@ -111,7 +111,7 @@ deployment of a complete web server with all its configuration files,
 static pages, software dependencies, and so on.  Nix's advantages for
 software deployment also apply here, for instance, the ability
 trivially to have multiple configurations at the same time, or the
-ability to do roll-backs.</para></listitem>
+ability to do rollbacks.</para></listitem>
 
 </itemizedlist>