Getting ready for 0.6.0

svn: r558

gramps/doc/gramps-manual/C/gramps-manual.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-<!ENTITY version "0.5.0"> <!-- replace with application version -->
+<!ENTITY version "0.6.0"> <!-- replace with application version -->
 ]>
 
 <!-- =============Document Header ============================= -->
@@ -80,7 +80,7 @@
 
   <!-- This is the manual version, not application version. --> 
     <releaseinfo>
-       This is version 1.0 of the GRAMPS manual.
+       This is version 1.1 of the GRAMPS manual.
     </releaseinfo>
 
   </artheader>
@@ -552,21 +552,11 @@
     <sect2 id="gallerytab">
       <title>Gallery Tab</title>
       <para>
-      Photographs and images are stored in the
+      The <interface>Gallery</interface> tab allows you to associate
-      <interface>Gallery</interface> tab. Images of a wide variety of
+      files (known in <application>GRAMPS</application> as media
-      formats are stored, including JPEG and
+      objects) with a particular person. These files are typically
-      PNG.
+      images or photographs, but may be of any filetype, such as (but
-      </para>
+      not limited to) sound files and word processing documents.
-      <para>
-       <application>GRAMPS</application> can either refer to an
-      existing file, or make its own copy. By default,
-      <application>GRAMPS</application> will make its own copy. There
-      are advantages and disadvatages to both approaches. Refering to
-      an external copy reduces disk space. Allowing
-      <application>GRAMPS</application> to make its own copy
-      allows GRAMPS to still have the image if the original
-      is altered, deleted, or moved. It also simplifies the transfer
-      of a database from one machine to another.
       </para>
       <figure id="ep_gallery-fig">
         <title>Gallery Tab</title>
@@ -577,60 +567,109 @@
         </screenshot>
       </figure>
       <para>
-      The first image in the gallery is considered to be the primary
+      <application>GRAMPS</application> provides a central repository
-      image. This image will appear on the <interface>General
+      for all media objects in the Media View. This allows the same
-      Information</interface> tab, and will be the image used by
+      media object to appear in multiple galleries.  Adding a media
-      report generators. An image can be made the default at any time
+      object to a gallery actually adds the object to the Media View,
-      by selecting the image, and clicking on the <guibutton>Make
+      and makes a local reference in the gallery. 
-      Prmimary</guibutton> button. Images may be added by clicking the
-      <guibutton>Add</guibutton> button, and deleted by clicking the
-      <guibutton>Delete</guibutton> button. If the image is a
-      reference to another file, <application>GRAMPS</application>
-      will remove the reference to the file. If the file is a copy
-      maintained by <application>GRAMPS</application>, then
-      <application>GRAMPS</application> will remove the file from the
-      file system.
       </para>
       <para>
-      Right clicking on an selected image brings up a menu.
+      While each media object can have a note and attributes attached
+      to it, each gallery can add its own notes and attributes to the
+      reference in its gallery. This allows media objects to have
+      global and local properties. For example, a photo of a family
+      reunion may have many people in it. A global note may describe
+      the picture in general, identifying the place and date.  When
+      this object is added to a gallery, you can attach a note to the
+      reference in the gallery adding some specific information, such
+      as &quot;Aunt Martha is the third person from the right in the
+      second row&quot;. Clicking the <guibutton>Edit
+      Properites</guibutton> allows you to edit the local properties.
+      </para>
+      <figure id="localmedia">
+        <title>Local Media Properties</title>
+        <screenshot>
+	  <screeninfo>Local Media Properties</screeninfo>
+	  <graphic fileref="localmedia" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+      <para>
+      The first object in the gallery is considered to be the primary
+      image. If this object is an image, it will appear on the
+      <interface>General Information</interface> tab, and will be the
+      primary image used by report generators. An image can be made
+      the default at any time by selecting the thumbnail image and
+      dragging it to the first position in the gallery. In this same
+      manner, the order of the images can be changed using the same
+      drag and drop technique.
+      </para>
+      <para>
+      Objects may be added to the gallery in several ways. By clicking
+      the <guibutton>Add Media Object</guibutton> button, a dialog box
+      is presented which allows you to choose an object from the file
+      system.  This method adds a new object to the Media View and
+      creates a reference in the gallery.  Objects may also be added
+      by either dragging and dropping from one gallery to another, or
+      by dragging from the Media View to a gallery. In this case, a
+      new media object is not created, but a reference to an existing
+      media object is made in the gallery, sharing the same media
+      object between galleries. Finally, new objects may be added to a
+      gallery and the Media View by dragging and dropping from a file
+      manager (such as <application>Nautilus</application> or
+      <application>Konqueror</application>) or a web browser (such as
+      <application>Galeon</application>,
+      <application>Mozilla</application>, or
+      <application>Konqueror</application>) into a gallery.
+      </para>
+      <para>
+      Media objects can be removed from a gallery by clicking the
+      <guibutton>Delete Media Object</guibutton> button. This action
+      only removes the reference to the current gallery. It does not
+      remove the media object from the Media View or from any other
+      galleries that are referencing it.
+      </para>
+      <para>
+      Right clicking on a selected object brings up a menu.
       </para>
       <variablelist><title>Menu options</title>
         <varlistentry>
-	  <term>View Image</term>
+	  <term>View in default viewer</term>
 	  <listitem>
 	    <para>
-	    Allows you to view the image using the GNOME's default
+	    Allows you to view an object image using GNOME's default
 	    viewer for the file type.
 	    </para>
 	  </listitem>
 	</varlistentry>
         <varlistentry>
-	  <term>Edit Image</term>
+	  <term>Edit with the GIMP</term>
           <listitem>
 	    <para>
 	    Launches the <application>gimp</application> program,
-	    allowing you to edit the image.
+	    allowing you to edit the image. This option only shows up
+	    if the media object is an image.
 	    </para>
 	  </listitem>
 	</varlistentry>
         <varlistentry>
-	  <term>Edit Description</term>
+	  <term>Edit Object Properties</term>
           <listitem>
 	    <para>
-	    Allows you to change the description attached to the
+	    Allows you to change the attributes and note attached to the
-	    image.
+	    media object.
 	    </para>
 	  </listitem>
         </varlistentry>
         <varlistentry>
-	  <term>Convert to private copy</term>
+	  <term>Convert to local copy</term>
 	  <listitem>
 	    <para>
-	    This option is only displayed if the image is a reference
+	    This option is only displayed if the media is a reference
 	    to a file that is not controlled by
 	    <application>GRAMPS</application>. Selecting the option
 	    causes <application>GRAMPS</application> to make its own
-	    copy of the image.
+	    copy of the media object.
 	    </para>
 	  </listitem>
         </varlistentry>
@@ -940,6 +979,139 @@
     </para>
   </sect1>
 
+  <sect1 id="mediaview">
+    <title>Media View</title>
+    <para>
+    The Media View window displays the files associated with the
+    database.  Typically, these files are images, but
+    <application>GRAMPS</application> allows you to attach any type of
+    file to the database. <application>GRAMPS</application> refers to
+    attached files as media objects.  You can access the Media View at
+    any time by either pressing the <guibutton>Media</guibutton>
+    button at the top of the screen, or by choosing the
+      <menuchoice>
+        <guimenu>View</guimenu>
+        <guimenuitem>Media</guimenuitem> 
+      </menuchoice>
+    entry from the menus.
+    </para>
+    <figure id="mediaview-fig">
+      <title>Media View</title>
+      <screenshot>
+	<screeninfo>Media View</screeninfo>
+	<graphic fileref="mediaview" format="png" srccredit="Don Allingham">
+        </graphic>
+      </screenshot>
+    </figure>
+    <sect2>
+      <title>Media Objects</title>
+      <para>
+      Media objects can be either local or external to a
+      <application>GRAMPS</application> database. If
+      <application>GRAMPS</application> is told to import an object as
+      alocal object, it will make its own copy of the file in the
+      database directory. If the object is not imported as a local
+      object, the original file is used.
+      </para>
+      <para>
+      There are advantages and disadvantages to both methods. If the
+      object is local, then if the original file is moved or deleted,
+      then <application>GRAMPS</application> will still have its own
+      copy. However, this is at the price of having two copies of the
+      file. If the file is not imported as a local object, then a copy
+      is not made, saving disk space. However, altering or deleting
+      the original copy will affect the
+      <application>GRAMPS</application> database.
+      </para>
+    </sect2>
+    <sect2>
+      <title>Adding a Media Object</title>
+      <para>
+      Media objects can be imported in several ways. Adding an object
+      to any gallery adds the object to the Media View. The gallery is
+      will actually contain a reference to the object in the Media
+      View. 
+      </para>
+      <para>
+      Objects may also be added using the <guibutton>Add Media
+      Object</guibutton> button. This will add the object to the Media
+      View, but not to any gallery. When you select the file to be
+      added, a preview will be displayed in the preview window. The
+      the file is an image, the image will be displayed. Otherwise, an
+      icon representing the file type will be displayed. In the dialog
+      box, you may choose to either import the object as a local
+      object, or leave it as an external object.
+      <figure id="addmedia">
+        <title>Add Media Object Dialog Box</title>
+        <screenshot>
+	  <screeninfo>Add Media Object Dialog Box</screeninfo>
+	  <graphic fileref="addmedia" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+      </para>
+      <para>
+      Finally, you may drag-and-drop an object from either a file
+      manager or a web browser. If the object is dropped into a
+      gallery, then a reference is made in the gallery, and the object
+      appears in the Media View. If the object is dropped directly
+      into the Media View, then it appears in the Media View, but will
+      not appear in a gallery. Currently, all objects imported via
+      drag-and-drop are imported as external (not local) objects.
+      </para>
+    </sect2>
+    <sect2>
+      <title>Making a Reference to a Media Object</title>
+      <para>
+      Once an object is in the Media View, it is possible to make a
+      reference to it in any gallery. You may place the object in as
+      many galleries as you like, and only one copy of the file will
+      exist.
+      </para>
+      <para>
+      To make a reference to a media object in a gallery, you may
+      simply drag-and-drop the object from the Media View directly to
+      a gallery. The object will then appear in the
+      gallery. Similarly, you may drag-and-drop from one gallery to
+      another gallery, and a new object reference is created in the
+      target gallery.
+      </para>
+    </sect2>
+    <sect2>
+      <title>Changing a Media Object's Properties</title>
+      <para>
+      Media objects have global and local properties. The title of the
+      object is a global property. It may only be changed from the
+      Media View, and it will affect all references. An object also
+      has a global note and a set of user defined global attributes.
+      A reference in a gallery may a have a local note and local
+      attributes as well. All references share the global properties,
+      but each gallery has its own set of notes a attributes.
+      </para>
+      <para>
+      The global note can be used to provide a general
+      description. For example, in a family reunion image, you may
+      wish to use the global note to indicate the place, date, and
+      occasion of the photograph. In a local note in Aunt Martha's
+      gallery, you may wish to add a local note indicating that
+      &quot;Aunt Martha is the third person from the right in the
+      second row&quot;.
+      </para>
+      <para>
+      The global properties may be changed by selecting the
+      <guibutton>Edit Media Object</guibutton> button.
+      <figure id="globalmedia">
+        <title>Edit a Media Object's Global Properties</title>
+        <screenshot>
+	  <screeninfo>Edit a Media Object's Global Properties</screeninfo>
+	  <graphic fileref="globalmedia" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+      </para>
+    </sect2>
+  </sect1>
+
   <sect1 id="bookmarks">
     <title>Bookmarking People</title>
     <para>
@@ -1019,6 +1191,79 @@
     </sect2>
   </sect1>
 
+  <sect1 id="revisoncontrol">
+    <title>Using Revision Control</title>
+    <para>
+    Revision control allows you to keep a history of the changes that
+    you have made to your database. Instead of needing to keep
+    multiple sets of back up files, a single revision control database
+    is maintained. At any point, you can revert back to a previously
+    saved version.
+    </para>
+    <para>
+    <application>GRAMPS</application> uses the standard
+    <application>RCS</application> system to handle revisions.
+    </para>
+    <para>
+    Revison control is enabled in the Revision Control tab of the
+    preferences dialog. Once enabled, every save is logged into the
+    revision control database. If you have enabled prompting for a
+    comment, then a dialog box will be displayed on every save asking
+    you to provide a comment about the changes you have made.
+      <figure id="revcomment">
+        <title>Providing a revision control comment</title>
+        <screenshot>
+	  <screeninfo>Providing a revision control comment</screeninfo>
+  	  <graphic fileref="savecomment" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+    </para>
+    <sect2>
+      <title>Reverting to a previous version</title>
+      <para>
+      If revision control has been enabled, you have the option of
+      reverting to a previous version of the database. Selecting the
+      check box will allow you to select a previous version.
+      <figure id="opendb">
+        <title>Opening a database</title>
+        <screenshot>
+	  <screeninfo>Opening a database</screeninfo>
+  	  <graphic fileref="opendb" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+      </para>
+      <para>
+      If the check box has be selected, <application>GRAMPS</application>
+      will display a dialog box that will allow you to choose which version 
+      you would like to view. The dialog box displays the version number, the
+      date the version was saved, who saved the database, and any comment supplied 
+      when the datbase was saved.
+      <figure id="revcontrol">
+        <title>Choosing a revision</title>
+        <screenshot>
+	  <screeninfo>Choosing a revision</screeninfo>
+  	  <graphic fileref="revcontrol" format="png" srccredit="Don Allingham">
+          </graphic>
+        </screenshot>
+      </figure>
+      </para>
+      <para>
+      Choosing a previous revision does not replace your current
+      database. If you do not save the retrieved database, it will not
+      replace the current version. If for some reason you accidentally
+      save the retrieved database when you did not want to replace the
+      current version, you can always use the revison control
+      mechanism to get back the version you replaced.
+      </para>
+      <para>
+      Revision control is applied only to the database itself, not to
+      any media objects have been associated with the database.
+      </para>
+    </sect2>
+  </sect1>
+
  <!-- ============= Customization ============================= -->
 
   <sect1 id="prefs">

gramps/doc/gramps-manual/C/gramps-manual/authors.html

@@ -5,7 +5,8 @@
 >Authors</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/bookmarks.html

@@ -5,16 +5,17 @@
 >Bookmarking People</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Place View"
+TITLE="Media View"
-HREF="placelist.html"><LINK
+HREF="mediaview.html"><LINK
 REL="NEXT"
-TITLE="Customization"
+TITLE="Using Revision Control"
-HREF="prefs.html"></HEAD
+HREF="revisoncontrol.html"></HEAD
 ><BODY
 CLASS="SECT1"
 BGCOLOR="#FFFFFF"
@@ -41,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="placelist.html"
+HREF="mediaview.html"
 >&#60;&#60;&#60; Previous</A
 ></TD
 ><TD
@@ -54,7 +55,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="prefs.html"
+HREF="revisoncontrol.html"
 >Next &#62;&#62;&#62;</A
 ></TD
 ></TR
@@ -133,7 +134,7 @@ NAME="GOTOBOOKMARK"
 SRC="gotobookmark.png"></P
 ><P
 ><B
->Figure 18. Using Bookmarks</B
+>Figure 22. Using Bookmarks</B
 ></P
 ></DIV
 ><P
@@ -184,7 +185,7 @@ NAME="EDITBOOKMARK"
 SRC="editbookmarks.png"></P
 ><P
 ><B
->Figure 19. Editing Bookmarks</B
+>Figure 23. Editing Bookmarks</B
 ></P
 ></DIV
 ></DIV
@@ -204,7 +205,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="placelist.html"
+HREF="mediaview.html"
 >&#60;&#60;&#60; Previous</A
 ></TD
 ><TD
@@ -220,7 +221,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="prefs.html"
+HREF="revisoncontrol.html"
 >Next &#62;&#62;&#62;</A
 ></TD
 ></TR
@@ -229,7 +230,7 @@ HREF="prefs.html"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Place View</TD
+>Media View</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -239,7 +240,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Customization</TD
+>Using Revision Control</TD
 ></TR
 ></TABLE
 ></DIV

gramps/doc/gramps-manual/C/gramps-manual/editpersondata.html

@@ -5,7 +5,8 @@
 >Editing a person's data</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -426,33 +427,17 @@ NAME="GALLERYTAB"
 >Gallery Tab</A
 ></H2
 ><P
->      Photographs and images are stored in the
+>      The <SPAN
-      <SPAN
 CLASS="INTERFACE"
 >Gallery</SPAN
-> tab. Images of a wide variety of
+> tab allows you to associate
-      formats are stored, including JPEG and
+      files (known in <TT
-      PNG.
-      </P
-><P
->       <TT
 CLASS="APPLICATION"
 >GRAMPS</TT
-> can either refer to an
+> as media
-      existing file, or make its own copy. By default,
+      objects) with a particular person. These files are typically
-      <TT
+      images or photographs, but may be of any filetype, such as (but
-CLASS="APPLICATION"
+      not limited to) sound files and word processing documents.
->GRAMPS</TT
-> will make its own copy. There
-      are advantages and disadvatages to both approaches. Refering to
-      an external copy reduces disk space. Allowing
-      <TT
-CLASS="APPLICATION"
->GRAMPS</TT
-> to make its own copy
-      allows GRAMPS to still have the image if the original
-      is altered, deleted, or moved. It also simplifies the transfer
-      of a database from one machine to another.
       </P
 ><DIV
 CLASS="FIGURE"
@@ -468,43 +453,105 @@ SRC="ep_gallery.png"></P
 ></P
 ></DIV
 ><P
->      The first image in the gallery is considered to be the primary
+>      <TT
-      image. This image will appear on the <SPAN
-CLASS="INTERFACE"
->General
-      Information</SPAN
-> tab, and will be the image used by
-      report generators. An image can be made the default at any time
-      by selecting the image, and clicking on the <B
-CLASS="GUIBUTTON"
->Make
-      Prmimary</B
-> button. Images may be added by clicking the
-      <B
-CLASS="GUIBUTTON"
->Add</B
-> button, and deleted by clicking the
-      <B
-CLASS="GUIBUTTON"
->Delete</B
-> button. If the image is a
-      reference to another file, <TT
 CLASS="APPLICATION"
 >GRAMPS</TT
->
+> provides a central repository
-      will remove the reference to the file. If the file is a copy
+      for all media objects in the Media View. This allows the same
-      maintained by <TT
+      media object to appear in multiple galleries.  Adding a media
-CLASS="APPLICATION"
+      object to a gallery actually adds the object to the Media View,
->GRAMPS</TT
+      and makes a local reference in the gallery. 
->, then
-      <TT
-CLASS="APPLICATION"
->GRAMPS</TT
-> will remove the file from the
-      file system.
       </P
 ><P
->      Right clicking on an selected image brings up a menu.
+>      While each media object can have a note and attributes attached
+      to it, each gallery can add its own notes and attributes to the
+      reference in its gallery. This allows media objects to have
+      global and local properties. For example, a photo of a family
+      reunion may have many people in it. A global note may describe
+      the picture in general, identifying the place and date.  When
+      this object is added to a gallery, you can attach a note to the
+      reference in the gallery adding some specific information, such
+      as "Aunt Martha is the third person from the right in the
+      second row". Clicking the <B
+CLASS="GUIBUTTON"
+>Edit
+      Properites</B
+> allows you to edit the local properties.
+      </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="LOCALMEDIA"
+></A
+><P
+><IMG
+SRC="localmedia.png"></P
+><P
+><B
+>Figure 12. Local Media Properties</B
+></P
+></DIV
+><P
+>      The first object in the gallery is considered to be the primary
+      image. If this object is an image, it will appear on the
+      <SPAN
+CLASS="INTERFACE"
+>General Information</SPAN
+> tab, and will be the
+      primary image used by report generators. An image can be made
+      the default at any time by selecting the thumbnail image and
+      dragging it to the first position in the gallery. In this same
+      manner, the order of the images can be changed using the same
+      drag and drop technique.
+      </P
+><P
+>      Objects may be added to the gallery in several ways. By clicking
+      the <B
+CLASS="GUIBUTTON"
+>Add Media Object</B
+> button, a dialog box
+      is presented which allows you to choose an object from the file
+      system.  This method adds a new object to the Media View and
+      creates a reference in the gallery.  Objects may also be added
+      by either dragging and dropping from one gallery to another, or
+      by dragging from the Media View to a gallery. In this case, a
+      new media object is not created, but a reference to an existing
+      media object is made in the gallery, sharing the same media
+      object between galleries. Finally, new objects may be added to a
+      gallery and the Media View by dragging and dropping from a file
+      manager (such as <TT
+CLASS="APPLICATION"
+>Nautilus</TT
+> or
+      <TT
+CLASS="APPLICATION"
+>Konqueror</TT
+>) or a web browser (such as
+      <TT
+CLASS="APPLICATION"
+>Galeon</TT
+>,
+      <TT
+CLASS="APPLICATION"
+>Mozilla</TT
+>, or
+      <TT
+CLASS="APPLICATION"
+>Konqueror</TT
+>) into a gallery.
+      </P
+><P
+>      Media objects can be removed from a gallery by clicking the
+      <B
+CLASS="GUIBUTTON"
+>Delete Media Object</B
+> button. This action
+      only removes the reference to the current gallery. It does not
+      remove the media object from the Media View or from any other
+      galleries that are referencing it.
+      </P
+><P
+>      Right clicking on a selected object brings up a menu.
       </P
 ><P
 ></P
@@ -516,37 +563,38 @@ CLASS="VARIABLELIST"
 ></P
 ><DL
 ><DT
->View Image</DT
+>View in default viewer</DT
 ><DD
 ><P
->	    Allows you to view the image using the GNOME's default
+>	    Allows you to view an object image using GNOME's default
 	    viewer for the file type.
 	    </P
 ></DD
 ><DT
->Edit Image</DT
+>Edit with the GIMP</DT
 ><DD
 ><P
 >	    Launches the <TT
 CLASS="APPLICATION"
 >gimp</TT
 > program,
-	    allowing you to edit the image.
+	    allowing you to edit the image. This option only shows up
+	    if the media object is an image.
 	    </P
 ></DD
 ><DT
->Edit Description</DT
+>Edit Object Properties</DT
 ><DD
 ><P
->	    Allows you to change the description attached to the
+>	    Allows you to change the attributes and note attached to the
-	    image.
+	    media object.
 	    </P
 ></DD
 ><DT
->Convert to private copy</DT
+>Convert to local copy</DT
 ><DD
 ><P
->	    This option is only displayed if the image is a reference
+>	    This option is only displayed if the media is a reference
 	    to a file that is not controlled by
 	    <TT
 CLASS="APPLICATION"
@@ -556,7 +604,7 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >GRAMPS</TT
 > to make its own
-	    copy of the image.
+	    copy of the media object.
 	    </P
 ></DD
 ></DL
@@ -588,7 +636,7 @@ NAME="EP_INTERNET-FIG"
 SRC="ep_internet.png"></P
 ><P
 ><B
->Figure 12. Internet Tab</B
+>Figure 13. Internet Tab</B
 ></P
 ></DIV
 ><P

gramps/doc/gramps-manual/C/gramps-manual/familyview.html

@@ -5,7 +5,8 @@
 >Family View</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -97,7 +98,7 @@ NAME="FAMILYVIEW-FIG"
 SRC="familyview.png"></P
 ><P
 ><B
->Figure 13. Family View</B
+>Figure 14. Family View</B
 ></P
 ></DIV
 ><P

gramps/doc/gramps-manual/C/gramps-manual/firsttime.html

@@ -5,7 +5,8 @@
 >Running GRAMPS for the first time.</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/genreports.html

@@ -5,7 +5,8 @@
 >Generating Reports</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -89,7 +90,7 @@ NAME="REPORT-FIG"
 SRC="reportsel.png"></P
 ><P
 ><B
->Figure 26. Report Generation Dialog</B
+>Figure 33. Report Generation Dialog</B
 ></P
 ></DIV
 ><P
@@ -269,7 +270,7 @@ appear in every GRAMPS generated file.
 ></TABLE
 ><P
 ><B
->Figure 27. Sample HTML Template Example</B
+>Figure 34. Sample HTML Template Example</B
 ></P
 ></DIV
 ></DIV

gramps/doc/gramps-manual/C/gramps-manual/gettingstarted.html

@@ -5,7 +5,8 @@
 >Getting Started</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/index.html

@@ -5,7 +5,8 @@
 >GRAMPS User Manual</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="NEXT"
 TITLE="Running GRAMPS for the first time."
 HREF="firsttime.html"></HEAD
@@ -91,11 +92,21 @@ HREF="placelist.html"
 ></DT
 ><DT
 ><A
+HREF="mediaview.html"
+>Media View</A
+></DT
+><DT
+><A
 HREF="bookmarks.html"
 >Bookmarking People</A
 ></DT
 ><DT
 ><A
+HREF="revisoncontrol.html"
+>Using Revision Control</A
+></DT
+><DT
+><A
 HREF="prefs.html"
 >Customization</A
 ></DT
@@ -186,7 +197,7 @@ CLASS="COMMAND"
 > on the command line.
     </P
 ><P
->    This document describes version 0.5.0 of
+>    This document describes version 0.6.0 of
     <TT
 CLASS="APPLICATION"
 >GRAMPS</TT

gramps/doc/gramps-manual/C/gramps-manual/license.html

@@ -5,7 +5,8 @@
 >License</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/ln7.html

@@ -3,7 +3,8 @@
 ><HEAD
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/mediaview.html

@@ -0,0 +1,331 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<HTML
+><HEAD
+><TITLE
+>Media View</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="GRAMPS User Manual"
+HREF="index.html"><LINK
+REL="PREVIOUS"
+TITLE="Place View"
+HREF="placelist.html"><LINK
+REL="NEXT"
+TITLE="Bookmarking People"
+HREF="bookmarks.html"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>GRAMPS User Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="placelist.html"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="bookmarks.html"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="MEDIAVIEW"
+>Media View</A
+></H1
+><P
+>    The Media View window displays the files associated with the
+    database.  Typically, these files are images, but
+    <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> allows you to attach any type of
+    file to the database. <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> refers to
+    attached files as media objects.  You can access the Media View at
+    any time by either pressing the <B
+CLASS="GUIBUTTON"
+>Media</B
+>
+    button at the top of the screen, or by choosing the
+      <B
+CLASS="GUIMENU"
+>View</B
+>-&gt;<B
+CLASS="GUIMENUITEM"
+>Media</B
+>
+    entry from the menus.
+    </P
+><DIV
+CLASS="FIGURE"
+><A
+NAME="MEDIAVIEW-FIG"
+></A
+><P
+><IMG
+SRC="mediaview.png"></P
+><P
+><B
+>Figure 19. Media View</B
+></P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN390"
+>Media Objects</A
+></H2
+><P
+>      Media objects can be either local or external to a
+      <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> database. If
+      <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> is told to import an object as
+      alocal object, it will make its own copy of the file in the
+      database directory. If the object is not imported as a local
+      object, the original file is used.
+      </P
+><P
+>      There are advantages and disadvantages to both methods. If the
+      object is local, then if the original file is moved or deleted,
+      then <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> will still have its own
+      copy. However, this is at the price of having two copies of the
+      file. If the file is not imported as a local object, then a copy
+      is not made, saving disk space. However, altering or deleting
+      the original copy will affect the
+      <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> database.
+      </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN398"
+>Adding a Media Object</A
+></H2
+><P
+>      Media objects can be imported in several ways. Adding an object
+      to any gallery adds the object to the Media View. The gallery is
+      will actually contain a reference to the object in the Media
+      View. 
+      </P
+><P
+>      Objects may also be added using the <B
+CLASS="GUIBUTTON"
+>Add Media
+      Object</B
+> button. This will add the object to the Media
+      View, but not to any gallery. When you select the file to be
+      added, a preview will be displayed in the preview window. The
+      the file is an image, the image will be displayed. Otherwise, an
+      icon representing the file type will be displayed. In the dialog
+      box, you may choose to either import the object as a local
+      object, or leave it as an external object.
+      <DIV
+CLASS="FIGURE"
+><A
+NAME="ADDMEDIA"
+></A
+><P
+><IMG
+SRC="addmedia.png"></P
+><P
+><B
+>Figure 20. Add Media Object Dialog Box</B
+></P
+></DIV
+>
+      </P
+><P
+>      Finally, you may drag-and-drop an object from either a file
+      manager or a web browser. If the object is dropped into a
+      gallery, then a reference is made in the gallery, and the object
+      appears in the Media View. If the object is dropped directly
+      into the Media View, then it appears in the Media View, but will
+      not appear in a gallery. Currently, all objects imported via
+      drag-and-drop are imported as external (not local) objects.
+      </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN409"
+>Making a Reference to a Media Object</A
+></H2
+><P
+>      Once an object is in the Media View, it is possible to make a
+      reference to it in any gallery. You may place the object in as
+      many galleries as you like, and only one copy of the file will
+      exist.
+      </P
+><P
+>      To make a reference to a media object in a gallery, you may
+      simply drag-and-drop the object from the Media View directly to
+      a gallery. The object will then appear in the
+      gallery. Similarly, you may drag-and-drop from one gallery to
+      another gallery, and a new object reference is created in the
+      target gallery.
+      </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN413"
+>Changing a Media Object's Properties</A
+></H2
+><P
+>      Media objects have global and local properties. The title of the
+      object is a global property. It may only be changed from the
+      Media View, and it will affect all references. An object also
+      has a global note and a set of user defined global attributes.
+      A reference in a gallery may a have a local note and local
+      attributes as well. All references share the global properties,
+      but each gallery has its own set of notes a attributes.
+      </P
+><P
+>      The global note can be used to provide a general
+      description. For example, in a family reunion image, you may
+      wish to use the global note to indicate the place, date, and
+      occasion of the photograph. In a local note in Aunt Martha's
+      gallery, you may wish to add a local note indicating that
+      "Aunt Martha is the third person from the right in the
+      second row".
+      </P
+><P
+>      The global properties may be changed by selecting the
+      <B
+CLASS="GUIBUTTON"
+>Edit Media Object</B
+> button.
+      <DIV
+CLASS="FIGURE"
+><A
+NAME="GLOBALMEDIA"
+></A
+><P
+><IMG
+SRC="globalmedia.png"></P
+><P
+><B
+>Figure 21. Edit a Media Object's Global Properties</B
+></P
+></DIV
+>
+      </P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="placelist.html"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="bookmarks.html"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Place View</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Bookmarking People</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>

gramps/doc/gramps-manual/C/gramps-manual/pedigreeview.html

@@ -5,7 +5,8 @@
 >Pedigree View</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -95,7 +96,7 @@ NAME="PEDIGREEVIEW-FIG"
 SRC="pedegreeview.png"></P
 ><P
 ><B
->Figure 14. Pedigree View</B
+>Figure 15. Pedigree View</B
 ></P
 ></DIV
 ><P
@@ -135,7 +136,7 @@ NAME="NAVFIGURE-FIG"
 SRC="pedegreesel.png"></P
 ><P
 ><B
->Figure 15. Navigation</B
+>Figure 16. Navigation</B
 ></P
 ></DIV
 ><P
@@ -143,7 +144,7 @@ SRC="pedegreesel.png"></P
     will make the person on the right-hand side of the line the active
     person. <A
 HREF="pedigreeview.html#NAVFIGURE-FIG"
->Figure 15</A
+>Figure 16</A
 > shows navigation using this
     method. When the mouse is over one of the lines connecting
     individuals, the line widens and becomes highlighted. In this

gramps/doc/gramps-manual/C/gramps-manual/personlist.html

@@ -5,7 +5,8 @@
 >People View</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK

gramps/doc/gramps-manual/C/gramps-manual/placelist.html

@@ -5,7 +5,8 @@
 >Place View</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -13,8 +14,8 @@ REL="PREVIOUS"
 TITLE="Source View"
 HREF="sourcelist.html"><LINK
 REL="NEXT"
-TITLE="Bookmarking People"
+TITLE="Media View"
-HREF="bookmarks.html"></HEAD
+HREF="mediaview.html"></HEAD
 ><BODY
 CLASS="SECT1"
 BGCOLOR="#FFFFFF"
@@ -54,7 +55,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="bookmarks.html"
+HREF="mediaview.html"
 >Next &#62;&#62;&#62;</A
 ></TD
 ></TR
@@ -97,7 +98,7 @@ NAME="PLACEVIEW-FIG"
 SRC="placelist.png"></P
 ><P
 ><B
->Figure 17. Place View</B
+>Figure 18. Place View</B
 ></P
 ></DIV
 ><P
@@ -135,7 +136,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="bookmarks.html"
+HREF="mediaview.html"
 >Next &#62;&#62;&#62;</A
 ></TD
 ></TR
@@ -154,7 +155,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Bookmarking People</TD
+>Media View</TD
 ></TR
 ></TABLE
 ></DIV

gramps/doc/gramps-manual/C/gramps-manual/prefs.html

@@ -5,13 +5,14 @@
 >Customization</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Bookmarking People"
+TITLE="Using Revision Control"
-HREF="bookmarks.html"><LINK
+HREF="revisoncontrol.html"><LINK
 REL="NEXT"
 TITLE="Generating Reports"
 HREF="genreports.html"></HEAD
@@ -41,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="bookmarks.html"
+HREF="revisoncontrol.html"
 >&#60;&#60;&#60; Previous</A
 ></TD
 ><TD
@@ -84,7 +85,7 @@ CLASS="INTERFACE"
 >Preferences</SPAN
 > dialog, shown in <A
 HREF="prefs.html#PREFS_GEN"
->Figure 20 in the section called <I
+>Figure 27 in the section called <I
 >General Preferences</I
 ></A
 >.
@@ -107,7 +108,7 @@ NAME="PREFS_GEN"
 SRC="prefs_gen.png"></P
 ><P
 ><B
->Figure 20. Preferences Dialog</B
+>Figure 27. Preferences Dialog</B
 ></P
 ></DIV
 ><P
@@ -214,7 +215,7 @@ NAME="PREFS_FMT"
 SRC="prefs_fmt.png"></P
 ><P
 ><B
->Figure 21. Formats</B
+>Figure 28. Formats</B
 ></P
 ></DIV
 ><P
@@ -281,7 +282,7 @@ NAME="PREFS_APPEAR"
 SRC="prefs_appear.png"></P
 ><P
 ><B
->Figure 22. Preferences Dialog</B
+>Figure 29. Preferences Dialog</B
 ></P
 ></DIV
 ><P
@@ -354,7 +355,7 @@ NAME="PREFS_RESEARCH"
 SRC="prefs_research.png"></P
 ><P
 ><B
->Figure 23. Researcher Information Dialog</B
+>Figure 30. Researcher Information Dialog</B
 ></P
 ></DIV
 ><P
@@ -382,7 +383,7 @@ NAME="PREFS_REPORT"
 SRC="prefs_report.png"></P
 ><P
 ><B
->Figure 24. Report Preferences Dialog</B
+>Figure 31. Report Preferences Dialog</B
 ></P
 ></DIV
 ><P
@@ -426,7 +427,7 @@ NAME="PREFS_DIR"
 SRC="prefs_dir.png"></P
 ><P
 ><B
->Figure 25. Directory Preferences Dialog</B
+>Figure 32. Directory Preferences Dialog</B
 ></P
 ></DIV
 ><P
@@ -450,7 +451,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="bookmarks.html"
+HREF="revisoncontrol.html"
 >&#60;&#60;&#60; Previous</A
 ></TD
 ><TD
@@ -475,7 +476,7 @@ HREF="genreports.html"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Bookmarking People</TD
+>Using Revision Control</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"

gramps/doc/gramps-manual/C/gramps-manual/revisoncontrol.html

@@ -0,0 +1,233 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<HTML
+><HEAD
+><TITLE
+>Using Revision Control</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
+REL="HOME"
+TITLE="GRAMPS User Manual"
+HREF="index.html"><LINK
+REL="PREVIOUS"
+TITLE="Bookmarking People"
+HREF="bookmarks.html"><LINK
+REL="NEXT"
+TITLE="Customization"
+HREF="prefs.html"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>GRAMPS User Manual</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="bookmarks.html"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="prefs.html"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="REVISONCONTROL"
+>Using Revision Control</A
+></H1
+><P
+>    Revision control allows you to keep a history of the changes that
+    you have made to your database. Instead of needing to keep
+    multiple sets of back up files, a single revision control database
+    is maintained. At any point, you can revert back to a previously
+    saved version.
+    </P
+><P
+>    <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+> uses the standard
+    <TT
+CLASS="APPLICATION"
+>RCS</TT
+> system to handle revisions.
+    </P
+><P
+>    Revison control is enabled in the Revision Control tab of the
+    preferences dialog. Once enabled, every save is logged into the
+    revision control database. If you have enabled prompting for a
+    comment, then a dialog box will be displayed on every save asking
+    you to provide a comment about the changes you have made.
+      <DIV
+CLASS="FIGURE"
+><A
+NAME="REVCOMMENT"
+></A
+><P
+><IMG
+SRC="savecomment.png"></P
+><P
+><B
+>Figure 24. Providing a revision control comment</B
+></P
+></DIV
+>
+    </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN474"
+>Reverting to a previous version</A
+></H2
+><P
+>      If revision control has been enabled, you have the option of
+      reverting to a previous version of the database. Selecting the
+      check box will allow you to select a previous version.
+      <DIV
+CLASS="FIGURE"
+><A
+NAME="OPENDB"
+></A
+><P
+><IMG
+SRC="opendb.png"></P
+><P
+><B
+>Figure 25. Opening a database</B
+></P
+></DIV
+>
+      </P
+><P
+>      If the check box has be selected, <TT
+CLASS="APPLICATION"
+>GRAMPS</TT
+>
+      will display a dialog box that will allow you to choose which version 
+      you would like to view. The dialog box displays the version number, the
+      date the version was saved, who saved the database, and any comment supplied 
+      when the datbase was saved.
+      <DIV
+CLASS="FIGURE"
+><A
+NAME="REVCONTROL"
+></A
+><P
+><IMG
+SRC="revcontrol.png"></P
+><P
+><B
+>Figure 26. Choosing a revision</B
+></P
+></DIV
+>
+      </P
+><P
+>      Choosing a previous revision does not replace your current
+      database. If you do not save the retrieved database, it will not
+      replace the current version. If for some reason you accidentally
+      save the retrieved database when you did not want to replace the
+      current version, you can always use the revison control
+      mechanism to get back the version you replaced.
+      </P
+><P
+>      Revision control is applied only to the database itself, not to
+      any media objects have been associated with the database.
+      </P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="bookmarks.html"
+>&#60;&#60;&#60; Previous</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="prefs.html"
+>Next &#62;&#62;&#62;</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Bookmarking People</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+>&nbsp;</TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Customization</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>

gramps/doc/gramps-manual/C/gramps-manual/runtools.html

@@ -5,7 +5,8 @@
 >Running Tools</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -88,7 +89,7 @@ NAME="TOOLS-FIG"
 SRC="toolsel.png"></P
 ><P
 ><B
->Figure 28. Tool Selection Dialog</B
+>Figure 35. Tool Selection Dialog</B
 ></P
 ></DIV
 ><P

gramps/doc/gramps-manual/C/gramps-manual/sourcelist.html

@@ -5,7 +5,8 @@
 >Source View</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.64
+"><LINK
 REL="HOME"
 TITLE="GRAMPS User Manual"
 HREF="index.html"><LINK
@@ -97,7 +98,7 @@ NAME="SOURCEVIEW-FIG"
 SRC="sourcelist.png"></P
 ><P
 ><B
->Figure 16. Source list</B
+>Figure 17. Source list</B
 ></P
 ></DIV
 ><P

gramps/gramps.spec

@@ -61,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/gramps/*.glade
 %{prefix}/share/gramps/*.xpm
 %{prefix}/share/gramps/*.jpg
+%{prefix}/share/gramps/*.png
 %{prefix}/share/gramps/filters/*.py
 %{prefix}/share/gramps/filters/*.pyo
 %{prefix}/share/gramps/plugins/*.py

gramps/src/EditPerson.py

@@ -621,12 +621,15 @@ class EditPerson:
         if photo == None:
             self.get_widget("personPix").load_imlib(const.empty_image)
         else:
-            i = GdkImlib.Image(photo)
+            try:
-            scale = float(const.picWidth)/float(max(i.rgb_height,i.rgb_width))
+                i = GdkImlib.Image(photo)
-            x = int(scale*(i.rgb_width))
+                scale = float(const.picWidth)/float(max(i.rgb_height,i.rgb_width))
-            y = int(scale*(i.rgb_height))
+                x = int(scale*(i.rgb_width))
-            i = i.clone_scaled_image(x,y)
+                y = int(scale*(i.rgb_height))
-            self.get_widget("personPix").load_imlib(i)
+                i = i.clone_scaled_image(x,y)
+                self.get_widget("personPix").load_imlib(i)
+            except:
+                self.get_widget("personPix").load_imlib(const.empty_image)
 
     def update_lists(self):
         """Updates the person's lists if anything has changed"""

gramps/src/SourceView.py

@@ -82,7 +82,6 @@ class SourceView:
         for a in self.sort_arrow:
             a.hide()
 
-        print column
         a = self.sort_arrow[column]
         a.show()
         if self.sort_dir == GTK.SORT_ASCENDING:

gramps/src/WriteXML.py

@@ -281,7 +281,7 @@ def write_attribute_list(g, list, indent=3):
     sp = '  ' * indent
     for attr in list:
         g.write('%s<attribute%s type="%s" value="%s"' % \
-                (sp,conf_priv(attr),attr.getType(),attr.getValue()))
+                (sp,conf_priv(attr),attr.getType(),fix(attr.getValue())))
         slist = attr.getSourceRefList()
         note = attr.getNote()
         if note == "" and len(slist) == 0:

gramps/src/config.glade

@@ -589,7 +589,7 @@
       <widget>
 	<class>GtkFrame</class>
 	<name>frame9</name>
-	<label>GRAMPS id prefixes</label>
+	<label>GRAMPS ID prefixes</label>
 	<label_xalign>0</label_xalign>
 	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	<child>

gramps/src/const.py

@@ -97,7 +97,7 @@ gtkrcFile      = "%s/gtkrc" % rootDir
 #
 #-------------------------------------------------------------------------
 progName     = "gramps"
-version      = "0.6.0pre"
+version      = "0.6.0"
 copyright    = "© 2001 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton"]
 comments     = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program.")

gramps/src/gramps.glade

@@ -2684,7 +2684,7 @@
 	      <last_modification_time>Tue, 30 Oct 2001 18:18:53 GMT</last_modification_time>
 	    </signal>
 	    <columns>13</columns>
-	    <column_widths>213,47,107,88,77,80,29,1,1,1,1,1,1</column_widths>
+	    <column_widths>213,47,107,88,77,80,29,5,5,5,5,5,5</column_widths>
 	    <selection_mode>GTK_SELECTION_EXTENDED</selection_mode>
 	    <show_titles>True</show_titles>
 	    <shadow_type>GTK_SHADOW_IN</shadow_type>

gramps/src/imagesel.glade

@@ -970,7 +970,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>attr_details</name>
+		<name>attrlabel</name>
 		<label>Details</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
@@ -996,7 +996,7 @@
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>label141</name>
+		<name>attr_details</name>
 		<label></label>
 		<justify>GTK_JUSTIFY_LEFT</justify>
 		<wrap>False</wrap>

gramps/src/plugins/merge.glade

@@ -405,7 +405,7 @@
 	<class>GtkFrame</class>
 	<name>frame2</name>
 	<border_width>8</border_width>
-	<label>Match Treshold</label>
+	<label>Match Threshold</label>
 	<label_xalign>0</label_xalign>
 	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	<child>