--- a/Solaris/ChangeLog	Tue Jul 20 15:14:28 2004 +0000
+++ b/Solaris/ChangeLog	Tue Jul 20 22:53:05 2004 +0000
@@ -1,3 +1,10 @@
+2004-07-20  Brian Cameron  <[email protected]>
+
+	* SUNWevolution.spec, SUNWmozilla.spec:  Added man pages.
+	* manpages/sman1/evolution-addressbook-export.1, 
+	  manpages/sman1/evolution-addressbook-import.1:  Added
+	  manpages provided by Breda McColgan.
+
 2004-07-20  Damien Carbery <[email protected]>
 
 	* SUNWgnome-a11y-poke.spec: Commit initial version.
@@ -10,24 +17,26 @@
 
 2004-07-16  Dermot McCluskey <[email protected]>
 
-	* SUNWmozilla.spec : fixed syntax of MOZ_IN_INSTALL declaration in postinstall script
+	* SUNWmozilla.spec : fixed syntax of MOZ_IN_INSTALL declaration in
+	  postinstall script
 
 2004-07-16  Dave Lin <[email protected]>
 
-        * SUNWmozilla.spec: Added MOZ_IN_INSTALL=1 in post install/remove scripts of apoc adapter to fix the apoc bug
-                            Moved all the config files to SUNWmozilla to simplify the management
-                            Always keep all the config files existing
-			    Added debuginfo.sh and migration directory in mozilla
+	* SUNWmozilla.spec: Added MOZ_IN_INSTALL=1 in post install/remove
+	  scripts of apoc adapter to fix the apoc bug.  Moved all the config
+	  files to SUNWmozilla to simplify the management.  Always keep all
+	  the config files existing Added debuginfo.sh and migration
+	  directory in mozilla
 
 2004-07-15  Danek Duvall <[email protected]>
 
 	* SUNWgnutls.spec: Need to put %{_libdir} back in for this one as
-	well.
+	  well.
 
 2004-07-16  Dave Lin <[email protected]>
 
-        * SUNWmozilla.spec: Added MOZ_IN_INSTALL=1 in post install/remove scripts of apoc adapter to fix the apoc bug
-
+	* SUNWmozilla.spec: Added MOZ_IN_INSTALL=1 in post install/remove
+	   scripts of apoc adapter to fix the apoc bug
 
 2004-07-15  Danek Duvall  <[email protected]>
 
@@ -124,12 +133,14 @@
 
 2004-07-09  Dave Lin <[email protected]>
 
-	* SUNWmozilla.spec: Introduced a new startup scripts(mozilla, .sun_moz, run-mozilla.sh)
-
+	* SUNWmozilla.spec: Introduced a new startup scripts(mozilla, .sun_moz,
+	  run-mozilla.sh)
 
 2004-07-09  Dave Lin <[email protected]>
 
-	* SUNWmozilla.spec: Modified the dependency of apoc-adapter, make sure it's the last one running post script to fix the regxpcom lated bug #5049792
+	* SUNWmozilla.spec: Modified the dependency of apoc-adapter, make sure
+	  it's the last one running post script to fix the regxpcom lated bug
+	  #5049792
 
 2004-07-08  Damien Carbery  <[email protected]>
 
@@ -143,8 +154,8 @@
 2004-07-08  Ghee Teo <[email protected]>
 
 	* Updated SUNWgnome-terminal.spec to make sure that gnome-pty-helper
-          has permission 2711 instead of 2755 so these are the same for
-          both Solaris and Linux.
+	  has permission 2711 instead of 2755 so these are the same for
+	  both Solaris and Linux.
 
 2004-07-07  Damien Carbery  <[email protected]>
 

--- a/Solaris/SUNWevolution.spec	Tue Jul 20 15:14:28 2004 +0000
+++ b/Solaris/SUNWevolution.spec	Tue Jul 20 22:53:05 2004 +0000
@@ -21,6 +21,9 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Source1:       idnkit.pc
+Source2:       evolution.1
+Source3:       evolution-addressbook-export.1
+Source4:       evolution-addressbook-import.1
 BuildRequires: SUNWgnome-javahelp-convert
 Requires:      SUNWevolution-share
 Requires:      SUNWevolution-root
@@ -90,6 +93,12 @@
     rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults/$f
 done
 
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+install -d $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/sman1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -162,6 +171,8 @@
 %defattr (0755, root, sys)
 
 %changelog
+* Tue Jul 20 2004 - [email protected]
+- Added man pages.
 * Tue Jun 29 2004 - [email protected]
 - Added "-L%{moz_prefix}/lib/mozilla -R%{moz_prefix}/lib/mozilla" to LDFLAGS
  so mozilla libraries can be found

--- a/Solaris/SUNWmozilla.spec	Tue Jul 20 15:14:28 2004 +0000
+++ b/Solaris/SUNWmozilla.spec	Tue Jul 20 22:53:05 2004 +0000
@@ -26,6 +26,7 @@
 Name:          SUNWmozilla
 Summary:       Mozilla Web browser
 Version:       1.7
+Source1:       mozilla.1
 SUNW_BaseDir:  %{_basedir}
 SUNW_Category: MOZ17,application,JDS3
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
@@ -148,6 +149,10 @@
 cd ..
 %mozilla.install
 
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+install -d $RPM_BUILD_ROOT%{_mandir}/sman1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/sman1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1289,6 +1294,8 @@
 %{_gmdatadir}/applications/mozilla.desktop
 
 %changelog
+* Tue Jul 20 2004 - [email protected]
+- Added man page.
 * Fri Jul 16 2004 - [email protected]
 - fixed syntax of MOZ_IN_INSTALL declaration in postinstall script
 * Fri Jul 16 2004 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/manpages/sman1/evolution-addressbook-export.1	Tue Jul 20 22:53:05 2004 +0000
@@ -0,0 +1,149 @@
+<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
+<!--ArborText, Inc., 1988-1999, v.4002-->
+<!ENTITY envr-tt "ENVIRONMENT VARIABLES">
+<!ENTITY cmd "evolution-addressbook-export">
+<!ENTITY % commonents SYSTEM "smancommon.ent">
+%commonents;
+<!ENTITY % booktitles SYSTEM "booktitles.ent">
+%booktitles;
+<!ENTITY suncopy "Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.">
+]>
+<?Pub UDT _bookmark _target>
+<?Pub Inc>
+<refentry id="evolution-addressbook-export-1">
+<!-- %Z%%M% %I% %E% SMI; -->
+<refmeta><refentrytitle>evolution-addressbook-export</refentrytitle><manvolnum>
+1</manvolnum>
+<refmiscinfo class="date">15 Apr 2004</refmiscinfo>
+<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
+<refmiscinfo class="software">&release;</refmiscinfo>
+<refmiscinfo class="arch">generic</refmiscinfo>
+<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
+</refmeta>
+<indexterm><primary>evolution-addressbook-export</primary></indexterm><indexterm>
+<primary>Evolution</primary></indexterm>
+<refnamediv id="evolution-addressbook-export-1-name"><refname>evolution-addressbook-export
+</refname><refpurpose>export local address book from Ximian Evolution, Sun
+Microsystems Edition</refpurpose></refnamediv>
+<refsynopsisdiv id="evolution-addressbook-export-1-synp"><title>&synp-tt;</title>
+<cmdsynopsis><command>&cmd;</command><arg choice="opt"><option>-async</option></arg>
+<arg choice="opt"><option>-format=[vcard|csv]</option></arg><arg choice="opt"><option>
+-help</option></arg><arg choice="opt"><option>-list-addressbook-folders</option></arg>
+<arg choice="opt"><option>-output=<replaceable>output-file</replaceable></option></arg>
+<arg choice="opt"><option>-size=<replaceable>number</replaceable></option></arg>
+<arg choice="opt"><option>-usage</option></arg><arg choice="opt"><option>
+-version</option></arg>
+</cmdsynopsis></refsynopsisdiv>
+<refsect1 id="evolution-addressbook-export-1-desc"><title>&desc-tt;</title>
+<para>Export the local address book to a file.</para>
+</refsect1>
+<refsect1 id="evolution-addressbook-export-1-opts"><title>&opts-tt;</title>
+<para>The following options are supported:</para>
+<variablelist termlength="medium">
+<varlistentry><term><option>-async</option></term><listitem><para>Export in
+asynchronous mode. You can also use <option>a</option> to specify this option.
+</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-format=[vcard|csv]</option></term><listitem>
+<para>Specify the export format:  virtual card (vcard) or comma-separated
+value (csv).</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-help</option></term><listitem><para>Display help
+text. You can also use <option>?</option> to specify this option.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-list-addressbook-folders</option></term><listitem>
+<para>List the local address-book folders. You can also use <option>l</option>
+to specify this option.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-output=<replaceable>output-file</replaceable></option></term>
+<listitem><para>Specify the name of the output file to store the exported
+information. If no output file is specified, the exported information is sent
+to standard output.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-size=<replaceable>number</replaceable></option></term>
+<listitem><para>Specify the number of cards in one output file in asychronous
+mode. The default value is 100.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-usage</option></term><listitem><para>Display
+brief usage text.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-version</option></term><listitem><para>Display
+version information.</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-export-1-exam"><title>&exam-tt;</title>
+<example role="example">
+<title>Exporting Local Address Book in Asynchronous Mode and Vcard Format
+<?Pub Caret>to contacts.vcf</title>
+<para><screen>example% <userinput>&cmd; -a --format=vcard --output=contacts.vcf
+</userinput></screen></para>
+</example>
+</refsect1>
+<refsect1 id="evolution-addressbook-export-1-exit"><title>&exit-tt;</title>
+<para>The following exit values are returned:</para>
+<variablelist termlength="xtranarrow">
+<varlistentry><term><returnvalue>0</returnvalue></term><listitem><para>Application
+exited successfully</para>
+</listitem></varlistentry>
+<varlistentry><term><returnvalue>1</returnvalue></term><listitem><para>Application
+exited with failure</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-export-1-file"><title>&file-tt;</title>
+<para>The following files are used by this application:</para>
+<variablelist termlength="wholeline">
+<varlistentry><term><filename>/usr/bin/&cmd;</filename> </term><listitem>
+<para>Executable to export Evolution local address book</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution</filename> </term><listitem>
+<para>Per-user configuration files and local storage for Evolution</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution/mail/<replaceable>account</replaceable>/<replaceable>
+folders</replaceable></filename> </term><listitem><para>Temporary files for
+Evolution mail</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution/sunone/<replaceable>account
+</replaceable>/<replaceable>folders</replaceable></filename> </term><listitem>
+<para>Temporary files for Evolution Sun ONE account</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-export-1-attr"><title>&attr-tt;</title>
+<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
+<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
+for descriptions of the following attributes:</para>
+<informaltable frame="all">
+<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
+<colspec colname="COLSPEC1" colwidth="1*">
+<thead>
+<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
+valign="middle">ATTRIBUTE VALUE</entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para>Architecture</para></entry><entry colname="COLSPEC1"><para>
+SPARC</para></entry></row>
+<row><entry><para>Availability</para></entry><entry><para>SUNWevo</para></entry>
+</row>
+<row><entry colname="COLSPEC0"><para>CSI</para></entry><entry colname="COLSPEC1"><para>
+Enabled</para></entry></row>
+<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
+colname="COLSPEC1"><para>Standard</para></entry></row>
+<row><entry colname="COLSPEC0"><para>MT-Level</para></entry><entry colname="COLSPEC1"><para>
+MT safe with Exceptions</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</refsect1>
+<refsect1 id="evolution-addressbook-export-1-also"><title>&also-tt;</title>
+<!--Reference to another man page-->
+<!--Reference to a Help manual-->
+<!--Reference to a book.-->
+<para><citetitle>Ximian Evolution Sun Microsystems Edition User Guide</citetitle></para>
+<para><citerefentry><refentrytitle>evolution</refentrytitle><manvolnum>1</manvolnum>
+</citerefentry>, <citerefentry><refentrytitle>evolution-address-import</refentrytitle>
+<manvolnum>1</manvolnum></citerefentry></para>
+</refsect1>
+<refsect1 id="evolution-addressbook-export-1-note"><title>&note-tt;</title>
+<para>Written by Steven Zhang, Sun Microsystems Inc., 2004.</para>
+</refsect1>
+</refentry>
+<?Pub *0000007541>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/manpages/sman1/evolution-addressbook-import.1	Tue Jul 20 22:53:05 2004 +0000
@@ -0,0 +1,132 @@
+<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
+<!--ArborText, Inc., 1988-1999, v.4002-->
+<!ENTITY envr-tt "ENVIRONMENT VARIABLES">
+<!ENTITY cmd "evolution-addressbook-import">
+<!ENTITY % commonents SYSTEM "smancommon.ent">
+%commonents;
+<!ENTITY % booktitles SYSTEM "booktitles.ent">
+%booktitles;
+<!ENTITY suncopy "Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.">
+]>
+<?Pub UDT _bookmark _target>
+<?Pub Inc>
+<refentry id="evolution-addressbook-import-1">
+<!-- %Z%%M% %I% %E% SMI; -->
+<refmeta><refentrytitle>evolution-addressbook-import</refentrytitle><manvolnum>
+1</manvolnum>
+<refmiscinfo class="date">15 Apr 2004</refmiscinfo>
+<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
+<refmiscinfo class="software">&release;</refmiscinfo>
+<refmiscinfo class="arch">generic</refmiscinfo>
+<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
+</refmeta>
+<indexterm><primary>evolution-addressbook-import</primary></indexterm><indexterm>
+<primary>Evolution</primary></indexterm>
+<refnamediv id="evolution-addressbook-import-1-name"><refname>evolution-addressbook-import
+</refname><refpurpose>import contact information into the local address book
+in Ximian Evolution, Sun Microsystems Edition</refpurpose></refnamediv>
+<refsynopsisdiv id="evolution-addressbook-import-1-synp"><title>&synp-tt;</title>
+<cmdsynopsis><command>&cmd;</command><arg choice="opt"><option>-help</option></arg>
+<arg choice="opt"><option>-input=<replaceable>input-file</replaceable></option></arg>
+<arg choice="opt"><option>-usage</option></arg><arg choice="opt"><option>
+-version</option></arg>
+</cmdsynopsis></refsynopsisdiv>
+<refsect1 id="evolution-addressbook-import-1-desc"><title>&desc-tt;</title>
+<para>Import contact information into the local address book from a file.
+</para>
+<para>The file contents can be in either virtual-card (Vcard) format or comma-separated
+value (CSV) format.</para>
+</refsect1>
+<refsect1 id="evolution-addressbook-import-1-opts"><title>&opts-tt;</title>
+<para>The following options are supported:</para>
+<variablelist termlength="medium">
+<varlistentry><term><option>-help</option></term><listitem><para>Display help
+text. You can also use <option>?</option> to specify this option.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-input=<replaceable>input-file</replaceable></option></term>
+<listitem><para>Specify the input file that contains the information to be
+imported.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-usage</option></term><listitem><para>Display
+brief usage text.</para>
+</listitem></varlistentry>
+<varlistentry><term><option>-version</option></term><listitem><para>Display
+version information.</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-import-1-exam"><title>&exam-tt;</title>
+<example role="example">
+<title>Importing Contact Information into Local Address Book From contacts.vcf
+</title>
+<para><screen>example% <userinput>&cmd; --input=contacts.vcf</userinput></screen></para>
+</example>
+</refsect1>
+<refsect1 id="evolution-addressbook-import-1-exit"><title>&exit-tt;</title>
+<para>The following exit values are returned:</para>
+<variablelist termlength="xtranarrow">
+<varlistentry><term><returnvalue>0</returnvalue></term><listitem><para>Application
+exited successfully</para>
+</listitem></varlistentry>
+<varlistentry><term><returnvalue>1</returnvalue></term><listitem><para>Application
+exited with failure</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-import-1-file"><title>&file-tt;</title>
+<para>The following files are used by this application:</para>
+<variablelist termlength="wholeline">
+<varlistentry><term><filename>/usr/bin/&cmd;</filename> </term><listitem>
+<para>Executable to import data <?Pub Caret>into Evolution local address book
+</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution</filename> </term><listitem>
+<para>Per-user configuration files and local storage for Evolution</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution/mail/<replaceable>account</replaceable>/<replaceable>
+folders</replaceable></filename> </term><listitem><para>Temporary files for
+Evolution mail</para>
+</listitem></varlistentry>
+<varlistentry><term><filename>$HOME/evolution/sunone/<replaceable>account
+</replaceable>/<replaceable>folders</replaceable></filename> </term><listitem>
+<para>Temporary files for Evolution Sun ONE account</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="evolution-addressbook-import-1-attr"><title>&attr-tt;</title>
+<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
+<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
+for descriptions of the following attributes:</para>
+<informaltable frame="all">
+<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
+<colspec colname="COLSPEC1" colwidth="1*">
+<thead>
+<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
+valign="middle">ATTRIBUTE VALUE</entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para>Architecture</para></entry><entry colname="COLSPEC1"><para>
+SPARC</para></entry></row>
+<row><entry><para>Availability</para></entry><entry><para>SUNWevo</para></entry>
+</row>
+<row><entry colname="COLSPEC0"><para>CSI</para></entry><entry colname="COLSPEC1"><para>
+Enabled</para></entry></row>
+<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
+colname="COLSPEC1"><para>Standard</para></entry></row>
+<row><entry colname="COLSPEC0"><para>MT-Level</para></entry><entry colname="COLSPEC1"><para>
+MT safe with Exceptions</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</refsect1>
+<refsect1 id="evolution-addressbook-import-1-also"><title>&also-tt;</title>
+<!--Reference to another man page-->
+<!--Reference to a Help manual-->
+<!--Reference to a book.-->
+<para><citetitle>Ximian Evolution Sun Microsystems Edition User Guide</citetitle></para>
+<para><citerefentry><refentrytitle>evolution</refentrytitle><manvolnum>1</manvolnum>
+</citerefentry>, <citerefentry><refentrytitle>evolution-address-export</refentrytitle>
+<manvolnum>1</manvolnum></citerefentry></para>
+</refsect1>
+<refsect1 id="evolution-addressbook-import-1-note"><title>&note-tt;</title>
+<para>Written by Steven Zhang, Sun Microsystems Inc., 2004.</para>
+</refsect1>
+</refentry>
+<?Pub *0000006515>