Minor doc and gendist changes

diff --git a/doc/bird.sgml b/doc/bird.sgml
index c44b49dbe3e3a2de7021d2e03ea306d5841d0b64..5cf09bfe64766e05a80d2190f819a5bd235692bb 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1,7 +1,7 @@
 <!doctype birddoc system>
 
 <!--
-       BIRD 2.0 documentation
+       BIRD 3.0 documentation
 
 This documentation can have 4 forms: sgml (this is master copy), html, ASCII
 text and dvi/postscript (generated from sgml using sgmltools). You should always
@@ -20,10 +20,9 @@ configuration - something in config which is not keyword.
 
 <book>
 
-<title>BIRD 2.0 User's Guide
+<title>BIRD 3.0 User's Guide
 <author>
 Ondrej Filip <it/&lt;feela@network.cz&gt;/,
-Pavel Machek <it/&lt;pavel@ucw.cz&gt;/,
 Martin Mares <it/&lt;mj@ucw.cz&gt;/,
 Maria Matejka <it/&lt;mq@jmq.cz&gt;/,
 Ondrej Zajicek <it/&lt;santiago@crfreenet.org&gt;/
@@ -5377,15 +5376,15 @@ name="atrey.karlin.mff.cuni.cz:/pub/rfc">).
 </book>
 
 <!--
-LocalWords:  GPL IPv GateD BGPv RIPv OSPFv Linux sgml html dvi sgmltools Pavel
+LocalWords:  GPL IPv GateD BGPv RIPv OSPFv Linux sgml html dvi sgmltools
 LocalWords:  linuxdoc dtd descrip config conf syslog stderr auth ospf bgp Mbps
 LocalWords:  router's eval expr num birdc ctl UNIX if's enums bool int ip GCC
 LocalWords:  len ipaddress pxlen netmask enum bgppath bgpmask clist gw md eth
-LocalWords:  RTS printn quitbird iBGP AS'es eBGP RFC multiprotocol IGP Machek
+LocalWords:  RTS printn quitbird iBGP AS'es eBGP RFC multiprotocol IGP
 LocalWords:  EGP misconfigurations keepalive pref aggr aggregator BIRD's RTC
 LocalWords:  OS'es AS's multicast nolisten misconfigured UID blackhole MRTD MTU
 LocalWords:  uninstalls ethernets IP binutils ANYCAST anycast dest RTD ICMP rfc
 LocalWords:  compat multicasts nonbroadcast pointopoint loopback sym stats
 LocalWords:  Perl SIGHUP dd mm yy HH MM SS EXT IA UNICAST multihop Discriminator txt
-LocalWords:  proto wildcard Ondrej Filip
+LocalWords:  proto wildcard
 -->

diff --git a/doc/prog-head.sgml b/doc/prog-head.sgml
index 0eec367e996f26bc5e6217217882b91d11da7d52..43ee4ef6610df41acdbbc8ab771aac10630ebc01 100644 (file)
--- a/doc/prog-head.sgml
+++ b/doc/prog-head.sgml
@@ -12,7 +12,7 @@
 <title>BIRD Programmer's Documentation
 <author>
 Ondrej Filip <it/&lt;feela@network.cz&gt;/,
-Pavel Machek <it/&lt;pavel@ucw.cz&gt;/,
+Maria Matejka <it/&lt;mq@jmq.cz&gt;/,
 Martin Mares <it/&lt;mj@ucw.cz&gt;/,
 Ondrej Zajicek <it/&lt;santiago@crfreenet.org&gt;/
 </author>

diff --git a/tools/gendist b/tools/gendist
index 2ac59030e244ca81834feb977bdaf490f7524a7b..2dc42ba90208b70fbdd3d0d31c4c9584bef44a77 100755 (executable)
--- a/tools/gendist
+++ b/tools/gendist
@@ -2,6 +2,7 @@
 #
 #  Generate BIRD Distribution Archive
 #  (c) 2000--2004 Martin Mares <mj@ucw.cz>
+#  (c) 2005--2022 Ondrej Filip <feela@network.cz>
 #
 
 VERSION=`grep 'BIRD_VERSION \"' sysdep/config.h | sed '/BIRD_VERSION/!d;s/^.*"\(.*\)"$/\1/'`
@@ -33,8 +34,6 @@ rm -rf `find $T/$REL -name CVS -o -name tmp` $T/$REL/{misc,rfc,doc/slides,doc/sl
 rm -rf $T/$REL $T/$DREL
 echo -n "OK? "
 read OK
-echo Uploading to Atrey...
-scp $T/$REL.tar.gz $T/$DREL.tar.gz atrey.karlin.mff.cuni.cz:~ftp/pub/bird/
 echo Uploading to Trubka...
 scp $T/$REL.tar.gz $T/$DREL.tar.gz bird.network.cz:~ftp/pub/bird/
 echo Done.

diff --git a/tools/linuxdoc b/tools/linuxdoc
index 51110e79cc91d7da5f8604c8960b83f3990e04b7..58f5cbc465856688ff46ec8c8491940c054b4f44 100755 (executable)
--- a/tools/linuxdoc
+++ b/tools/linuxdoc
@@ -25,8 +25,13 @@ use FindBin;
 $prefix             = "/usr";
 $isoentities_prefix = "/usr";
 $DataDir            = "$FindBin::Bin/../doc/sbase";
-$AuxBinDir          = "/usr/lib/linuxdoc-tools";
-
+if (-d "/usr/lib/linuxdoc-tools")
+{
+  $AuxBinDir          = "/usr/lib/linuxdoc-tools";
+} else
+{
+  $AuxBinDir          = "/usr/bin";
+}
 use lib "$FindBin::Bin/linuxdoc-tools";
 
 # ---------------------------------------------------------------------