diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-04 19:56:02 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-05 14:37:51 +0200 |
commit | 0fc0cc68fc976f2e70befd23b9839969d731160a (patch) | |
tree | 3e8569c012c08971ae6a4b3c09a22299faeb8718 | |
parent | 20300fd7db9b824ab364e5d543903a61ee1cfe0d (diff) | |
download | NetworkManager-0fc0cc68fc976f2e70befd23b9839969d731160a.tar.gz |
man: move nmcli-examples to section 7
It really is not a configuration file and doesn't belong to section 5.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 1 | ||||
-rw-r--r-- | man/Makefile.am | 5 | ||||
-rw-r--r-- | man/NetworkManager.conf.xml.in | 2 | ||||
-rw-r--r-- | man/NetworkManager.xml | 2 | ||||
-rw-r--r-- | man/nm-settings-ifcfg-rh.xsl | 2 | ||||
-rw-r--r-- | man/nm-settings-keyfile.xsl | 2 | ||||
-rw-r--r-- | man/nm-settings.xsl | 2 | ||||
-rw-r--r-- | man/nmcli-examples.xml | 2 | ||||
-rw-r--r-- | man/nmcli.xml | 6 |
10 files changed, 15 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 412061c78b..35193c5e32 100644 --- a/configure.ac +++ b/configure.ac @@ -968,7 +968,7 @@ if test "$enable_gtk_doc" != "yes" \ -a -f man/nm-settings.5 \ -a -f man/nm-settings-keyfile.5 \ -a -f man/nm-settings-ifcfg-rh.5 \ - -a -f man/nmcli-examples.5 \ + -a -f man/nmcli-examples.7 \ -a -f man/NetworkManager.8; then install_pregen_manpages=yes fi diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a3fac60203..1f40e01a5f 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -524,6 +524,7 @@ fi %dir %{nmlibdir}/VPN %{_mandir}/man1/* %{_mandir}/man5/* +%{_mandir}/man7/* %{_mandir}/man8/* %dir %{_localstatedir}/lib/NetworkManager %dir %{_sysconfdir}/NetworkManager/system-connections diff --git a/man/Makefile.am b/man/Makefile.am index 9ab8b5f12f..fafc6852f4 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,6 +23,9 @@ if ENABLE_GTK_DOC %.5: %.xml common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< +%.7: %.xml common.ent + $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< + %.8: %.xml common.ent $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< @@ -61,7 +64,7 @@ man_pages = \ nmtui.1 \ nm-online.1 \ NetworkManager.conf.5 \ - nmcli-examples.5 \ + nmcli-examples.7 \ NetworkManager.8 autogenerated_man_pages = \ diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index 7491a7cdbf..2736065e52 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -1010,7 +1010,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2 <para> <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index 9bf71e8824..3c4b733e5c 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -458,7 +458,7 @@ <para> <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index b25521f81c..5a9f8d6a7a 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -316,7 +316,7 @@ DEVICETYPE=TeamPort <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry></para> + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para> </refsect1> </refentry> </xsl:template> diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl index 694fbc7192..41e7dcdb88 100644 --- a/man/nm-settings-keyfile.xsl +++ b/man/nm-settings-keyfile.xsl @@ -251,7 +251,7 @@ id=4 <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry></para> + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para> </refsect1> </refentry> </xsl:template> diff --git a/man/nm-settings.xsl b/man/nm-settings.xsl index 86ab662d65..0fe4cabea8 100644 --- a/man/nm-settings.xsl +++ b/man/nm-settings.xsl @@ -119,7 +119,7 @@ <refsect1 id='see_also'><title>See Also</title> <para><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></para> </refsect1> </refentry> diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 94a13c8dde..9c28e15fe1 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -18,7 +18,7 @@ Copyright 2013 - 2014 Red Hat, Inc. <refmeta> <refentrytitle>nmcli-examples</refentrytitle> - <manvolnum>5</manvolnum> + <manvolnum>7</manvolnum> <refmiscinfo class="source">NetworkManager</refmiscinfo> <refmiscinfo class="manual">Examples</refmiscinfo> <refmiscinfo class="version">&NM_VERSION;</refmiscinfo> diff --git a/man/nmcli.xml b/man/nmcli.xml index 324e045ece..6195466787 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -2045,7 +2045,7 @@ <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum> </citerefentry> for all NetworkManager settings and property names, and their descriptions; and - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry> + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry> for sample editor sessions.</para> </listitem> </varlistentry> @@ -2835,7 +2835,7 @@ <para>This section presents various examples of <command>nmcli</command> usage. If you want even more, please refer to - <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry> + <citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry> manual page.</para> <variablelist> @@ -3104,7 +3104,7 @@ </refsect1> <refsect1 id='see_also'><title>See Also</title> - <para><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <para><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, |