diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml index 9a5e1b0b9..9140d0a3a 100644 --- a/docs/configuration_file_basics.xml +++ b/docs/configuration_file_basics.xml @@ -611,13 +611,17 @@ SHELL cat /etc/shorewall/rules.d/*.rules to distinguish them from variables used internally within the Shorewall programs - The following variable names must be avoided: + The following variable names must be avoided. Those in bold font must be avoided in all Shorewall + versions; those in regular font must be avoided in versions prior to + 4.4.8. - Any option from shorewall.conf (5) + Any option from shorewall.conf + (5) - CONFDIR + CONFDIR DEBUG @@ -627,37 +631,36 @@ SHELL cat /etc/shorewall/rules.d/*.rules IPT_OPTIONS - NOROUTES + NOROUTES PREVIEW - PRODUCT + PRODUCT PROFILE PURGE - RECOVERING + RECOVERING - RESTOREPATH + RESTOREPATH - SHAREDIR + SHAREDIR - Any name beginning with SHOREWALL_ + Any name beginning with + SHOREWALL_ TEST - TIMESTAMP + TIMESTAMP USE_VERBOSITY - VARDIR + VARDIR - VERBOSE + VERBOSE VERBOSE_OFFSET - - VERSION Example: diff --git a/manpages/shorewall-params.xml b/manpages/shorewall-params.xml index 054476072..c7bd83eec 100644 --- a/manpages/shorewall-params.xml +++ b/manpages/shorewall-params.xml @@ -29,13 +29,16 @@ to distinguish them from variables used internally within the Shorewall programs - The following variable names must be avoided: + The following variable names must be avoided. Those in bold font must be avoided in all Shorewall + versions; those in regular font must be avoided in versions prior to + 4.4.8. - Any option from shorewall.conf (5) + Any option from shorewall.conf (5) - CONFDIR + CONFDIR DEBUG @@ -45,37 +48,36 @@ IPT_OPTIONS - NOROUTES + NOROUTES PREVIEW - PRODUCT + PRODUCT PROFILE - PURGE + PURGE - RECOVERING + RECOVERING - RESTOREPATH + RESTOREPATH - SHAREDIR + SHAREDIR - Any name beginning with SHOREWALL_ + Any name beginning with + SHOREWALL_ TEST - TIMESTAMP + TIMESTAMP USE_VERBOSITY - VARDIR + VARDIR - VERBOSE + VERBOSE VERBOSE_OFFSET - - VERSION Example params file: diff --git a/manpages6/shorewall6-params.xml b/manpages6/shorewall6-params.xml index 7bbea9207..8ad8a3d8c 100644 --- a/manpages6/shorewall6-params.xml +++ b/manpages6/shorewall6-params.xml @@ -29,13 +29,17 @@ to distinguish them from variables used internally within the Shorewall programs - The following variable names must be avoided: + The following variable names must be avoided. Those in bold font must be avoided in all Shorewall + versions; those in regular font must be avoided in versions prior to + 4.4.8. - Any option from shorewall6.conf (5) + Any option from shorewall6.conf + (5) - CONFDIR + CONFDIR DEBUG @@ -45,37 +49,36 @@ IPT_OPTIONS - NOROUTES + NOROUTES PREVIEW - PRODUCT + PRODUCT PROFILE - PURGE + PURGE - RECOVERING + RECOVERING - RESTOREPATH + RESTOREPATH - SHAREDIR + SHAREDIR - Any name beginning with SHOREWALL_ + Any name beginning with + SHOREWALL_ TEST - TIMESTAMP + TIMESTAMP USE_VERBOSITY - VARDIR + VARDIR - VERBOSE + VERBOSE VERBOSE_OFFSET - - VERSION Example params file: