update

svn: r5567

gramps2/doc/gramps-manual/C/usage.xml

@@ -37,13 +37,9 @@
     <para>
 
       To start a new database, choose
+      <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem>
+      </menuchoice>.You will then be asked to give the new database a name.
 
-      <menuchoice>
-        <guimenu>File</guimenu>
-        <guimenuitem>New</guimenuitem>
-      </menuchoice>. 
-
-      You will then be asked to give the new database a name.
     </para>
 
     <note id="new-db-notdir-note">
@@ -66,28 +62,22 @@
     <para>
 
       To open a database, either choose
-
+      <menuchoice><guimenu>File</guimenu>
-      <menuchoice>
+      <guimenuitem>Open</guimenuitem></menuchoice> or click the
-        <guimenu>File</guimenu>
+      <guibutton>Open</guibutton> button on the Toolbar.  The
-        <guimenuitem>Open</guimenuitem>
+      <guilabel>Open database</guilabel> dialog will appear and you'll
-      </menuchoice>
+      see a list of files. If you don't see the file you're looking
-
+      for, make sure the All files filter is selected. (This dialog
-      or click the <guibutton>Open</guibutton> button on the Toolbar.
+      has a &quot;filetype&quot; filter, meaning it may only be
-      The <guilabel>Open database</guilabel> dialog will appear and
-      you'll see a list of files. If you don't see the file you're
-      looking for, make sure the All files filter is selected. (This
-      dialog has a &quot;filetype&quot; filter, meaning it may only be
       showing files that have a certain extension.)
 
-    </para>
+    </para><para>
-    <para>
 
     To open a recently accessed database, choose <menuchoice>
-    <guimenu>File</guimenu> <guimenuitem>Open Recent</guimenuitem>
+    <guimenu>File</guimenu><guimenuitem>Open Recent</guimenuitem>
     </menuchoice> and select the filename from the list.
 
-    </para>
+    </para><para>
-    <para>
 
       If you do not have &quot;write permissions&quot; for the selected database,
       it will be opened in a Read Only mode. In this mode, the data
@@ -144,23 +134,23 @@
       &quot;save&quot; command (although there is a &quot;save
       as&quot; command that we'll discuss below.)
 
-    </para>
+    </para><para>
 
-    <para>
       You can undo changes you've made by selecting
       <menuchoice><guimenu>Edit</guimenu>
       <guimenuitem>Undo</guimenuitem> </menuchoice>. If you select
       this command repeatedly, your most recent changes will be undone
-      one at a time.  </para>
+      one at a time.  
+
+    <para></para>
 
       If you have made changes to your data, and would like to return
       your database to the way it was when you opened it, select
       <menuchoice><guimenu>File</guimenu><guimenuitem>Abandon changes
       and quit</guimenuitem></menuchoice>. This just like quitting
       without saving in other programs.
-    </para>
 
-    <para>
+    </para><para>
 
       If you would like to save your database under a different name,
       you can do so by choosing <menuchoice><guimenu>File</guimenu>
@@ -180,9 +170,10 @@
     <title>Importing Data</title>
     <para>
 
-      Importing allows you to bring data from other
+      Importing allows you to bring data from other genealogy programs
-      genealogy programs into a &app; database Currently,
+      into a &app; database Currently, &app; can import data from the
-      &app; can import data from the following formats: 
+      following formats:
+
     </para>
 
     <itemizedlist>
@@ -213,19 +204,19 @@
 	opening a database. When you import, you are actually bringing
 	data from one database into a GRAMPS database. When you open a
 	file, you editing your original file.
-    <para>
+      </para>
     </note>
 
     <para>
 
-    To import data, select <menuchoice> <guimenu>File</guimenu>
+    To import data, select <menuchoice><guimenu>File</guimenu>
-    <guisubmenu>Import</guisubmenu> </menuchoice>. The
+    <guisubmenu>Import</guisubmenu></menuchoice>. The <guilabel>Import
-    <guilabel>Import database</guilabel> dialog will open, asking you
+    database</guilabel> dialog will open, asking you to specify the
-    to specify the file you wish to import.
+    file you wish to import.
 
     </para>
 
-    <warn id="import-dataloss">
+    <warning id="import-dataloss">
       <title>Data loss with some formats</title>
       <para>
       It is important to note that the importing process is not 
@@ -233,8 +224,7 @@
       that some of the data in these databases will not be imported
       into &app;.
       </para>
-    </warn>
+    </warning>
-
 
     <para>
       The &app; database (grdb), &app; XML, and &app; package are all
@@ -256,6 +246,7 @@
           </para>
 	</listitem>
       </varlistentry>
+
       <varlistentry>
         <term>&app; XML</term>
         <listitem>
@@ -298,7 +289,6 @@
         </listitem>
       </varlistentry>
     </variablelist>
-    </para>
 
     <para>