Unify online manpages

Signed-off-by: Tom Eastep <teastep@shorewall.net>

docs/Documentation_Index.xml

@@ -162,8 +162,7 @@
             <entry><ulink url="traffic_shaping.htm">Bandwidth
             Control</ulink></entry>
 
-            <entry>Manpages (<ulink url="Manpages.html">IPv4</ulink>) (<ulink
-            url="Manpages6.html">IPv6</ulink>)</entry>
+            <entry><ulink url="Manpages.html">Manpages</ulink></entry>
 
             <entry><ulink
             url="starting_and_stopping_shorewall.htm">Starting/stopping the

docs/Manpages.xml

@@ -18,7 +18,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2007-2015</year>
+      <year>2007-2017</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
@@ -83,6 +83,9 @@
         Describes how to specify set names in Shorewall configuration
         files.</member>
 
+        <member><ulink url="manpages/shorewall-logging.html">logging</ulink> -
+        Provides an overview of Shorewall packet logging facilities</member>
+
         <member><ulink url="manpages/shorewall-maclist.html">maclist</ulink> -
         Define MAC verification.</member>
 
@@ -115,7 +118,11 @@
         routing tables, usually for multiple Internet links.</member>
 
         <member><ulink url="manpages/shorewall-proxyarp.html">proxyarp</ulink>
-        - Define Proxy ARP.</member>
+        - Define Proxy ARP (IPv4)</member>
+
+        <member><ulink
+        url="manpages6/shorewall-proxyndp.html">proxyndp</ulink> - Define
+        Proxy NDP (IPv6)</member>
 
         <member><ulink url="manpages/shorewall-rtrules.html">rtrules</ulink> -
         Define routing rules.</member>
@@ -157,10 +164,18 @@
         url="manpages/shorewall.conf.html">shorewall.conf</ulink> - Specify
         values for global Shorewall options.</member>
 
+        <member><ulink
+        url="manpages6/shorewall6.conf.html">shorewall6.conf</ulink> - Specify
+        values for global Shorewall6 options.</member>
+
         <member><ulink
         url="manpages/shorewall-lite.conf.html">shorewall-lite.conf</ulink> -
         Specify values for global Shorewall Lite options.</member>
 
+        <member><ulink
+        url="manpages6/shorewall6-lite.conf.html">shorewall6-lite.conf</ulink>
+        - Specify values for global Shorewall6 Lite options.</member>
+
         <member><ulink url="manpages/shorewall-vardir.html">vardir</ulink> -
         Redefine the directory where Shorewall keeps its state
         information.</member>
@@ -182,16 +197,8 @@
     <blockquote>
       <simplelist>
         <member><ulink url="manpages/shorewall.html">shorewall</ulink> -
-        /sbin/shorewall command syntax and semantics.</member>
-
-        <member><ulink
-        url="manpages/shorewall-init.html">shorewall-init</ulink> - Companion
-        package that allows for automatic start/stop of other Shorewall
-        products based on network events.</member>
-
-        <member><ulink
-        url="manpages/shorewall-lite.html">shorewall-lite</ulink> -
-        /sbin/shorewall-lite command syntax and semantics.</member>
+        /sbin/shorewall, /sbin/shorewall6/, /sbin/shorewall-lite and
+        /sbin/shorewall6-line command syntax and semantics.</member>
       </simplelist>
     </blockquote>
   </section>