Update documentation according to config -> settings change

diff --git a/Makefile.am b/Makefile.am
index bd39d6d590a859d70d31cddfdda0321e5185866f..2b544298149a508e8c065ebd9b12c90e6521aa07 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -311,14 +311,14 @@ dist_macros_DATA = \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
-       man/firewall-config.8 \
+       man/firewall-settings.8 \
        man/network.8 \
-       man/network-config.8 \
        man/network-device.8 \
        man/network-dns-server.8 \
        man/network-port-batman-adv.8 \
        man/network-port-batman-adv-port.8 \
        man/network-route.8 \
+       man/network-settings.8 \
        man/network-zone.8 \
        man/network-zone-6rd.8 \
        man/network-zone-6to4-tunnel.8 \

diff --git a/man/firewall-config.xml b/man/firewall-settings.xml
similarity index 92%
rename from man/firewall-config.xml
rename to man/firewall-settings.xml
index ae011e14114799546361f284c2a46eefe50b865b..6870d1fe3609b007e23bf7da6d64a200a274bc61 100644 (file)
--- a/man/firewall-config.xml
+++ b/man/firewall-settings.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS/DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="firewall-config">
+<refentry id="firewall-settings">
        <refentryinfo>
-               <title>firewall-config</title>
+               <title>firewall-settings</title>
                <productname>network</productname>
 
                <authorgroup>
@@ -18,22 +18,22 @@
        </refentryinfo>
 
        <refmeta>
-               <refentrytitle>firewall-config</refentrytitle>
+               <refentrytitle>firewall-settings</refentrytitle>
                <manvolnum>8</manvolnum>
        </refmeta>
 
        <refnamediv>
-               <refname>firewall-config</refname>
+               <refname>firewall-settings</refname>
                <refpurpose>Firewall Configuration Control Program</refpurpose>
        </refnamediv>
 
        <refsynopsisdiv>
                <cmdsynopsis>
-                       <command>firewall-config</command>
+                       <command>firewall-settings</command>
                </cmdsynopsis>
 
                <cmdsynopsis>
-                       <command>firewall-config <replaceable>KEY=VALUE</replaceable></command>
+                       <command>firewall-settings <replaceable>KEY=VALUE</replaceable></command>
                </cmdsynopsis>
        </refsynopsisdiv>
 
@@ -41,8 +41,8 @@
                <title>Description</title>
 
                <para>
-                       The <command>firewall-config</command> command may be used to set
-                       global firewall configuration options.
+                       The <command>firewall-settings</command> command may be used to set
+                       global firewall settingsuration options.
                </para>
                <para>
                        Please have a look at the individual man pages for more options.
@@ -54,7 +54,7 @@
 
                <para>
                        If no additional argument is given, running the command will
-                       dump a list of all configuration variables and their current values.
+                       dump a list of all settingsuration variables and their current values.
                </para>
 
                <para>

diff --git a/man/network-dns-server.xml b/man/network-dns-server.xml
index a8f8966d31d87301d9fd02f23b9833487891893f..03d13dbb765912bf833849f0de0c664658dca530 100644 (file)
--- a/man/network-dns-server.xml
+++ b/man/network-dns-server.xml
@@ -131,7 +131,7 @@
 
                <para>
                        These variables may be set by using the <citerefentry>
-                               <refentrytitle>network-config</refentrytitle>
+                               <refentrytitle>network-settings</refentrytitle>
                                <manvolnum>8</manvolnum>
                        </citerefentry> command.
                </para>
@@ -182,7 +182,7 @@
                                <manvolnum>8</manvolnum>
                        </citerefentry>,
                        <citerefentry>
-                               <refentrytitle>network-config</refentrytitle>
+                               <refentrytitle>network-settings</refentrytitle>
                                <manvolnum>8</manvolnum>
                        </citerefentry>
                </para>

diff --git a/man/network-config.xml b/man/network-settings.xml
similarity index 84%
rename from man/network-config.xml
rename to man/network-settings.xml
index 6a550a9b3fde53391beab14466ca2d24790236ae..df6781289952e20fa22dc5b7e984360e57dbaaca 100644 (file)
--- a/man/network-config.xml
+++ b/man/network-settings.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS/DTD DocBook XML V4.2//EN"
        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="network-config">
+<refentry id="network-settings">
        <refentryinfo>
-               <title>network-config</title>
+               <title>network-settings</title>
                <productname>network</productname>
 
                <authorgroup>
@@ -18,22 +18,22 @@
        </refentryinfo>
 
        <refmeta>
-               <refentrytitle>network-config</refentrytitle>
+               <refentrytitle>network-settings</refentrytitle>
                <manvolnum>8</manvolnum>
        </refmeta>
 
        <refnamediv>
-               <refname>network-config</refname>
+               <refname>network-settings</refname>
                <refpurpose>Network Configuration Control Program</refpurpose>
        </refnamediv>
 
        <refsynopsisdiv>
                <cmdsynopsis>
-                       <command>network config</command>
+                       <command>network settings</command>
                </cmdsynopsis>
 
                <cmdsynopsis>
-                       <command>network config <replaceable>KEY=VALUE</replaceable></command>
+                       <command>network settings <replaceable>KEY=VALUE</replaceable></command>
                </cmdsynopsis>
        </refsynopsisdiv>
 
@@ -41,8 +41,8 @@
                <title>Description</title>
 
                <para>
-                       The <command>network config</command> command may be used to set
-                       global configuration options.
+                       The <command>network settings</command> command may be used to set
+                       global settingsuration options.
                </para>
                <para>
                        Please have a look at the individual man pages for more options.
@@ -54,7 +54,7 @@
 
                <para>
                        If no additional argument is given, running the command will
-                       dump a list of all configuration variables and their current values.
+                       dump a list of all settingsuration variables and their current values.
                </para>
 
                <para>

diff --git a/man/network.xml b/man/network.xml
index bc72114ded3cfcbe38a02171382b963b524887af..b814028b6d9c8ff161260d67f3bf78a5d8aa0ae1 100644 (file)
--- a/man/network.xml
+++ b/man/network.xml
@@ -196,7 +196,7 @@
                                        <para>
                                                Shows and alters global configuration parameters.
                                                See <citerefentry>
-                                                       <refentrytitle>network-config</refentrytitle>
+                                                       <refentrytitle>network-settings</refentrytitle>
                                                        <manvolnum>8</manvolnum>
                                                </citerefentry> for details.
                                        </para>
@@ -299,7 +299,7 @@
 
                <para>
                        <citerefentry>
-                               <refentrytitle>network-config</refentrytitle>
+                               <refentrytitle>network-settings</refentrytitle>
                                <manvolnum>8</manvolnum>
                        </citerefentry>,
                        <citerefentry>