diff --git a/configure.ac b/configure.ac index 87089c60a5..5ce8d5ce28 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 724700ca0f..fadc886288 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -7,20 +7,9 @@ NetworkManager D-Bus Reference Manual Version &version; - - - Dan - Williams - -
- dcbw@redhat.com -
-
-
-
- 2011 + 2012 The NetworkManager Authors @@ -44,14 +33,6 @@ USA - - - 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. -
diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 23edb25b32..a2a7d7768e 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -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/* \ diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml index 14d34315e8..1b989cb67c 100644 --- a/docs/libnm-glib/libnm-glib-docs.xml +++ b/docs/libnm-glib/libnm-glib-docs.xml @@ -1,28 +1,20 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> + libnm-glib Reference Manual - for libnm-glib 0.9 + for libnm-glib &version; The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/. - - - Dan - Williams - -
- dcbw@redhat.com -
-
-
-
- 2011 + 2012 The NetworkManager Authors @@ -46,14 +38,6 @@ USA - - - 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. -
diff --git a/docs/libnm-glib/version.xml.in b/docs/libnm-glib/version.xml.in new file mode 100644 index 0000000000..d78bda9342 --- /dev/null +++ b/docs/libnm-glib/version.xml.in @@ -0,0 +1 @@ +@VERSION@ diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 89462664d4..be1bdeebce 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -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/* \ diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index fcddaceb92..66b402c30a 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -3,15 +3,43 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ + ]> libnm-util Reference Manual - for libnm-util 0.9 + for libnm-util &version; The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-util/09/. + + + 2012 + The NetworkManager Authors + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free + Documentation License, 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 GNU Free + Documentation License from the Free Software + Foundation by visiting their Web site or by writing + to: + +
+ The Free Software Foundation, Inc., + 51 Franklin Street - Fifth Floor, + Boston, MA 02110-1301, + USA +
+
+
diff --git a/docs/libnm-util/version.xml.in b/docs/libnm-util/version.xml.in new file mode 100644 index 0000000000..d78bda9342 --- /dev/null +++ b/docs/libnm-util/version.xml.in @@ -0,0 +1 @@ +@VERSION@