s/fig/figures/ Make it use the sgmldocs.make framework.

2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>

	* C/*.sgml: s/fig/figures/
	* C/Makefile.am: Make it use the sgmldocs.make framework.

svn path=/trunk/; revision=12067

22 files changed, 138 insertions, 192 deletions

diff --git a/doc/C/.cvsignore b/doc/C/.cvsignore
index 548121644a..d124a07e3e 100644
--- a/doc/C/.cvsignore
+++ b/doc/C/.cvsignore
@@ -1,11 +1,9 @@
 Makefile
 Makefile.in
-*.junk
 *.log
 *.ps
 *.dvi
 *.tex
-DBTOHTML_OUTPUT_DIR*
 evolution
-evolution-faq
-fig/*.eps
+index.html
+omf_timestamp
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index f7bbc970ac..3cc8816ead 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -1,79 +1,49 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-GUIDE_SGML_FILES =		\
-	evolution.sgml		\
+figs = \
+	figures/calendar.png			\
+	figures/config-cal.png			\
+	figures/config-mail.png			\
+	figures/contact-editor.png		\
+	figures/contact.png			\
+	figures/filter-assist-fig.png		\
+	figures/filter-new-fig.png		\
+	figures/full-1.png			\
+	figures/full-2.png			\
+	figures/full-3.png			\
+	figures/full-4.png			\
+	figures/full-5.png			\
+	figures/full-6.png			\
+	figures/full-7.png			\
+	figures/mail-composer.png		\
+	figures/mail-druid-pic.png		\
+	figures/mail-inbox.png			\
+	figures/mainwindow-pic.png		\
+	figures/newmsg.png			\
+	figures/print-dest.png			\
+	figures/print-preview.png		\
+	figures/replymsg.png			\
+	figures/vfolder-createrule-fig.png
+docname=evolution-guide
+lang = C
+omffile=evolution-C.omf
+sgml_ents =	\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
+	config-encryption.sgml	\
 	config-prefs.sgml	\
 	config-sync.sgml	\
+	evolution-faq.sgml	\
+	menuref.sgml		\
 	preface.sgml		\
 	usage-calendar.sgml	\
 	usage-contact.sgml	\
+	usage-encryption.sgml	\
+	usage-exec-summary.sgml	\
+	usage-mail-org.sgml	\
 	usage-mail.sgml		\
 	usage-mainwindow.sgml	\
+	usage-print.sgml	\
 	usage-sync.sgml
-
-FAQ_SGML_FILES = 		\
-	evolution-faq.sgml
-
-EXTRA_DIST = 			\
-	$(FAQ_SGML_FILES) 	\
-	$(GUIDE_SGML_FILES)
-
-all: evolution-guide evolution-faq
-
-evolution-guide: $(GUIDE_SGML_FILES)
-	-db2html $(srcdir)/evolution.sgml
-
-evolution-faq: $(FAQ_SGML_FILES)
-	-db2html $(srcdir)/evolution-faq.sgml
-
-dist-hook:
-	mkdir $(distdir)/fig
-	mkdir $(distdir)/evolution
-	mkdir $(distdir)/evolution/stylesheet-images
-	files=`echo $(srcdir)/evolution/*.html` ; \
-	test '$(srcdir)/evolution/*.html' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/evolution/*.css` ; \
-	test '$(srcdir)/evolution/*.css' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/fig/*.png` ; \
-	test '$(srcdir)/fig/*.png' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/evolution/stylesheet-images/*` ; \
-	test '$(srcdir)/evolution/stylesheet-images/*' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-
-# FIXME really messy here
-install-data-local: evolution-guide evolution-faq
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide
-	-for file in $(srcdir)/evolution/*.html $(srcdir)/evolution/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-faq
-	-for file in $(srcdir)/evolution-faq/*.html $(srcdir)/evolution-faq/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-faq/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images
-	-for file in $(srcdir)/evolution/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
+	
+include $(top_srcdir)/doc/sgmldocs.make
+dist-hook: app-dist-hook
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index e3debd0ab6..b3e27fce98 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -65,7 +65,7 @@
 	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
@@ -389,7 +389,7 @@
 	<title>Calendar Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
diff --git a/doc/C/evolution-C.omf b/doc/C/evolution-C.omf
index f6e003a25b..e80b88c418 100644
--- a/doc/C/evolution-C.omf
+++ b/doc/C/evolution-C.omf
@@ -8,7 +8,7 @@
       <category>GNOME|PIM</category>
     </subject>
     <format mime="text/sgml"/>
-    <identifier url="panel.sgml"/>
+    <identifier url="evolution.sgml"/>
     <language code="C" />
   </resource>
 </omf>
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 98f11e1bca..3aeb9b23e2 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -19,7 +19,7 @@
       <title>Evolution Calendar View</title>
       <screenshot>
 	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
+	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
 	</graphic>
       </screenshot>
     </figure>
@@ -28,7 +28,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
     <guilabel>Event List</guilabel>
   </para>
   
@@ -39,7 +39,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
     <guilabel>Todo List</guilabel>
   </para>
   
@@ -51,7 +51,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-3" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
     <guilabel>Calendar Window</guilabel>
   </para>
   
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 91ac0c708c..a168ef1087 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -42,13 +42,13 @@
       <title>Evolution Contact Interface</title>
       <screenshot>
 	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Kevin Breit">
+	<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
 
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Contact List</guilabel>
     </para>
 
@@ -150,7 +150,7 @@
       <title>Evolution Contact Editor</title>
       <screenshot>
 	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
+	<graphic fileref="figures/contact-editor" format="png" srccredit="Aaron Weber">
 	</graphic>
       </screenshot>
     </figure>
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
index ed54a88d13..19ad87ca12 100644
--- a/doc/C/usage-mail-org.sgml
+++ b/doc/C/usage-mail-org.sgml
@@ -766,7 +766,7 @@
 	<title>Selecting a Virtual Folder Rule</title>
 	<screenshot>
 	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
 	  </graphic>
 	</screenshot>
       </figure>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 12ad3fdab8..b3579fb5d8 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -85,14 +85,14 @@
           <title>Evolution Mail</title>
           <screenshot>
             <screeninfo>Inbox</screeninfo>
-            <graphic fileref="fig/mail-inbox" format="png" srccredit="Kevin Breit">
+            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
         </graphic>
         </screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
 
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Email Viewer</guilabel>
     </para>
     
@@ -101,7 +101,7 @@
     </para>
 
     <para>
-      <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
       <guilabel>Email List</guilabel>
     </para>
     
@@ -434,7 +434,7 @@
         <title>New Message Window</title>
         <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="fig/newmsg" format="png" srccredit="Aaron Weber">
+          <graphic fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
         </graphic>
         </screenshot>
       </figure>
@@ -675,7 +675,7 @@ with quoted materials and the relevant replies interspersed-->
          <title>Reply Message Window</title>
          <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
+          <graphic fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
         </graphic>
         </screenshot>
       </figure>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 9dc0c62a35..fe8f3458eb 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -289,13 +289,13 @@
       <title>The Evolution Main Window</title>
       <screenshot>
 	<screeninfo>Inbox</screeninfo>
-	<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
+	<graphic fileref="figures/mainwindow-pic" format="png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
     
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Menubar</guilabel>
     </para>
     
@@ -305,7 +305,7 @@
     </para>
 
     <para>
-      <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
       <guilabel>Toolbar</guilabel>
     </para>
 
@@ -315,7 +315,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-3" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
       <guilabel>Shortcut Bar</guilabel>
     </para>
     
@@ -325,7 +325,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-4" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-4" format="png"></inlinegraphic>
       <guilabel>Status Bar</guilabel>
     </para>
     
@@ -337,7 +337,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-5" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
       <guilabel>Search Bar</guilabel>
     </para>
     
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
index b73636f37e..747b6838d0 100644
--- a/doc/C/usage-print.sgml
+++ b/doc/C/usage-print.sgml
@@ -44,7 +44,7 @@
 	  <title>Print Preview</title>
 	  <screenshot>
 	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
@@ -73,7 +73,7 @@
 	  <title>Choosing a Printer</title>
 	  <screenshot>
 	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8b3380007a..6e725e7411 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* C/*.sgml: s/fig/figures/
+	* C/Makefile.am: Make it use the sgmldocs.make framework.
+	
 2001-08-14  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-mainwindow.sgml: Commented out menuref.
diff --git a/help/C/.cvsignore b/help/C/.cvsignore
index 548121644a..d124a07e3e 100644
--- a/help/C/.cvsignore
+++ b/help/C/.cvsignore
@@ -1,11 +1,9 @@
 Makefile
 Makefile.in
-*.junk
 *.log
 *.ps
 *.dvi
 *.tex
-DBTOHTML_OUTPUT_DIR*
 evolution
-evolution-faq
-fig/*.eps
+index.html
+omf_timestamp
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index f7bbc970ac..3cc8816ead 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -1,79 +1,49 @@
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-GUIDE_SGML_FILES =		\
-	evolution.sgml		\
+figs = \
+	figures/calendar.png			\
+	figures/config-cal.png			\
+	figures/config-mail.png			\
+	figures/contact-editor.png		\
+	figures/contact.png			\
+	figures/filter-assist-fig.png		\
+	figures/filter-new-fig.png		\
+	figures/full-1.png			\
+	figures/full-2.png			\
+	figures/full-3.png			\
+	figures/full-4.png			\
+	figures/full-5.png			\
+	figures/full-6.png			\
+	figures/full-7.png			\
+	figures/mail-composer.png		\
+	figures/mail-druid-pic.png		\
+	figures/mail-inbox.png			\
+	figures/mainwindow-pic.png		\
+	figures/newmsg.png			\
+	figures/print-dest.png			\
+	figures/print-preview.png		\
+	figures/replymsg.png			\
+	figures/vfolder-createrule-fig.png
+docname=evolution-guide
+lang = C
+omffile=evolution-C.omf
+sgml_ents =	\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
+	config-encryption.sgml	\
 	config-prefs.sgml	\
 	config-sync.sgml	\
+	evolution-faq.sgml	\
+	menuref.sgml		\
 	preface.sgml		\
 	usage-calendar.sgml	\
 	usage-contact.sgml	\
+	usage-encryption.sgml	\
+	usage-exec-summary.sgml	\
+	usage-mail-org.sgml	\
 	usage-mail.sgml		\
 	usage-mainwindow.sgml	\
+	usage-print.sgml	\
 	usage-sync.sgml
-
-FAQ_SGML_FILES = 		\
-	evolution-faq.sgml
-
-EXTRA_DIST = 			\
-	$(FAQ_SGML_FILES) 	\
-	$(GUIDE_SGML_FILES)
-
-all: evolution-guide evolution-faq
-
-evolution-guide: $(GUIDE_SGML_FILES)
-	-db2html $(srcdir)/evolution.sgml
-
-evolution-faq: $(FAQ_SGML_FILES)
-	-db2html $(srcdir)/evolution-faq.sgml
-
-dist-hook:
-	mkdir $(distdir)/fig
-	mkdir $(distdir)/evolution
-	mkdir $(distdir)/evolution/stylesheet-images
-	files=`echo $(srcdir)/evolution/*.html` ; \
-	test '$(srcdir)/evolution/*.html' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/evolution/*.css` ; \
-	test '$(srcdir)/evolution/*.css' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/fig/*.png` ; \
-	test '$(srcdir)/fig/*.png' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-	files=`echo $(srcdir)/evolution/stylesheet-images/*` ; \
-	test '$(srcdir)/evolution/stylesheet-images/*' = "$$files" \
-	    || cp $$files $(distdir)/evolution
-
-# FIXME really messy here
-install-data-local: evolution-guide evolution-faq
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide
-	-for file in $(srcdir)/evolution/*.html $(srcdir)/evolution/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-faq
-	-for file in $(srcdir)/evolution-faq/*.html $(srcdir)/evolution-faq/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-faq/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images
-	-for file in $(srcdir)/evolution/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
+	
+include $(top_srcdir)/doc/sgmldocs.make
+dist-hook: app-dist-hook
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index e3debd0ab6..b3e27fce98 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -65,7 +65,7 @@
 	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
@@ -389,7 +389,7 @@
 	<title>Calendar Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
diff --git a/help/C/evolution-C.omf b/help/C/evolution-C.omf
index f6e003a25b..e80b88c418 100644
--- a/help/C/evolution-C.omf
+++ b/help/C/evolution-C.omf
@@ -8,7 +8,7 @@
       <category>GNOME|PIM</category>
     </subject>
     <format mime="text/sgml"/>
-    <identifier url="panel.sgml"/>
+    <identifier url="evolution.sgml"/>
     <language code="C" />
   </resource>
 </omf>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 98f11e1bca..3aeb9b23e2 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -19,7 +19,7 @@
       <title>Evolution Calendar View</title>
       <screenshot>
 	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
+	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
 	</graphic>
       </screenshot>
     </figure>
@@ -28,7 +28,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
     <guilabel>Event List</guilabel>
   </para>
   
@@ -39,7 +39,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
     <guilabel>Todo List</guilabel>
   </para>
   
@@ -51,7 +51,7 @@
   </para>
 
   <para>
-    <inlinegraphic fileref="fig/full-3" format="png"></inlinegraphic>
+    <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
     <guilabel>Calendar Window</guilabel>
   </para>
   
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 91ac0c708c..a168ef1087 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -42,13 +42,13 @@
       <title>Evolution Contact Interface</title>
       <screenshot>
 	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Kevin Breit">
+	<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
 
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Contact List</guilabel>
     </para>
 
@@ -150,7 +150,7 @@
       <title>Evolution Contact Editor</title>
       <screenshot>
 	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
+	<graphic fileref="figures/contact-editor" format="png" srccredit="Aaron Weber">
 	</graphic>
       </screenshot>
     </figure>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index ed54a88d13..19ad87ca12 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -766,7 +766,7 @@
 	<title>Selecting a Virtual Folder Rule</title>
 	<screenshot>
 	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
 	  </graphic>
 	</screenshot>
       </figure>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 12ad3fdab8..b3579fb5d8 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -85,14 +85,14 @@
           <title>Evolution Mail</title>
           <screenshot>
             <screeninfo>Inbox</screeninfo>
-            <graphic fileref="fig/mail-inbox" format="png" srccredit="Kevin Breit">
+            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
         </graphic>
         </screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
 
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Email Viewer</guilabel>
     </para>
     
@@ -101,7 +101,7 @@
     </para>
 
     <para>
-      <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
       <guilabel>Email List</guilabel>
     </para>
     
@@ -434,7 +434,7 @@
         <title>New Message Window</title>
         <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="fig/newmsg" format="png" srccredit="Aaron Weber">
+          <graphic fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
         </graphic>
         </screenshot>
       </figure>
@@ -675,7 +675,7 @@ with quoted materials and the relevant replies interspersed-->
          <title>Reply Message Window</title>
          <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
+          <graphic fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
         </graphic>
         </screenshot>
       </figure>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 9dc0c62a35..fe8f3458eb 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -289,13 +289,13 @@
       <title>The Evolution Main Window</title>
       <screenshot>
 	<screeninfo>Inbox</screeninfo>
-	<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
+	<graphic fileref="figures/mainwindow-pic" format="png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
     
     <para>
-      <inlinegraphic fileref="fig/full-1" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
       <guilabel>Menubar</guilabel>
     </para>
     
@@ -305,7 +305,7 @@
     </para>
 
     <para>
-      <inlinegraphic fileref="fig/full-2" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
       <guilabel>Toolbar</guilabel>
     </para>
 
@@ -315,7 +315,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-3" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
       <guilabel>Shortcut Bar</guilabel>
     </para>
     
@@ -325,7 +325,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-4" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-4" format="png"></inlinegraphic>
       <guilabel>Status Bar</guilabel>
     </para>
     
@@ -337,7 +337,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="fig/full-5" format="png"></inlinegraphic>
+      <inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
       <guilabel>Search Bar</guilabel>
     </para>
     
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index b73636f37e..747b6838d0 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -44,7 +44,7 @@
 	  <title>Print Preview</title>
 	  <screenshot>
 	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
@@ -73,7 +73,7 @@
 	  <title>Choosing a Printer</title>
 	  <screenshot>
 	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
 	</graphic>
 	</screenshot>
       </figure>
diff --git a/help/ChangeLog b/help/ChangeLog
index 8b3380007a..6e725e7411 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* C/*.sgml: s/fig/figures/
+	* C/Makefile.am: Make it use the sgmldocs.make framework.
+	
 2001-08-14  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-mainwindow.sgml: Commented out menuref.