From 1510e111c499ab1b33248659b55d88b0b2d28848 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 13 Aug 2010 20:27:14 -0700 Subject: [PATCH] Fix typo in conf basics doc --- Shorewall/Perl/Shorewall/Compiler.pm | 2 +- Shorewall/Perl/Shorewall/Config.pm | 4 ++-- docs/configuration_file_basics.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index ed095fc18..d7282b1ae 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -43,7 +43,7 @@ use Shorewall::Raw; our @ISA = qw(Exporter); our @EXPORT = qw( compiler ); our @EXPORT_OK = qw( $export ); -our $VERSION = '4.4_10'; +our $VERSION = '4.4_12'; our $export; diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index ea26c99e5..82024b367 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -338,8 +338,8 @@ sub initialize( $ ) { # %globals = ( SHAREDIR => '/usr/share/shorewall' , SHAREDIRPL => '/usr/share/shorewall/' , - CONFDIR => '/etc/shorewall', - CONFIGDIR => '', + CONFDIR => '/etc/shorewall', # Run-time configuration directory + CONFIGDIR => '', # Compile-time configuration directory (location of $product.conf) LOGPARMS => '', TC_SCRIPT => '', EXPORT => 0, diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml index c50ba6a4a..3919f6359 100644 --- a/docs/configuration_file_basics.xml +++ b/docs/configuration_file_basics.xml @@ -1341,7 +1341,7 @@ DNAT net loc:192.168.1.3 tcp 4000:4100 Beginning with Shorewall 4.4.4, you can use logical interface names which are mapped to the actual interface using the option in shorewall-interfraces + url="manpages/shorewall-interfaces.html">shorewall-interfaces (5). Here is an example: