diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/LinuxDocTools.pm | 1 | ||||
-rw-r--r-- | doc/bird.sgml | 10 | ||||
-rwxr-xr-x | doc/sgml2html | 3 | ||||
-rwxr-xr-x | doc/sgml2latex | 3 | ||||
-rwxr-xr-x | doc/sgml2txt | 3 |
5 files changed, 13 insertions, 7 deletions
diff --git a/doc/LinuxDocTools.pm b/doc/LinuxDocTools.pm index 39bb401d..d73fc759 100644 --- a/doc/LinuxDocTools.pm +++ b/doc/LinuxDocTools.pm @@ -242,6 +242,7 @@ sub process_options # removes iso-entites sub directory after doing make install.) # $ENV{SGML_CATALOG_FILES} .= (defined $ENV{SGML_CATALOG_FILES} ? ":" : "") . + "$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog:"; "$main::prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog"; $ENV{SGML_CATALOG_FILES} .= ":$main::DataDir/linuxdoc-tools.catalog"; $ENV{SGML_CATALOG_FILES} .= ":$main::/etc/sgml.catalog"; diff --git a/doc/bird.sgml b/doc/bird.sgml index da87d901..60c38fa4 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -149,10 +149,10 @@ BIRD executable by configuring out routing protocols you don't use, and use given configuration file instead of <it/prefix/<file>/etc/bird.conf</file>. <tag><label id="argv-debug">-d</tag> - enable debug messages and run bird in foreground. + enable debug messages to stderr, and run bird in foreground. - <tag><label id="argv-log-file">-D <m/filename of debug log/</tag> - log debugging information to given file instead of stderr. + <tag><label id="argv-debug-file">-D <m/filename of debug log/</tag> + enable debug messages to given file. <tag><label id="argv-foreground">-f</tag> run bird in foreground. @@ -483,7 +483,9 @@ include "tablename.conf";; <cf/auth/ about authentication failures, <cf/bug/ for internal BIRD bugs. You may specify more than one <cf/log/ line to establish logging to - multiple destinations. Default: log everything to the system log. + multiple destinations. Default: log everything to the system log, or + to the debug output if debugging is enabled by <cf/-d//<cf/-D/ + command-line option. <tag><label id="opt-debug-protocols">debug protocols all|off|{ states|routes|filters|interfaces|events|packets [, <m/.../] }</tag> Set global defaults of protocol debugging options. See <cf/debug/ in the diff --git a/doc/sgml2html b/doc/sgml2html index a5bbee9e..6072a7a3 100755 --- a/doc/sgml2html +++ b/doc/sgml2html @@ -34,7 +34,8 @@ $progs = { "GROFFMACRO" => "-ms", "AWK" => "/usr/share/linuxdoc-tools/awkwhich" }; -$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog"; +$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" . + (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : ""); require "$FindBin::Bin/LinuxDocTools.pm"; &LinuxDocTools::init; diff --git a/doc/sgml2latex b/doc/sgml2latex index 02b60d94..c48f787d 100755 --- a/doc/sgml2latex +++ b/doc/sgml2latex @@ -34,7 +34,8 @@ $progs = { "GROFFMACRO" => "-ms", "AWK" => "/usr/share/linuxdoc-tools/awkwhich" }; -$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog"; +$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" . + (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : ""); require "$FindBin::Bin/LinuxDocTools.pm"; &LinuxDocTools::init; diff --git a/doc/sgml2txt b/doc/sgml2txt index dfc017de..af0bcb49 100755 --- a/doc/sgml2txt +++ b/doc/sgml2txt @@ -34,7 +34,8 @@ $progs = { "GROFFMACRO" => "-ms", "AWK" => "/usr/share/linuxdoc-tools/awkwhich" }; -$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog"; +$ENV{"SGML_CATALOG_FILES"} = "$DataDir/dtd/catalog" . + (defined $ENV{SGML_CATALOG_FILES} ? ":$ENV{SGML_CATALOG_FILES}" : ""); require "$FindBin::Bin/LinuxDocTools.pm"; &LinuxDocTools::init; |