Renamed from evolution-C.omf. Renamed from evolution.xml.

* C/evolution-1.4-C.omf: Renamed from evolution-C.omf.
* C/evolution-1.4.xml: Renamed from evolution.xml.

* Makefile.am (SUBDIRS): Remove "no" for now.

* xmldocs.make: Updated to most recent version on GNOME CVS.

* C/Makefile.am (docname): Add version.
(omffile): Likewise.

svn path=/trunk/; revision=20529

3 files changed, 4 insertions, 146 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index c8d1c15c81..d5713d895c 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -30,9 +30,9 @@ figs = \
 	figures/summary.png			\
 	figures/vfolder-createrule-fig.png
 figdir = figures
-docname = evolution
+docname = evolution-1.4
 lang = C
-omffile = evolution-C.omf
+omffile = evolution-1.4-C.omf
 entities =	\
 	apx-authors.xml		\
 	apx-bugs.xml		\
@@ -52,6 +52,7 @@ entities =	\
 	usage-mail.xml		\
 	usage-mainwindow.xml	\
 	usage-print.xml		\
-	usage-sync.xml		\
+	usage-sync.xml
+
 include $(top_srcdir)/help/xmldocs.make
 dist-hook: app-dist-hook
diff --git a/help/C/evolution-C.omf b/help/C/evolution-C.omf
deleted file mode 100644
index 23dc3fdb86..0000000000
--- a/help/C/evolution-C.omf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <creator>
-      Ximian, Inc.
-    </creator>
-    <title>
-      Evolution Manual
-    </title>
-    <date>2002</date>
-    <subject category="GNOME|Applications"/>
-    <description>
-	A user's guide to Ximian Evolution which explains how to use
-	its mail, calendar, addressbook, and task list features.
-    </description>
-    <type>
-	manual
-    </type>
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"//>
-    <identifier url="/"/>
-    <language code="C"/>
-    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" holder="Ximian, Inc."/>
-  </resource>
-</omf>
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
deleted file mode 100644
index 56e5c3bc0f..0000000000
--- a/help/C/evolution.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-  
-<!ENTITY LEGAL SYSTEM "legal.xml">
-<!ENTITY GFDL SYSTEM "apx-fdl.xml">
-<!ENTITY GPL SYSTEM "apx-gpl.xml">
-<!ENTITY PREFACE SYSTEM "preface.xml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.xml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.xml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.xml">
-<!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.xml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.xml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.xml">
-<!ENTITY USAGE-EXCHANGE SYSTEM "usage-exchange.xml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.xml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.xml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.xml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.xml">
-<!ENTITY MENUREF SYSTEM "menuref.xml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.xml">
-<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.xml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.xml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.xml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix.  -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Ximian Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-      <author><firstname>Ettore</firstname><surname>Perazzoli</surname></author>
-      <author><firstname>Duncan</firstname><surname>Mak</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000-2002</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-    
-   <releaseinfo>
-      This is version 1.2.1 of the Ximian Evolution manual. It describes
-      version 1.2 of the Ximian Evolution groupware suite.
-   </releaseinfo>
-    <legalnotice id="legalnotice">
-      <para>
-         Please note that legal and licensing information is in <xref
-         linkend="preface" /> due to formatting issues with its
-         previous location.
-       </para>
-    </legalnotice>
-  </bookinfo>
-
-
-  <preface id="preface">
-    <title>Preface</title> 
-  &LEGAL;
-  &PREFACE;
-  </preface>
-
-  <part id="usage">
-    <title>Getting Started with Ximian Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Ximian Evolution</application> manual
-        describes how to use <application>Ximian Evolution</application> for
-        email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that there's more
-        than one way to do things, and you can pick whichever method
-        you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-MAIL-ORG;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-    &USAGE-EXCHANGE;
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Ximian Evolution</title>
-    <partintro>
-      <para>
-        <application>Ximian Evolution</application> is highly
-        configurable.  Usually, when developers say that, they mean
-        that they didn't test it out thoroughly and have left it to
-        other programmers to "configure" themselves a working
-        system. In the case of <application>Ximian
-        Evolution</application>, "configurable" means that, while you
-        can expect the program to work perfectly well with the default
-        settings, it's also easy to alter its behavior in a wide
-        variety of ways, so that it fits your needs exactly.  This
-        part of the book will describe that process, from the quickest
-        glimpse of the Setup Assistant to an in-depth guide to obscure
-        preferences settings.
-      </para>
-    </partintro>
-
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  &MENUREF;
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-  &GPL;
-  &GFDL;
-
-</book>
\ No newline at end of file