docs: auto-version documentation and fix up copyright and authorship

This commit is contained in:
Dan Williams 2012-08-06 22:04:06 -05:00
parent 5deecdb871
commit aab6de97bb
8 changed files with 46 additions and 45 deletions

View file

@ -828,7 +828,9 @@ docs/Makefile
docs/api/Makefile
docs/api/version.xml
docs/libnm-glib/Makefile
docs/libnm-glib/version.xml
docs/libnm-util/Makefile
docs/libnm-util/version.xml
NetworkManager.pc
examples/Makefile
examples/shell/Makefile

View file

@ -7,20 +7,9 @@
<bookinfo>
<title>NetworkManager D-Bus Reference Manual</title>
<releaseinfo>Version &version;</releaseinfo>
<authorgroup>
<author>
<firstname>Dan</firstname>
<surname>Williams</surname>
<affiliation>
<address>
<email>dcbw@redhat.com</email>
</address>
</affiliation>
</author>
</authorgroup>
<copyright>
<year>2011</year>
<year>2012</year>
<holder>The NetworkManager Authors</holder>
</copyright>
@ -44,14 +33,6 @@
<country>USA</country>
</address>
</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>
</bookinfo>

View file

@ -61,7 +61,7 @@ IGNORE_HFILES= \
HTML_IMAGES = libnm-glib.png
# Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
content_files =
content_files = version.xml
# Other files to distribute.
extra_files = libnm-glib.png
@ -84,6 +84,8 @@ GTKDOC_LIBS = \
# include common portion ...
include $(top_srcdir)/gtk-doc.make
EXTRA_DIST += version.xml.in
CLEANFILES += \
libnm-glib-sections.txt \
html/* \

View file

@ -1,28 +1,20 @@
<?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">
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY version SYSTEM "version.xml">
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>libnm-glib Reference Manual</title>
<releaseinfo>
for libnm-glib 0.9
for libnm-glib &version;
The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/">http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/</ulink>.
</releaseinfo>
<authorgroup>
<author>
<firstname>Dan</firstname>
<surname>Williams</surname>
<affiliation>
<address>
<email>dcbw@redhat.com</email>
</address>
</affiliation>
</author>
</authorgroup>
<copyright>
<year>2011</year>
<year>2012</year>
<holder>The NetworkManager Authors</holder>
</copyright>
@ -46,14 +38,6 @@
<country>USA</country>
</address>
</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>
</bookinfo>

View file

@ -0,0 +1 @@
@VERSION@

View file

@ -39,7 +39,7 @@ IGNORE_HFILES= \
HTML_IMAGES =
# Extra XML files that are included by $(DOC_MAIN_SGML_FILE).
content_files =
content_files = version.xml
# Other files to distribute.
extra_files =
@ -62,6 +62,8 @@ GTKDOC_LIBS = \
# include common portion ...
include $(top_srcdir)/gtk-doc.make
EXTRA_DIST += version.xml.in
CLEANFILES += \
libnm-util-sections.txt \
html/* \

View file

@ -3,15 +3,43 @@
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
<!ENTITY version SYSTEM "version.xml">
]>
<book id="index">
<bookinfo>
<title>libnm-util Reference Manual</title>
<releaseinfo>
for libnm-util 0.9
for libnm-util &version;
The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</ulink>.
</releaseinfo>
<copyright>
<year>2012</year>
<holder>The NetworkManager Authors</holder>
</copyright>
<legalnotice>
<para>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <citetitle>GNU Free
Documentation License</citetitle>, 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. You may obtain a copy of the <citetitle>GNU Free
Documentation 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>
The Free Software Foundation, Inc.,
<street>51 Franklin Street</street> - Fifth Floor,
<city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>,
<country>USA</country>
</address>
</para>
</legalnotice>
</bookinfo>
<chapter>

View file

@ -0,0 +1 @@
@VERSION@