Commit Graph

32 Commits

Author SHA1 Message Date
Lubomir Rintel
b1076a698c build: re-add NetworkManager.conf.xml.in to dist
Fixes: 90683fcb3a
2015-11-28 17:26:33 +01:00
Lubomir Rintel
90683fcb3a build: substitute config directory in Makefile
The autoconf substitutions should be expanded in Makefiles and shell scripts
only, does not work well in XML.

Fixes: 3e0b590e10
2015-11-27 14:18:34 +01:00
Lubomir Rintel
44e065359e dist: include manual page sources
Ommittes by mistake with an errorneous substitution.

https://mail.gnome.org/archives/networkmanager-list/2015-January/msg00066.html
2015-01-23 11:03:41 +01:00
Jiří Klimeš
da4a98bfbb man: allow installing pre-built manual pages if we can't build it
If we have ENABLE_GTK_DOCS, but not BUILD_SETTING_DOCS, nm-settings.5
nm-settings-keyfile.5 and nm-settings-ifcfg-rh.5 would not be installed.

(It happened on RHEL 7 build, due to missing BuildRequires: pygobject3-base)
2014-12-11 17:05:36 +01:00
Dan Winship
c14486984e libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.

With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).

The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...

(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
2014-11-19 09:24:09 -05:00
Dan Winship
16a9fc49dd docs: make the settings docs work from tarball builds
docs/api/settings-spec.xml was accidentally not getting disted,
because gtk-doc.make explicitly removes all DISTCLEANFILES from
distdir. However, it doesn't actually make sense for the settings docs
files to be in DISTCLEANFILES anyway; they were put there rather than
CLEANFILES (IIRC) so that "make clean" in a tarball build wouldn't
delete them and break things. But the right fix is to just make them
only be in CLEANFILES when BUILD_SETTING_DOCS is true, and not ever
get deleted otherwise.

Also adjust the build rules to ensure that the generated docs don't
get rebuilt in tarball builds, since that can cause problems when
building from a read-only source tree, etc.

Meanwhile, in an unrelated but also fatal bug, configure.ac's check
for if the generated docs were already present never got updated for
the cli/src -> clients/cli move, and so even if we had been disting
settings-spec.xml, configure would still think that the tarball didn't
have all of the generated docs in it, so SETTING_DOCS_AVAILABLE would
be set false and none of the generated docs would get used.

https://bugzilla.gnome.org/show_bug.cgi?id=740035
2014-11-14 17:14:18 -05:00
Thomas Haller
dd9bb5f376 man: fix make uninstall to remove the nmtui manual pages
Fixes: 1e8b681d4f
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-11-12 17:40:05 +01:00
Thomas Haller
1e8b681d4f man: add manual page for nmtui(1)
https://bugzilla.gnome.org/show_bug.cgi?id=739710

Branch: th/bgo739710_man_nmtui
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-11-11 16:01:38 +01:00
Jiří Klimeš
f27fac5109 man: generate nm-settings-ifcfg-rh(5) manual page 2014-08-29 13:59:54 +02:00
Jiří Klimeš
24edee2772 man: generate nm-settings-keyfile(5) manual page
man/nm-settings-keyfile.xml is generated via an XSLT stylesheet applied to
libnm-util/nm-keyfile-docs.xml. Then a manual page is generated from the XML.
2014-08-29 13:59:54 +02:00
Dan Winship
377f72a66f build: fix nm-setting-docs build in various configurations
Certain build configurations (like --enable-gtk-doc
--disable-introspection) were broken with respect to nm-setting-docs.
Fix this. Also, we don't require just gobject-introspection, we need
pygobject specifically as well.
2014-06-27 17:24:57 -04:00
Dan Winship
a3d02ddeef man: generate nm-settings.xml from libnm-util/nm-setting-docs.xml
Generate man/nm-settings.xml via an XSLT stylesheet applied to
libnm-util/nm-setting-docs.xml.
2014-06-19 17:45:02 -04:00
Jiří Klimeš
6993b5b2a1 man: add 'nmcli-examples' manual page with examples of nmcli usage
(and add a reference to 'nmcli-examples' to other man pages)
2013-07-22 13:43:54 +02:00
Dan Winship
916a427873 man: only remove the man pages in "make clean" if we built them
doing:

  ./configure --disable-gtk-doc
  make clean
  make

from a tarball build (or from a dirty tree that had previously had an
--enable-gtk-doc build) would fail, because configure would see the
pre-existing man pages and set INSTALL_PREGEN_MANPAGES, but "make
clean" would delete them, and there'd be no rule to regenerate them.
2013-06-13 17:45:52 -03:00
Dan Williams
3a5bf0517c build: always generate docs at dist time (bgo #700093)
dist tarballs shouldn't ever be released without the documentation,
and this allows us to build the tarballs with pre-generated docs
that get installed on the end system, but don't need to be built
there.  So the end system doesn't need gtk-doc installed, only
the dist system does.

https://bugzilla.gnome.org/show_bug.cgi?id=700093
2013-05-14 10:53:46 -05:00
Dan Winship
b39b4e9cf3 man: fix distcheck
Also, we can get rid of tools/manpages-docbook.xsl and just specify
the canonical URL directly.
2013-05-02 11:40:21 -04:00
Colin Walters
34c88dd8e4 man: rewrite NetworkManager.8 and NetworkManager.conf.5 in DocBook
DocBook is not my favorite thing in the world, but it's
<lots-of-emphasis>far</lots-of-emphasis> saner than troff.  Some style
parts cribbed from systemd.

This is preparatory work for actually improving the content of the
man pages.
2013-04-24 11:44:50 -05:00
Pavel Šimerda
bb8c75bd53 remove obsolete nm-tool
Use nmcli instead.
2013-03-04 22:11:45 +01:00
Michael Biebl
28520ac865 build: AC_CONFIG_FILES are automatically part of "make dist"
No need to add those explicitly to EXTRA_DIST
2013-02-09 18:16:24 +01:00
Colin Walters
6ea196de0e man: Fix previous commit to honor --disable-doc
In that mode, we shouldn't attempt to generate any manpages.  While
we're here, rewrite this file (using nonrecursive style) so we don't
install non-generated ones either.

Signed-off-by: Colin Walters <walters@verbum.org>
2013-02-09 18:08:23 +01:00
Michael Biebl
51c6338329 build: Don't install generated xml file as man page 2013-02-09 17:10:20 +01:00
Jiří Klimeš
ac19edd96e man: generate nm-settings.5 manual page (bgo #673520)
We only generate the page when configured "--with-docs", because we need xsl
stylesheets that are pulled in by gtk-doc.
2013-02-05 18:26:16 +01:00
Jiří Klimeš
759ad39c8c man: add a manpage for nm-online 2010-08-06 13:51:41 +02:00
Jiří Klimeš
825d999a05 Merge branch 'master' into cli-output
Conflicts:
	man/Makefile.am
2010-04-26 10:44:28 +02:00
Jiří Klimeš
6234c66bc9 man: add man page for nmcli 2010-04-14 23:40:52 +02:00
Dan Williams
f72c00b984 man: add logging control options 2010-04-08 09:16:27 -07:00
Jiří Klimeš
1aae1ad009 man: manpage updates; add pages for system settings config file 2010-03-01 12:35:20 -08:00
Dan Williams
03194ce96d 2008-04-27 Dan Williams <dcbw@redhat.com>
* Makefile.am
	  configure.in
	  dispatcher-daemon/Makefile.am
	  dispatcher-daemon/NetworkManagerDispatcher.c
	  initscript/Arch/Makefile.am
	  initscript/Arch/networkmanager-dispatcher.in
	  initscript/Gentoo/Makefile.am
	  initscript/Gentoo/NetworkManagerDispatcher.in
	  initscript/Mandriva/Makefile.am
	  initscript/Mandriva/networkmanagerdispatcher.in
	  initscript/RedHat/Makefile.am
	  initscript/RedHat/NetworkManagerDispatcher.in
	  initscript/SUSE/Makefile.am
	  initscript/SUSE/networkmanager-dispatcher.in
	  initscript/Slackware/Makefile.am
	  initscript/Slackware/rc.networkmanager-dispatcher.in
	  initscript/paldo/Makefile.am
	  initscript/paldo/NetworkManagerDispatcher.in
	  man/Makefile.am
	  man/NetworkManagerDispatcher.8.in
		- Remove the dispatcher daemon



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3608 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-27 15:22:10 +00:00
Dan Williams
3a576089ec 2006-12-02 Dan Williams <dcbw@redhat.com>
Patch from Michael Biebl <biebl@teco.edu>
	* configure.in
	  man/NetworkManager.1.in
	  man/NetworkManagerDispatcher.1.in
	  man/NetworkManager.8.in
	  man/NetworkManagerDispatcher.8.in
		- Add .SH NAME stanzas
		- Move NM & NM Dispatcher manpages to section 8 (admin)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2140 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2006-12-03 03:39:39 +00:00
Robert Love
f0cc1a602c 2006-02-01 Robert Love <rml@novell.com>
* configure.in, man/nm-tool.1.in, man/Makefile.am: Add nm-tool(1)
	  manpage.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1424 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2006-02-01 18:14:15 +00:00
Robert Love
df5df99099 Makefile.am: s/mans_MANS/man_MANS/ spotted by Bill Moss
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1370 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2006-01-21 01:42:53 +00:00
Robert Love
43013ba9c6 2006-01-20 Robert Love <rml@novell.com>
* Makefile.am, configure.in: Add new man subdirectory.
	* man, man/NetworkManager.1.in, man/NetworkManagerDispatcher.1.in,
	  man/Makefile.am: Add man pages for NetworkManager and its
	  crime-solving bumbling buddy, NetworkManagerDispatcher.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1367 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2006-01-20 21:10:33 +00:00