GNOME.org
 

[evolution-patches] Patch to fix documentation versioning and build management

This patch updates the documentation in help to not say "Ximian
Evolution" where it was still doing so, and changes the version from
1.4 to 2.0. It also moves the versioned omf and xml files to non-
versioned copies, so that we can maintain history in CVS better, and
generates the versioned copies at build time.

-- dobey


Index: help/xmldocs.make
===================================================================
RCS file: /cvs/gnome/evolution/help/xmldocs.make,v
retrieving revision 1.2
diff -u -r1.2 xmldocs.make
--- help/xmldocs.make	26 Mar 2003 23:03:39 -0000	1.2
+++ help/xmldocs.make	24 Aug 2004 19:37:19 -0000
@@ -50,10 +50,10 @@
 
 all: omf
 
-$(docname).xml: $(entities)
-	-ourdir=`pwd`;  \
-	cd $(srcdir);   \
-	cp $(entities) $$ourdir
+#$(docname).xml: $(entities)
+#	-ourdir=`pwd`;  \
+#	cd $(srcdir);   \
+#	cp $(entities) $$ourdir
 
 app-dist-hook:
 	if test "$(figdir)"; then \
Index: help/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/help/C/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- help/C/Makefile.am	10 Feb 2004 22:24:53 -0000	1.38
+++ help/C/Makefile.am	24 Aug 2004 19:37:19 -0000
@@ -26,9 +26,22 @@
 	figures/summary.png			\
 	figures/vfolder-createrule-fig.png
 figdir = figures
-docname = evolution-1.5
+
+all: $(docname).xml $(omffile)
+
+doc_in_files = evolution.xml
+%-$(BASE_VERSION).xml: $(doc_in_files)
+	cp -f $< $@
+
+docname = evolution-$(BASE_VERSION)
 lang = C
-omffile = evolution-1.5-C.omf
+
+omf_in_files = evolution-C.omf
+%-$(BASE_VERSION)-C.omf: $(omf_in_files)
+	cp -f $< $@
+
+omffile = evolution-$(BASE_VERSION)-C.omf
+
 entities =	\
 	apx-authors.xml		\
 	apx-bugs.xml		\
Index: help/C/apx-bugs.xml
===================================================================
RCS file: /cvs/gnome/evolution/help/C/apx-bugs.xml,v
retrieving revision 1.1
diff -u -r1.1 apx-bugs.xml
--- help/C/apx-bugs.xml	4 Nov 2002 22:41:04 -0000	1.1
+++ help/C/apx-bugs.xml	24 Aug 2004 19:37:19 -0000
@@ -3,7 +3,7 @@
   <title>Known bugs and limitations</title>
   <abstract>
     <para>
-      Ximian Evolution bug tracking is done at the <ulink
+       Evolution bug tracking is done at the <ulink
 							  url="http://bugzilla.ximian.com";>Ximian bug tracking
 	System</ulink>.  You may use that, or the GNOME <application>Bug
 	Report Tool</application> (known as <command>bug-buddy</command>
@@ -11,7 +11,7 @@
       features.
     </para>
     <para>
-      If you need additional help with Ximian Evolution, please visit
+      If you need additional help with Evolution, please visit
       the Ximian support site at <ulink
 					url="http://support.ximian.com";>ximian.com/support</ulink>.
     </para>
@@ -21,9 +21,9 @@
   <para>
      A complete list of feature requests and other issues with
     Evolution is available online in the Ximian bug tracking system.
-    You can learn more about the Ximian Evolution development process
+    You can learn more about the Evolution development process
     at <ulink
-    url="http://developer.ximian.com";>developer.ximian.com</ulink>.
+    url="http://www.gnome.org/projects/evolution/";>http://www.gnome.org/projects/evolution/</ulink>.
   </para>
   
 </appendix>
Index: help/C/evolution-1.5-C.omf
===================================================================
RCS file: help/C/evolution-1.5-C.omf
diff -N help/C/evolution-1.5-C.omf
--- help/C/evolution-1.5-C.omf	17 Nov 2003 15:50:53 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <creator>
-      Ximian, Inc.
-    </creator>
-    <title>
-      User's Guide to Ximian Evolution 1.4
-    </title>
-    <date>2002-2003</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"/>
-    <relation seriesid="83434cc6-71d1-11d7-9b12-ef76b8cf7c8f" />
-    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"; holder="Ximian, Inc."/>
-  </resource>
-</omf>
Index: help/C/evolution-1.5.xml
===================================================================
RCS file: help/C/evolution-1.5.xml
diff -N help/C/evolution-1.5.xml
--- help/C/evolution-1.5.xml	13 Jul 2004 19:45:35 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,129 +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 GFDL SYSTEM "apx-fdl.xml">
-<!ENTITY LEGAL SYSTEM "legal.xml">
-<!ENTITY GPL SYSTEM "apx-gpl.xml">
-<!ENTITY PREFACE SYSTEM "preface.xml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.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 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">
-
-<!ENTITY appversion "1.5">
-<!ENTITY docversion "1.5">
-<!ENTITY pubdate "May, 2004">
-
-]>
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix.  -->
-
-<!-- STYLE RULES:
-* Use "guilabel" instead of "guibutton" everywhere.
-* "Address Book" is two words, but it's better to use "Contacts", Contact, or Contact List
-* The "application" tag is not used around "Evolution."
-* Filenames use  command tags so they appear in the same font as commands 
-* There is one bar and it is the Shortcut Bar. The folder bar is dead. -->
-
-<!-- FIXME, TODO:   take new screenshots, -->
-
-<book id="index">
-  <bookinfo>
-    <title>Evolution 1.5 Manual</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-2004</year>
-      <holder>Novell, Inc.</holder>
-    </copyright>
-    
-   <releaseinfo>
-      This is version &docversion; of the Novell Evolution manual. It describes
-      version &appversion; of the Novell 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>Using Evolution</title>
-     <partintro>
-      <para>
-        Part one of the Novell Evolution manual
-        describes how to use Novell Evolution 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-MAIL;
-    &USAGE-MAIL-ORG;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-    &USAGE-EXCHANGE;
-    &USAGE-SYNC; 
-  </part>
-  <part id="config">
-  <title>Setting Preferences</title>
-    <partintro>
-      <para>
-        Novell Evolution 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 Novell
-        Evolution, "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>
-
-  &APX-GLOSS;
-  &MENUREF;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-  &GPL;
-  &GFDL;
-
-</book>
\ No newline at end of file
Index: help/C/evolution-C.omf
===================================================================
RCS file: help/C/evolution-C.omf
diff -N help/C/evolution-C.omf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/C/evolution-C.omf	24 Aug 2004 19:37:19 -0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <creator>
+      Novell, Inc.
+    </creator>
+    <title>
+      User's Guide to Evolution 2.0
+    </title>
+    <date>2002-2003</date>
+    <subject category="GNOME|Applications"/>
+    <description>
+	A user's guide to 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"/>
+    <relation seriesid="83434cc6-71d1-11d7-9b12-ef76b8cf7c8f" />
+    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"; holder="Novell, Inc."/>
+  </resource>
+</omf>
Index: help/C/evolution.xml
===================================================================
RCS file: help/C/evolution.xml
diff -N help/C/evolution.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/C/evolution.xml	24 Aug 2004 19:37:19 -0000
@@ -0,0 +1,129 @@
+<?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 GFDL SYSTEM "apx-fdl.xml">
+<!ENTITY LEGAL SYSTEM "legal.xml">
+<!ENTITY GPL SYSTEM "apx-gpl.xml">
+<!ENTITY PREFACE SYSTEM "preface.xml">
+<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.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 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">
+
+<!ENTITY appversion "2.0">
+<!ENTITY docversion "2.0">
+<!ENTITY pubdate "May, 2004">
+
+]>
+
+<!-- Almost every chapter is an entity.  Files, Chapter id's, and
+entity names correspond.  APX is for appendix.  -->
+
+<!-- STYLE RULES:
+* Use "guilabel" instead of "guibutton" everywhere.
+* "Address Book" is two words, but it's better to use "Contacts", Contact, or Contact List
+* The "application" tag is not used around "Evolution."
+* Filenames use  command tags so they appear in the same font as commands 
+* There is one bar and it is the Shortcut Bar. The folder bar is dead. -->
+
+<!-- FIXME, TODO:   take new screenshots, -->
+
+<book id="index">
+  <bookinfo>
+    <title>Evolution 2.0 Manual</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-2004</year>
+      <holder>Novell, Inc.</holder>
+    </copyright>
+    
+   <releaseinfo>
+      This is version &docversion; of the Novell Evolution manual. It describes
+      version &appversion; of the Novell 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>Using Evolution</title>
+     <partintro>
+      <para>
+        Part one of the Novell Evolution manual
+        describes how to use Novell Evolution 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-MAIL;
+    &USAGE-MAIL-ORG;
+    &USAGE-CONTACT;
+    &USAGE-CALENDAR;
+    &USAGE-EXCHANGE;
+    &USAGE-SYNC; 
+  </part>
+  <part id="config">
+  <title>Setting Preferences</title>
+    <partintro>
+      <para>
+        Novell Evolution 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 Novell
+        Evolution, "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>
+
+  &APX-GLOSS;
+  &MENUREF;
+  &APX-BUGS;
+  &APX-AUTHORS; 
+  &GPL;
+  &GFDL;
+
+</book>
\ No newline at end of file
Index: help/C/usage-exchange.xml
===================================================================
RCS file: /cvs/gnome/evolution/help/C/usage-exchange.xml,v
retrieving revision 1.14
diff -u -r1.14 usage-exchange.xml
--- help/C/usage-exchange.xml	22 Jul 2004 20:19:06 -0000	1.14
+++ help/C/usage-exchange.xml	24 Aug 2004 19:37:19 -0000
@@ -259,7 +259,7 @@
     <sect3 id="config-easy">
       <title>Simple Configuration Tool for Evolution Connector</title>
       <para>
-        Evolution Connector 1.4 comes with a simple account creation tool
+        Evolution Connector 2.0 comes with a simple account creation tool
         for some installations. Other installations will require
         the standard account tool described in <xref
         linkend="config-client" /> below.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]