--- ch_basics-remove-qif.xml	2010-12-15 12:53:00.000000000 +0100
+++ ch_basics-saves-screen.xml	2010-12-15 12:53:44.000000000 +0100
@@ -554,24 +554,62 @@
   </sect1>
 
   <sect1 id="basics-files1">
-    <title>Creating and Saving Files</title>
+    <title>Storing your financial data</title>
 
-    <para>If you are using <application>&app;</application> for the first time, it will automatically
-    open a new file when you begin. Follow these steps to save the file under
-    a new name:</para>
+    <para><application>&app;</application> is able to <link linkend="basics-store-data">store</link>
+    your financial data in files or databases so that they can be <link linkend="basics-open-data">opened</link>
+    and modified at a later time. But first you need to <link linkend="basics-create-data">create</link> 
+    a container for your data.</para>
+    
+    <sect2 id="basics-create-data">
+    <title>Creating a file</title>
+    <para>To create a new <application>&app;</application> file do the following:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>From the <application>&app;</application> menubar, choose <menuchoice><guimenu>File</guimenu>
+        <guimenuitem>New File</guimenuitem></menuchoice>. The <guilabel>New Account Hierarchy setup</guilabel>
+        assistant will start.</para>
+        <note>
+          <para>If you are running <application>&app;</application> for the first time, you will be presented 
+          with the <guilabel>Cannot find default values</guilabel> screen or with the 
+          <guilabel>Welcome to &app;!</guilabel> screen. Both are described in detail in the 
+          <application>&app;</application> manual.</para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para>Set your preferences in the assistant and move through the screens with the 
+        <guibutton>Forward</guibutton>, <guibutton>Cancel</guibutton> and <guibutton>Previous</guibutton>
+        buttons.</para>
+      </listitem>
+    </orderedlist>
+
+    </sect2>
+    
+    <sect2 id="basics-store-data">
+    <title>Saving data</title>
+    <para>Follow these steps to save the file under your preferred name:</para>
 
     <orderedlist>
       <listitem>
         <para>Choose <menuchoice><guimenu>File</guimenu> <guimenuitem>Save
-        As...</guimenuitem></menuchoice> from the menu bar or select the
-        <guibutton>Save</guibutton> toolbar button. <application>&app;</application> will bring up this
-        window:</para>
+        As...</guimenuitem></menuchoice> from the menubar or select the
+        <guibutton>Save</guibutton> toolbar button. <application>&app;</application> will bring
+        up the save window.</para>
+      </listitem>
 
-        <screenshot id="basics-SaveAs">
+      <listitem>
+        <para>Select the <guilabel>Data Format</guilabel> of the file you are saving from the 
+        drop down list.</para>
+        <para>Depending on the selected <guilabel>Data Format</guilabel> the window can change as showed 
+        in the next two figures.</para>
+        
+        <screenshot id="basics-SaveXML">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/basics_SaveAs.png" format="PNG"
-                         srccredit="Bengt Thuree" ></imagedata>
+              <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                         srccredit="Cristian Marchi" ></imagedata>
             </imageobject>
 
             <textobject>
@@ -579,20 +617,68 @@
             </textobject>
 
             <caption>
-              <para>This image shows the <interface>Save</interface>
-              screen.</para>
+              <para>This image shows the <interface>Save</interface> screen when the selected 
+              <guilabel>Data Format</guilabel> is <acronym>XML</acronym> or <acronym>sqlite3</acronym>.</para>
             </caption>
           </mediaobject>
         </screenshot>
+      
+        <screenshot id="basics-SaveSQL">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                         srccredit="Marchi Cristian" ></imagedata>
+            </imageobject>
+
+            <textobject>
+              <phrase>The Save screen</phrase>
+            </textobject>
+
+            <caption>
+              <para>This image shows the <interface>Save</interface> screen when the selected 
+              <guilabel>Data Format</guilabel> is <acronym>mysql</acronym> or <acronym>postgres</acronym>.</para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+        
       </listitem>
 
       <listitem>
-        <para>In the text box below <guilabel>Selection</guilabel> type your
-        chosen file name (e.g. gcashdata).</para>
+      <para></para>
+        <itemizedlist>
+          <listitem>
+            <para>If you selected <acronym>XML</acronym> or <acronym>sqlite3</acronym>
+            type your chosen file name.</para>
+            <note>
+              <para>It is not necessary to specify an extension when you write
+              the file name.</para>
+            </note>
+            <para><application>&app;</application> stores its data with the extension <filename>.gnucash</filename>.</para>
+            <note>
+              <para>The <filename>.gnucash</filename> extension was introduced in the 2.3 series of <application>&app;</application>.
+              For already existing files, the extension will never be changed. So if you open an existing file named 
+              <filename>Myoldfile</filename>, that name won&rsquo;t be changed if the file is saved. You might use the 
+              <guimenuitem>Save As...</guimenuitem> command and give the file a new name in order to have it saved with the 
+              extension <filename>.gnucash</filename>.</para>
+            </note>
+            <para>Select the path where the file will be saved by browsing the tree in the lower panes.</para>
+            <tip>
+              <para>Click on the <guibutton>Create Folder</guibutton> button to create a new folder with a
+              custom name in the selected path.</para>
+            </tip>
+          </listitem>
+        
+          <listitem>
+            <para>If you selected <acronym>mysql</acronym> or <acronym>postgres</acronym>
+            <guilabel>Data Format</guilabel> enter the <guilabel>Database Connection</guilabel> information:
+            <guilabel>Host</guilabel>, <guilabel>Database</guilabel>, <guilabel>Username</guilabel> 
+            and <guilabel>Password</guilabel>.</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
 
       <listitem>
-        <para>Click the <guibutton>OK</guibutton> button to save the
+        <para>Click the <guibutton>Save As</guibutton> button to save the
         file.</para>
       </listitem>
     </orderedlist>
@@ -600,19 +686,7 @@
     <para>If you are keeping track of finances for a single household, you
     need only one file. But if you are also tracking business finances or want
     to keep data separate for some reason, then you will need more than one
-    file. To create a new file:</para>
-
-    <orderedlist>
-      <listitem>
-        <para>From the main menu, choose <menuchoice><guimenu>File</guimenu>
-        <guimenuitem>New File</guimenuitem></menuchoice>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Follow the steps above for saving a file under a new
-        name.</para>
-      </listitem>
-    </orderedlist>
+    file.</para>
 
     <para>Before ending each <application>&app;</application> session, be sure to save your data
     changes using <menuchoice><guimenu>File</guimenu>
@@ -628,25 +702,21 @@
         menu entry will be grayed out because changes are stored right away.</para>
     </note>
     </para>
-    <para>To open an existing file, select <menuchoice><guimenu>File</guimenu>
-    <guimenuitem>Open</guimenuitem></menuchoice> from the menu and choose your file from the list.</para>
-
-    <para><application>&app;</application> stores its data with the extension <filename>.gnucash</filename>.</para>
-      <note>
-        <para>The <filename>.gnucash</filename> extension was introduced in the 2.3 series of <application>&app;</application>.
-        For already existing files, the extension will never be changed. So if you open an existing file named 
-        <filename>Myoldfile</filename>, that name won&rsquo;t be changed if the file is saved. You might use the 
-        <guimenuitem>Save As...</guimenuitem> command and give the file a new name in order to have it saved with the 
-        extension <filename>.gnucash</filename>.</para>
-      </note>
+    </sect2>
     
-    <para>If you name your <application>&app;</application> file to <filename>MyBudget</filename>, the actual file name
-    will be <filename>MyBudget.gnucash</filename></para>
-      <note>
-        <para>It is not necessary to specify an extension when you write
-        the file name. Per the above example, it is enough to only specify
-        <filename>MyBudget</filename> as the filename.</para>
-      </note>
+    <sect2 id="basics-open-data">
+    <title>Opening data</title>
+    <para>To open an existing file or database, select <menuchoice><guimenu>File</guimenu>
+    <guimenuitem>Open</guimenuitem></menuchoice> from the menu. In the window that will open,
+    select the <guilabel>Data Format</guilabel>. If you selected <guilabel>File</guilabel> choose the file you want to open
+    by browsing the folders in the lower panes. Else, enter the required <guilabel>Database Connection</guilabel> 
+    information.</para>
+    <tip>
+      <para><application>&app;</application> keeps a list of the recently opened files. Open the <guilabel>File</guilabel>
+      menu and you will see listed the names of recently opened files. Click on the one you want to load to open it.</para>
+    </tip>
+    </sect2>
+
   </sect1>
 
   <sect1 id="basics-backup1">
