proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 22:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: stop using version.texi, fix URLs

Browse Source 
Ditch version.texi, put PACKAGE_VERSION in defines.texi instead.
Also add a PACKAGE_URL variable and fix some leftover outdated URLs.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-08-04 14:44:07 +02:00
parent 70d27c5b7d
commit 349829894f
6 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -9,6 +9,7 @@ AC_PREREQ(2.60)
AC_INIT(frr, 3.1-dev, [https://github.com/frrouting/frr/issues])
PACKAGE_URL="https://frrouting.org/"
AC_SUBST(PACKAGE_URL)
PACKAGE_FULLNAME="FRRouting"
AC_SUBST(PACKAGE_FULLNAME)

6
doc/Makefile.am
View File

@ -55,9 +55,9 @@ frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS) defines.texi
$(TEXI2PDF) -o "$@" $< || true
# don't ask me why the info file is in srcdir
$(srcdir)/frr.info: defines.texi
frr.dvi: defines.texi
frr.html: defines.texi
$(srcdir)/frr.info: $(frr_TEXINFOS) defines.texi
frr.dvi: $(frr_TEXINFOS) defines.texi
frr.html: $(frr_TEXINFOS) defines.texi
frr_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \
vnc.texi \

2
doc/basic.texi
View File

@ -450,7 +450,7 @@ Trying 127.0.0.1...
Connected to localhost.
Escape character is '^]'.
Hello, this is @value{PACKAGE_NAME} (version @value{VERSION})
Hello, this is @value{PACKAGE_NAME} (version @value{PACKAGE_VERSION})
@value{COPYRIGHT_STR}
User Access Verification

2
doc/defines.texi.in
View File

@ -5,6 +5,8 @@
@set PACKAGE_NAME @PACKAGE_NAME@
@set PACKAGE_TARNAME @PACKAGE_TARNAME@
@set PACKAGE_STRING @PACKAGE_STRING@
@set PACKAGE_URL @PACKAGE_URL@
@set PACKAGE_VERSION @PACKAGE_VERSION@
@set AUTHORS Kunihiro Ishiguro, et al.
@set COPYRIGHT_YEAR 1999-2005
@set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS}

23
doc/frr.texi
View File

@ -7,13 +7,9 @@
@setfilename frr.info
@c Set variables - sourced from defines.texi
@include defines.texi
@settitle @uref{http://www.frrouting.org,,@value{PACKAGE_NAME}}
@settitle @uref{@value{PACKAGE_URL},,@value{PACKAGE_NAME}}
@c %**end of header
@c automake will automatically generate version.texi
@c and set EDITION, VERSION, UPDATED and UPDATED-MONTH
@include version.texi
@copying
@value{COPYRIGHT_STR}
@quotation
@ -44,21 +40,18 @@ approved by Kunihiro Ishiguro.
@c @smallbook
@ifinfo
This file documents the Frr Software Routing Suite which manages common
TCP/IP routing protocols.
This file documents the @uref{@value{PACKAGE_URL},,Frr Software Routing Suite}
which manages common TCP/IP routing protocols.
This is Edition @value{EDITION}, last updated @value{UPDATED} of
@cite{The Frr Manual}, for @uref{http://www.frrouting.org/,,@value{PACKAGE_NAME}}
Version @value{VERSION}.
This document was generated for version @value{PACKAGE_VERSION}.
@insertcopying
@end ifinfo
@titlepage
@title @uref{http://www.frrouting.org,,Frr}
@title @uref{@value{PACKAGE_URL},,Frr}
@subtitle A routing software package for TCP/IP networks
@subtitle @uref{http://www.frrouting.org,,@value{PACKAGE_NAME}} @value{VERSION}
@subtitle @value{UPDATED-MONTH}
@subtitle @uref{@value{PACKAGE_URL},,@value{PACKAGE_NAME}} @value{PACKAGE_VERSION}
@author @value{AUTHORS}
@page
@ -72,9 +65,9 @@ Version @value{VERSION}.
@node Top
@top Frr -- With Virtual Network Control
@uref{http://www.frrouting.org,,Frr} is an advanced routing software package
@uref{@value{PACKAGE_URL},,Frr} is an advanced routing software package
that provides a suite of TCP/IP based routing protocols. This is the Manual
for @value{PACKAGE_STRING}. @uref{http://www.frrouting.org,,Frr} is a fork of
for @value{PACKAGE_STRING}. @uref{@value{PACKAGE_URL},,Frr} is a fork of
@uref{http://www.quagga.net,,Quagga}.
@insertcopying

12
doc/overview.texi
View File

@ -2,7 +2,7 @@
@chapter Overview
@cindex Overview
@uref{http://www.frrouting.org,,Frr} is a routing software package that
@uref{@value{PACKAGE_URL},,Frr} is a routing software package that
provides TCP/IP based routing services with routing protocols support such
as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, IS-IS, BGP-4, and BGP-4+ (@pxref{Supported
RFCs}). Frr also supports special BGP Route Reflector and Route Server
@ -275,12 +275,12 @@ November 1995.}
The official Frr web-site is located at:
@uref{http://www.frrouting.org/}
@uref{@value{PACKAGE_URL}}
and contains further information, as well as links to additional
resources.
@uref{http://www.frrouting.org/,Frr} is a fork of Quagga, whose
@uref{@value{PACKAGE_URL},Frr} is a fork of Quagga, whose
web-site is located at:
@uref{http://www.quagga.net/}.
@ -296,12 +296,12 @@ web-site is located at:
There is a mailing list for discussions about Frr. If you have any
comments or suggestions to Frr, please subscribe to:
@uref{http://lists.nox.tf/listinfo/frr-users}.
@uref{https://lists.frrouting.org/listinfo/frog}.
The @uref{http://www.frrouting.org/,,Frr} site has further information on
The @uref{@value{PACKAGE_URL},,Frr} site has further information on
the available mailing lists, see:
@uref{http://lists.nox.tf/lists.php}
@uref{https://lists.frrouting.org/}
@node Bug Reports
@section Bug Reports