Doc: Readme update, website is bird.nic.cz

Updating links to the old website to point to the new website, where
relevant.

Also updated other links in README and some clearly outdated texts.

diff --git a/README b/README
index 8960e1257d59c189590c1bdfe2f28d9c59f4c339..75a4281f1c58f60012011b3fb59f904546f35912 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                        BIRD Internet Routing Daemon
 
-                     Home page  http://bird.network.cz/
+                     Home page  http://bird.nic.cz/
                   Mailing list  bird-users@network.cz
 
                 (c) 1998--2008  Martin Mares <mj@ucw.cz>
@@ -10,11 +10,10 @@
 
 ================================================================================
 
-The BIRD project aims to develop a dynamic IP routing daemon with full support
-of all modern routing protocols, easy to use configuration interface and
-powerful route filtering language, primarily targeted on (but not limited to)
-Linux and other UNIX-like systems and distributed under the GNU General
-Public License.
+BIRD is a dynamic IP routing daemon with full support of most modern routing
+protocols, easy to use configuration interface and powerful route filtering
+language, primarily targeted on (but not limited to) Linux and other UNIX-like
+systems and distributed under the GNU General Public License.
 
 What do we support
 ==================
@@ -43,24 +42,26 @@ How to install BIRD
 ===================
 
        o  From standard distribution package of your OS (recommended)
-       o  From official binary packages for Debian and Red Hat Linux
-          ftp://bird.network.cz/pub/bird/debian/
-          ftp://bird.network.cz/pub/bird/redhat/
+       o  From official binary repositories for Debian and Ubuntu
+          https://pkg.labs.nic.cz/doc/?project=bird
        o  From source code of the latest stable release version
-          ftp://bird.network.cz/pub/bird/
+          https://bird.nic.cz/get-bird/
        o  From current development code in Git repository
-          https://gitlab.labs.nic.cz/labs/bird/
+          https://gitlab.nic.cz/labs/bird/
 
 See the file INSTALL for information about installation from source code.
 
 Documentation
 =============
 
-Online documentation is available at http://bird.network.cz/?get_doc or as HTML
-files in the doc directory, you can install it by `make install-docs' and
-rebuild it by `make docs', but you'll need SGMLtools and LaTeX to be installed
-on your machine. You can also download a neatly formatted PDF version as
-a separate archive (bird-doc-*.tar.gz) from ftp://bird.network.cz/pub/bird/
+Online documentation is available at https://bird.nic.cz/doc/latest/.
+
+You can also build separate HTML files and PDF from the doc directory by
+`make docs' and install it by `make install-docs', but you'll need SGMLtools
+and LaTeX to be installed on your machine.
+
+You can also download a neatly formatted PDF version (packed in TGZ)
+from the online documentation page at https://bird.nic.cz/doc/latest/
 
 User support
 ============

diff --git a/distro/config/apkg.toml b/distro/config/apkg.toml
index 8766f3641cde8cc72eecbe42a81d2f629327d55b..cec7756cedeffcaf9448fe237a63787a60b5022b 100644 (file)
--- a/distro/config/apkg.toml
+++ b/distro/config/apkg.toml
@@ -5,7 +5,7 @@ make_archive_script = "tools/make-archive"
 
 [upstream]
 # needed for get-archive
-archive_url = "https://bird.network.cz/download/bird-{{ version }}.tar.gz"
+archive_url = "https://bird.nic.cz/download/bird-{{ version }}.tar.gz"
 
 [apkg]
 # apkg compat level

diff --git a/distro/pkg/deb/bird.xml b/distro/pkg/deb/bird.xml
index 2cc69575272517caeebd05f69860df4f8c35133e..799fb1e06bf1237781283370baadad691626ed46 100644 (file)
--- a/distro/pkg/deb/bird.xml
+++ b/distro/pkg/deb/bird.xml
@@ -306,6 +306,6 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
   <refsect1 id="see_also">
     <title>SEE ALSO</title>
     <para>More documentation can be found on the website:
-      https://bird.network.cz/.</para>
+      https://bird.nic.cz/.</para>
   </refsect1>
 </refentry>

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 80f9de63616ad2e51936729cdf7200ed374b0cca..ff62248b9a9330efd274b4353a0fff5feb071ec6 100644 (file)
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -23,7 +23,7 @@ Uploaders:
 Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/debian/bird2
 Vcs-Git: https://salsa.debian.org/debian/bird2.git
-Homepage: https://bird.network.cz/
+Homepage: https://bird.nic.cz/
 Rules-Requires-Root: no
 
 Package: bird2

diff --git a/distro/pkg/deb/copyright b/distro/pkg/deb/copyright
index 7d3c391cb68e16f4bee87bf84cd5b666785591ae..b66cbcf238b988a22db23b39f15d8ab9731806e8 100644 (file)
--- a/distro/pkg/deb/copyright
+++ b/distro/pkg/deb/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bird
 Upstream-Contact: bird-users@network.cz
-Source: https://bird.network.cz
+Source: https://bird.nic.cz
 
 Files: *
 Copyright: 1998-2008 Martin Mareš

diff --git a/distro/pkg/deb/watch b/distro/pkg/deb/watch
index cec2d6646e49e30b399a5d2368a082733db061de..f421a75685c2084fbc09b56329d6691968886476 100644 (file)
--- a/distro/pkg/deb/watch
+++ b/distro/pkg/deb/watch
@@ -1,2 +1,2 @@
 version=4
-https://bird.network.cz/download/bird-(2\.[\d.]+).tar.gz
+https://bird.nic.cz/download/bird-(2\.[\d.]+).tar.gz

diff --git a/distro/pkg/rpm/bird.spec b/distro/pkg/rpm/bird.spec
index 79bf4510837dc6ad30ee5555e78958c2d9f04c0a..c28ac79d6c19dcb0894d513b00c93eb015602f76 100644 (file)
--- a/distro/pkg/rpm/bird.spec
+++ b/distro/pkg/rpm/bird.spec
@@ -12,8 +12,8 @@ Summary:          BIRD Internet Routing Daemon
 
 Group:            System Environment/Daemons
 License:          GPL-2.0-or-later
-URL:              https://bird.network.cz/
-Source0:          https://bird.network.cz/download/bird-%{version}.tar.gz
+URL:              https://bird.nic.cz/
+Source0:          https://bird.nic.cz/download/bird-%{version}.tar.gz
 Source1:          bird.service
 Source2:          bird.tmpfilesd
 Source3:          bird.sysusersd

diff --git a/doc/bird.conf.example b/doc/bird.conf.example
index 384270e352d1ca4bb8d510eaefbf6095f6a4d63d..73d16e1138fa65a94bdf5b3f7285fe8515f6839e 100644 (file)
--- a/doc/bird.conf.example
+++ b/doc/bird.conf.example
@@ -3,7 +3,7 @@
 # anything else to happen.
 #
 # Please refer to the BIRD User's Guide documentation, which is also available
-# online at http://bird.network.cz/ in HTML format, for more information on
+# online at http://bird.nic.cz/ in HTML format, for more information on
 # configuring BIRD and adding routing protocols.
 
 # Configure logging

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 8d4c8c00fc9a6f8301480eecea1f021a91ab3a40..6ee6426cfbde617cbad71ebd22253526150856dc 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -6784,23 +6784,21 @@ versions of BIRD:
 (<HTMLURL URL="mailto:bird-users@network.cz" name="bird-users@network.cz">)
 where you can share your experiences with the other users and consult
 your problems with the authors. To subscribe to the list, visit
-<HTMLURL URL="http://bird.network.cz/?m_list" name="http://bird.network.cz/?m_list">.
-The home page of BIRD can be found at <HTMLURL URL="http://bird.network.cz/" name="http://bird.network.cz/">.
+<HTMLURL URL="https://bird.network.cz/mailman/listinfo/bird-users" name="https://bird.network.cz/mailman/listinfo/bird-users">.
+The home page of BIRD can be found at <HTMLURL URL="http://bird.nic.cz/" name="http://bird.nic.cz/">.
 
 <p>BIRD is a relatively young system and it probably contains some bugs. You can
 report any problems to the bird-users list and the authors will be glad to solve
 them, but before you do so, please make sure you have read the available
 documentation and that you are running the latest version (available at
-<HTMLURL URL="ftp://bird.network.cz/pub/bird" name="bird.network.cz:/pub/bird">).
+<HTMLURL URL="https://bird.nic.cz/get-bird" name="https://bird.nic.cz/get-bird">).
 (Of course, a patch which fixes the bug is always welcome as an attachment.)
 
 <p>If you want to understand what is going inside, Internet standards are a good
 and interesting reading. You can get them from
-<HTMLURL URL="ftp://ftp.rfc-editor.org/" name="ftp.rfc-editor.org"> (or a
-nicely sorted version from <HTMLURL URL="ftp://atrey.karlin.mff.cuni.cz/pub/rfc"
-name="atrey.karlin.mff.cuni.cz:/pub/rfc">).
+<HTMLURL URL="ftp://ftp.rfc-editor.org/" name="ftp.rfc-editor.org">.
 
-<p><it/Good luck!/
+<p><it/Good luck and happy routing!/
 
 </book>
 

diff --git a/misc/bird.spec b/misc/bird.spec
index 871a8d872ec3dd7d9cf79318efad6f3c3551721c..a0a1aaa52998f77bf60584247e7a52d8805a4219 100644 (file)
--- a/misc/bird.spec
+++ b/misc/bird.spec
@@ -4,11 +4,11 @@ Version: 2.17.1
 Release: 1
 Copyright: GPL
 Group: Networking/Daemons
-Source: ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz
+Source: ftp://bird.nic.cz/pub/bird/bird-%{version}.tar.gz
 Source1: bird.init
 Source2: birdc6
 Buildroot: /var/tmp/bird-root
-Url: http://bird.network.cz
+Url: http://bird.nic.cz
 Prereq: /sbin/chkconfig
 BuildRequires: flex bison readline-devel ncurses-devel