Manpage and Shorewall-5 changes for RESTART

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

Shorewall/manpages/shorewall.conf.xml

@@ -1146,25 +1146,6 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
-
-        <listitem>
-          <para>Added in Shorewall 5.0.0. In that release, the <emphasis
-          role="bold">reload</emphasis> command was redefined to do what
-          <emphasis role="bold">restart</emphasis> had done in earlier
-          releases and <emphasis role="bold">restart</emphasis> became a true
-          restart (equivalent to <emphasis role="bold">stop</emphasis>
-          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
-          command performs the same operation as the <emphasis
-          role="bold">reload</emphasis> command making it compatible with
-          earlier releases. If not specified, LAGACY_RESTART=No is
-          assumed.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
@@ -2169,6 +2150,27 @@ INLINE          -       -       -       ; -j REJECT
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">RESTART=</emphasis>[<emphasis
+        role="bold">restart</emphasis>|<emphasis
+        role="bold">reload</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was
+          added in Shorewall 5.0.0. In that release, the <emphasis
+          role="bold">reload</emphasis> command was redefined to do what
+          <emphasis role="bold">restart</emphasis> had done in earlier
+          releases and <emphasis role="bold">restart</emphasis> became a true
+          restart (equivalent to <emphasis role="bold">stop</emphasis>
+          followed by <emphasis role="bold">start</emphasis>). When
+          RESTART=reload, the <emphasis role="bold">restart</emphasis> command
+          performs the same operation as the <emphasis
+          role="bold">reload</emphasis> command making it compatible with
+          earlier releases. If not specified, RESTART=reload is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis
         role="bold">RESTORE_DEFAULT_ROUTE=</emphasis>[<emphasis

Shorewall6/manpages/shorewall6.conf.xml

@@ -1010,24 +1010,6 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
-
-        <listitem>
-          <para>Added in Shorewall 5.0.0. In that release, the <emphasis
-          role="bold">reload</emphasis> command was redefined to do what
-          <emphasis role="bold">restart</emphasis> had done in earlier
-          releases and <emphasis role="bold">restart</emphasis> became a true
-          restart (equivalent to <emphasis role="bold">stop</emphasis>
-          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
-          command performs the same operation as the reload command making it
-          compatible with earlier releases. If not specified,
-          LAGACY_RESTART=No is assumed.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
@@ -1924,6 +1906,27 @@ INLINE          -       -       -       ; -j REJECT
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">RESTART=</emphasis>[<emphasis
+        role="bold">restart</emphasis>|<emphasis
+        role="bold">reload</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was
+          added in Shorewall 5.0.0. In that release, the <emphasis
+          role="bold">reload</emphasis> command was redefined to do what
+          <emphasis role="bold">restart</emphasis> had done in earlier
+          releases and <emphasis role="bold">restart</emphasis> became a true
+          restart (equivalent to <emphasis role="bold">stop</emphasis>
+          followed by <emphasis role="bold">start</emphasis>). When
+          RESTART=reload, the <emphasis role="bold">restart</emphasis> command
+          performs the same operation as the <emphasis
+          role="bold">reload</emphasis> command making it compatible with
+          earlier releases. If not specified, RESTART=reload is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis role="bold">RESTORE_ROUTEMARKS=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>

docs/Shorewall-5.xml

@@ -338,9 +338,18 @@
 
       <para>For those that can't get used to the idea of using
       <command>reload</command> in place of <command>restart</command>, a
-      LEGACY_RESTART option has been added to shorewall[6].conf. The option
+      RESTART option has been added to shorewall[6].conf. The option defaults
-      defaults to No but if set to Yes, then the <command>restart</command>
+      to 'restart' but if set to 'reload', then the <command>restart</command>
       command does what it did in earlier releases.</para>
+
+      <note>
+        <para>Beginning with Shorewall 5.0.1 and Shorewall 4.6.13.2, the
+        update command will set RESTART=reload to maintain compatibility with
+        earlier releases. Shorewall 5.0.0 created the setting
+        LEGACY_RESTART=No which was equivalent to RESTART=restart. Under
+        Shorewall 5.0.1 and later, update will convert LEGACY_RESTART to the
+        equivalent RESTART setting.</para>
+      </note>
     </section>
   </section>