summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Curtis <tcurtis@src.gnome.org>2001-12-10 13:27:09 +0000
committerTrevor Curtis <tcurtis@src.gnome.org>2001-12-10 13:27:09 +0000
commitba69fc210ed11733e440c30e8e4fa19ad833770d (patch)
treed35151232e4dbfed9af476b19548ba96b252dc4c
parent08f6ab9f150b3699e0e0cfbed671584a2a667de5 (diff)
downloadgdm-ba69fc210ed11733e440c30e8e4fa19ad833770d.tar.gz
updated the doc to use the FDL, and cleaned up a few things
* docs/C/gdm.xml: updated the doc to use the FDL, and cleaned up a few things
-rw-r--r--ChangeLog4
-rw-r--r--docs/C/gdm.xml88
2 files changed, 64 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 654c012e..b186c12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 10 08:23:00 2001 Trevor Curtis <tcurtis@somaradio.ca>
+ * docs/C/gdm.xml: updated the doc to use the FDL, and cleaned up a
+ few things
+
Fri Dec 7 23:02:12 2001 Trevor Curtis <tcurtis@somaradio.ca>
* doc/C/gdmconfig/C/gdm.xml: removed Tim Jansen from documentation
at his request
diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index acc26725..1ae1fe52 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -29,34 +29,32 @@
<year>2001</year> <holder>George Lebl</holder>
</copyright>
- <legalnotice>
- <para>
- This documentation is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- </para>
-
- <para>
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more details.
- </para>
-
- <para>
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- </para>
-
- <para>
- For more details see the file COPYING in the source
- distribution of GDM.
- </para>
- </legalnotice>
+ <!-- Use this legal notice for online documents which depend on -->
+ <!-- core GNOME packages. -->
+ <legalnotice id="legalnotice">
+ <para>
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the <ulink type="help"
+ url="gnome-help:fdl"><citetitle>GNU Free Documentation
+ License</citetitle></ulink>, Version 1.1 or any later version
+ published by the Free Software Foundation with no Invariant Sections,
+ no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
+ can be found <ulink type="help" url="gnome-help:fdl">here</ulink>.
+ </para>
+ <para>
+ Many of the names used by companies to distinguish their products and
+ services are claimed as trademarks. Where those names appear in any
+ GNOME documentation, and those trademarks are made aware to the members
+ of the GNOME Documentation Project, the names have been printed in caps
+ or initial caps.
+ </para>
+ </legalnotice>
+
+ <releaseinfo>
+ This manual describes version &version; of the GNOME Display Manager. It was
+ last updated on &date;.
+ </releaseinfo>
+
</bookinfo>
<toc></toc>
@@ -1898,6 +1896,40 @@
</sect2>
</sect1>
+
+ <!-- ============= Application License ============================= -->
+
+ <sect1 id="license">
+ <title>License</title>
+ <para>
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the <ulink type="help" url="gnome-help:gpl">
+ <citetitle>GNU General Public License</citetitle></ulink> as
+ published by the Free Software Foundation;
+ either version 2 of the License, or (at your option) any later
+ version.
+ </para>
+ <para>
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ <citetitle>GNU General Public License</citetitle> for more details.
+ </para>
+ <para>
+ A copy of the <citetitle>GNU General Public License</citetitle> is
+ included as an appendix to the <citetitle>GNOME Users
+ Guide</citetitle>. You may also obtain a copy of the
+ <citetitle>GNU General Public License</citetitle> from the Free
+ Software Foundation by visiting <ulink type="http"
+ url="http://www.fsf.org">their Web site</ulink> or by writing to
+ <address>
+ Free Software Foundation, Inc.
+ <street>59 Temple Place</street> - Suite 330
+ <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
+ <country>USA</country>
+ </address>
+ </para>
+ </sect1>
</chapter>