Makefile: Streamline directory creation

[ganeti-local] / man / gnt-backup.sgml

diff --git a/man/gnt-backup.sgml b/man/gnt-backup.sgml
index 8ec4e69..91c4955 100644 (file)
--- a/man/gnt-backup.sgml
+++ b/man/gnt-backup.sgml
@@ -2,7 +2,7 @@
 
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
   <!-- Please adjust the date whenever revising the manpage. -->
 
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
   <!-- Please adjust the date whenever revising the manpage. -->

-  <!ENTITY dhdate      "<date>February 11, 2009</date>">
+  <!ENTITY dhdate      "<date>June 08, 2010</date>">

   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>8</manvolnum>">

@@ -30,12 +30,12 @@
     &dhucpackage;
 
     &dhsection;
     &dhucpackage;
 
     &dhsection;

-    <refmiscinfo>ganeti 2.1</refmiscinfo>
+    <refmiscinfo>Ganeti 2.2</refmiscinfo>

   </refmeta>
   <refnamediv>
     <refname>&dhpackage;</refname>
 
   </refmeta>
   <refnamediv>
     <refname>&dhpackage;</refname>
 

-    <refpurpose>ganeti instance import/export</refpurpose>
+    <refpurpose>Ganeti instance import/export</refpurpose>

   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>

@@ -50,8 +50,8 @@
 
     <para>
       The <command>&dhpackage;</command> is used for importing and exporting
 
     <para>
       The <command>&dhpackage;</command> is used for importing and exporting

-      instances and their configuration from a ganeti system. It is useful for
-      backing instances up and also to migrate them between clusters.
+      instances and their configuration from a Ganeti system. It is useful for
+      backing up instances and also to migrate them between clusters.

     </para>
 
   </refsect1>
     </para>
 
   </refsect1>

@@ -66,6 +66,8 @@
         <arg choice="req">-n <replaceable>node</replaceable></arg>
         <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
         <arg>--noshutdown</arg>
         <arg choice="req">-n <replaceable>node</replaceable></arg>
         <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
         <arg>--noshutdown</arg>

+        <arg>--remove-instance</arg>
+        <arg>--ignore-remove-failures</arg>

         <arg choice="req"><replaceable>instance</replaceable></arg>
 
       </cmdsynopsis>
         <arg choice="req"><replaceable>instance</replaceable></arg>
 
       </cmdsynopsis>

@@ -93,6 +95,12 @@
       </para>
 
       <para>
       </para>
 
       <para>

+        The <option>--remove</option> option can be used to remove the
+        instance after it was exported. This is useful to make one last
+        backup before removing the instance.
+      </para>
+
+      <para>

         The exit code of the command is 0 if all disks were backed up
         successfully, 1 if no data was backed up or if the
         configuration export failed, and 2 if just some of the disks
         The exit code of the command is 0 if all disks were backed up
         successfully, 1 if no data was backed up or if the
         configuration export failed, and 2 if just some of the disks

@@ -206,9 +214,8 @@
           <varlistentry>
             <term>mac</term>
             <listitem>
           <varlistentry>
             <term>mac</term>
             <listitem>

-              <simpara>either a value or <constant>GENERATE</constant>
-              to generate a new unique MAC, or
-              <constant>AUTO</constant> to reuse the old MAC</simpara>
+              <simpara>either a value or 'generate' to generate a new
+              unique MAC, or 'auto' to reuse the old MAC</simpara>

             </listitem>
           </varlistentry>
           <varlistentry>
             </listitem>
           </varlistentry>
           <varlistentry>