move to DocBook 4.1

2001-09-20  Aaron Weber  <aaron@ximian.com>

	* C/usage-mainwindow.sgml:  move to DocBook 4.1

	* C/usage-mail-org.sgml: move to DocBook 4.1

	* C/usage-mail.sgml: move to DocBook 4.1

	* C/config-sync.sgml: move to DocBook 4.1

	* C/apx-gloss.sgml: move to DocBook 4.1

	* C/evolution.sgml: move to DocBook 4.1

svn path=/trunk/; revision=13034

10 files changed, 71 insertions, 52 deletions

diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 30a3a941b6..84f6b3cfb4 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -112,11 +112,11 @@
      A way of describing a group of files on a computer.  With the
      perversity typical of computer (and especially Unix and Linux)
      nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
+     and denoted by <filename>/</filename>.
      The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
+     confuse the root directory with the root
      account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
+     <filename>/home/root</filename>.b
    </para>
   </glossdef>
  </glossentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 001add09c6..128dc24437 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -66,8 +66,8 @@
 	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
+	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
+	    </imageobject></mediaobject>
 	</screenshot>
       </figure>
       <!-- ==============End of Figure================-->
@@ -87,8 +87,8 @@
 
        <para>
          Clicking <guibutton>Get Mail</guibutton> will refresh any
-         IMAP, <systemitem><filename>mh</filename></systemitem>, or
-         <systemitem><filename>mbox</filename></systemitem> listings
+         IMAP, <filename>mh</filename>, or
+         <filename>mbox</filename> listings
          and check and download mail from all POP servers.  In other
          words, <guibutton>Get Mail</guibutton> gets your mail, no
          matter how many sources you have, or what types they are.  If
@@ -333,7 +333,7 @@ smtp.omniport.com:143
 	      <para>
                 The complete path to your external encryption tool On
                 most Linux systems, this will be
-                <systemitem><filename>/usr/bin/gpg</filename></systemitem>.
+                <filename>/usr/bin/gpg</filename>.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -432,8 +432,8 @@ smtp.omniport.com:143
 	<title>Calendar Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
+	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
+	    </imageobject></mediaobject>
 	</screenshot>
       </figure>
       <!-- ==============End of Figure================-->
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index b2b2fe6cd5..63015a0d21 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -113,8 +113,8 @@
 	  <title>Data Loss Prevention</title> 
 	  <para>
 	    It's always a good idea to make a backup.  To do that,
-	    make a copy of your <systemitem>
-	    <filename>~/evolution</filename> </systemitem> directory.
+	    make a copy of your
+	    <filename>~/evolution</filename> directory.
           </para>
 	</tip>
        </para>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 1138c0d0f1..bbc40cc480 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index fc4a4e2799..5a49602374 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -83,8 +83,10 @@
       <title>Evolution Contact Editor</title>
       <screenshot>
 	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="figures/contact-editor" format="png" srccredit="Aaron Weber">
-	</graphic>
+	<mediaobject><imageobject><imagedata
+	fileref="figures/contact-editor" format="png" srccredit="Aaron
+	Weber">
+	</imageobject></mediaobject>
       </screenshot>
     </figure>
     
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 7a5fe92d53..a2a8ac1d94 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -757,8 +757,10 @@
 	<title>Selecting a vFolder Rule</title>
 	<screenshot>
 	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	  </graphic>
+	  <mediaobject><imageobject><imagedata
+	  fileref="figures/vfolder-createrule-fig" format="png"
+	  srccredit="Aaron Weber">
+	  </imageobject></mediaobject>
 	</screenshot>
       </figure>
       </para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index ab80bc8a13..7f70dfcd5f 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -94,8 +94,8 @@
         <title>Threaded Mail View</title>
 <screenshot>
 <screeninfo>Threaded Mail View</screeninfo>
-<graphic  format="png" fileref="mail-threaded" srccredit="Aaron Weber">
-</graphic>
+<mediaobject><imageobject><imagedata  format="png" fileref="mail-threaded" srccredit="Aaron Weber">
+</imageobject></mediaobject>
 </screenshot>
 </figure>
 
@@ -528,8 +528,8 @@
         <title>New Message Window</title>
         <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
-        </graphic>
+          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
+        </imageobject></mediaobject>
         </screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
@@ -760,8 +760,8 @@
          <title>Reply Message Window</title>
          <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
-        </graphic>
+          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
+        </imageobject></mediaobject>
         </screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 5bd5b78711..7794c8c54f 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -406,13 +406,14 @@
       <title>The Ximian Evolution Main Window</title>
       <screenshot>
 	<screeninfo>Inbox</screeninfo>
-	<graphic fileref="figures/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
+	<mediaobject><imageobject><imagedata
+	fileref="figures/mainwindow-pic" format="png" srccredit="Kevin
+	Breit"> </imageobject></mediaobject>
       </screenshot>
     </figure>
     
     <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1" format="png"></imageobject></inlinemediaobject>
       <guilabel>Menubar</guilabel>
     </para>
     
@@ -422,7 +423,7 @@
     </para>
 
     <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
       <guilabel>Toolbar</guilabel>
     </para>
 
@@ -432,7 +433,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
       <guilabel>Shortcut Bar</guilabel>
     </para>
     
@@ -442,7 +443,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-4" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-4" format="png"></imageobject></inlinemediaobject>
       <guilabel>Status Bar</guilabel>
     </para>
     
@@ -454,7 +455,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="png"></imageobject></inlinemediaobject>
       <guilabel>Search Tools</guilabel>
     </para>
     
@@ -882,8 +883,8 @@
               It supports multiple mail sources, including <glossterm
               linkend="imap">IMAP</glossterm>, <glossterm
               linkend="pop">POP3</glossterm>, local
-              <systemitem><filename>mbox</filename></systemitem> and
-              <systemitem><filename>mh</filename></systemitem> files.
+              <filename>mbox</filename> and
+              <filename>mh</filename> files.
 
 <!-- NOT FOR 1.0, but maybe later 
               and even NNTP messages (newsgroups), which aren't
@@ -921,15 +922,15 @@
           <title>Ximian Evolution Mail</title>
           <screenshot>
             <screeninfo>Inbox</screeninfo>
-            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
-        </graphic>
+            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
+        </imageobject></mediaobject>
         </screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
 </para>
       <para>
-        <inlinegraphic fileref="figures/full-1"
-        format="png"></inlinegraphic> <guilabel>Email
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Email
         Viewer</guilabel>
       </para>
     
@@ -938,8 +939,8 @@
       </para>
 
       <para>
-        <inlinegraphic fileref="figures/full-2"
-        format="png"></inlinegraphic> <guilabel>Email List</guilabel>
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Email List</guilabel>
       </para>
     
       <para>
@@ -994,8 +995,8 @@
       <title>Ximian Evolution Calendar View</title>
       <screenshot>
 	<screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
+	<mediaobject><imageobject><imagedata  fileref="figures/calendar" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
       </screenshot>
     </figure>
   <!-- ============== End of Figure ============================= --> 
@@ -1003,8 +1004,8 @@
     </para>
 
       <para>
-        <inlinegraphic fileref="figures/full-1"
-        format="png"></inlinegraphic> <guilabel>Appointment
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Appointment
         List</guilabel>
       </para>
   
@@ -1015,7 +1016,7 @@
       </para>
 
       <para>
-	<inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
+	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
 	<guilabel>Task List</guilabel>
       </para>
 
@@ -1028,7 +1029,7 @@
       </para>
 
       <para>
-	<inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
+	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
 	<guilabel>Calendar Window</guilabel>
       </para>
 
@@ -1083,14 +1084,14 @@
 	<title>Ximian Evolution Contact Interface</title>
 	<screenshot>
 	  <screeninfo>Ximian Evolution Contact List Window</screeninfo>
-	  <graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
-  	  </graphic>
+	  <mediaobject><imageobject><imagedata  fileref="figures/contact" format="png" srccredit="Kevin Breit">
+  	  </imageobject></mediaobject>
 	</screenshot>
       </figure>
      </para>
       <para>
-        <inlinegraphic fileref="figures/full-1"
-        format="png"></inlinegraphic> <guilabel>Contact
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Contact
         List</guilabel>
       </para>
       <para>
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index 2645d9ef6c..ebce544b9a 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -45,8 +45,8 @@
 	  <title>Print Preview</title>
 	  <screenshot>
 	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
+	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
@@ -85,8 +85,8 @@
 	  <title>Choosing a Printer</title>
 	  <screenshot>
 	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
+	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
diff --git a/help/ChangeLog b/help/ChangeLog
index b58f54e886..2a42422b65 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-20  Aaron Weber  <aaron@ximian.com>
+
+	* C/usage-mainwindow.sgml:  move to DocBook 4.1
+
+	* C/usage-mail-org.sgml: move to DocBook 4.1
+	
+	* C/usage-mail.sgml: move to DocBook 4.1
+
+	* C/config-sync.sgml: move to DocBook 4.1
+
+	* C/apx-gloss.sgml: move to DocBook 4.1
+
+	* C/evolution.sgml: move to DocBook 4.1
+
 2001-09-19  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-calendar.sgml: more meetings-by-mail additions. Had no