Merge branch 'master' into devel/sphinx
diff --git a/gcc/doc/bugreport.texi b/gcc/doc/bugreport.texi
index 9f61bf7..3caf0ad 100644
--- a/gcc/doc/bugreport.texi
+++ b/gcc/doc/bugreport.texi
@@ -85,4 +85,4 @@
@section How and Where to Report Bugs
@cindex compiler bugs, reporting
-Bugs should be reported to the bug database at @value{BUGURL}.
+Bugs should be reported to the bug database at $$BUGURL$$.
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index 2c109bb..fd12af9 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -93,82 +93,6 @@
* Option Index::
* Concept Index::
-@detailmenu
- --- The Detailed Node Listing ---
-
-Overview
-
-* Character sets::
-* Initial processing::
-* Tokenization::
-* The preprocessing language::
-
-Header Files
-
-* Include Syntax::
-* Include Operation::
-* Search Path::
-* Once-Only Headers::
-* Alternatives to Wrapper #ifndef::
-* Computed Includes::
-* Wrapper Headers::
-* System Headers::
-
-Macros
-
-* Object-like Macros::
-* Function-like Macros::
-* Macro Arguments::
-* Stringizing::
-* Concatenation::
-* Variadic Macros::
-* Predefined Macros::
-* Undefining and Redefining Macros::
-* Directives Within Macro Arguments::
-* Macro Pitfalls::
-
-Predefined Macros
-
-* Standard Predefined Macros::
-* Common Predefined Macros::
-* System-specific Predefined Macros::
-* C++ Named Operators::
-
-Macro Pitfalls
-
-* Misnesting::
-* Operator Precedence Problems::
-* Swallowing the Semicolon::
-* Duplication of Side Effects::
-* Self-Referential Macros::
-* Argument Prescan::
-* Newlines in Arguments::
-
-Conditionals
-
-* Conditional Uses::
-* Conditional Syntax::
-* Deleted Code::
-
-Conditional Syntax
-
-* Ifdef::
-* If::
-* Defined::
-* Else::
-* Elif::
-
-Implementation Details
-
-* Implementation-defined behavior::
-* Implementation limits::
-* Obsolete Features::
-
-Obsolete Features
-
-* Obsolete Features::
-
-@end detailmenu
@end menu
@insertcopying
diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi
index 70bde4a..f0d40fb 100644
--- a/gcc/doc/gcc.texi
+++ b/gcc/doc/gcc.texi
@@ -122,10 +122,8 @@
This manual documents how to use the GNU compilers,
as well as their features and incompatibilities, and how to report
bugs. It corresponds to the compilers
-@ifset VERSION_PACKAGE
-@value{VERSION_PACKAGE}
-@end ifset
-version @value{version-GCC}.
+$$VERSION_PACKAGE$$
+version $$version-GCC$$.
The internals of the GNU compilers, including how to port them to new
targets and some information about how to write front ends for new
languages, are documented in a separate manual. @xref{Top,,
diff --git a/gcc/doc/gccint.texi b/gcc/doc/gccint.texi
index 67137a9..a81cbc7 100644
--- a/gcc/doc/gccint.texi
+++ b/gcc/doc/gccint.texi
@@ -77,10 +77,8 @@
This manual documents the internals of the GNU compilers, including
how to port them to new targets and some information about how to
write front ends for new languages. It corresponds to the compilers
-@ifset VERSION_PACKAGE
-@value{VERSION_PACKAGE}
-@end ifset
-version @value{version-GCC}. The use of the GNU compilers is documented in a
+$$VERSION_PACKAGE$$
+version $$version-GCC$$. The use of the GNU compilers is documented in a
separate manual. @xref{Top,, Introduction, gcc, Using the GNU
Compiler Collection (GCC)}.
diff --git a/gcc/doc/include/fdl.texi b/gcc/doc/include/fdl.texi
index 4e3457f..ce8c61b 100644
--- a/gcc/doc/include/fdl.texi
+++ b/gcc/doc/include/fdl.texi
@@ -19,7 +19,7 @@
@ifset gfdlhtml
@ifnothtml
@comment node-name, next, previous, up
-@node GNU Free Documentation License, Concept Index, Old, Top
+@node GNU Free Documentation License
@end ifnothtml
@html
<h1 align="center">Installing GCC: GNU Free Documentation License</h1>
diff --git a/gcc/doc/include/gcc-common.texi b/gcc/doc/include/gcc-common.texi
index 6448df3..d228b22 100644
--- a/gcc/doc/include/gcc-common.texi
+++ b/gcc/doc/include/gcc-common.texi
@@ -58,14 +58,14 @@
@c been placed, and before any authors are placed.
@macro versionsubtitle
@ifclear DEVELOPMENT
-@subtitle For @sc{gcc} version @value{version-GCC}
+@subtitle For @sc{gcc} version $$version-GCC$$ $$development-GCC$$
@end ifclear
@ifset DEVELOPMENT
-@subtitle For @sc{gcc} version @value{version-GCC} (pre-release)
+@subtitle For @sc{gcc} version $$version-GCC$$ $$development-GCC$$
@end ifset
@ifset VERSION_PACKAGE
@sp 1
-@subtitle @value{VERSION_PACKAGE}
+@subtitle $$VERSION_PACKAGE$$
@end ifset
@c Even if there are no authors, the second titlepage line should be
@c forced to the bottom of the page.
diff --git a/gcc/doc/install-old.texi b/gcc/doc/install-old.texi
index b425971..419e38d 100644
--- a/gcc/doc/install-old.texi
+++ b/gcc/doc/install-old.texi
@@ -4,7 +4,7 @@
@ifnothtml
@comment node-name, next, previous, up
-@node Old, GNU Free Documentation License, Specific, Top
+@node Old
@end ifnothtml
@html
<h1 align="center">Old installation documentation</h1>
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 2619518..e0a07c3 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -109,7 +109,7 @@
@c Part 4 Top node, Master Menu, and/or Table of Contents
@ifinfo
-@node Top, , , (dir)
+@node Top
@comment node-name, next, Previous, up
@menu
@@ -135,7 +135,7 @@
@c ***Installing GCC**********************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Installing GCC, Binaries, , Top
+@node Installing GCC
@end ifnothtml
@ifset indexhtml
@ifnothtml
@@ -224,7 +224,7 @@
@c ***Prerequisites**************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Prerequisites, Downloading the source, , Installing GCC
+@node Prerequisites
@end ifnothtml
@ifset prerequisiteshtml
@ifnothtml
@@ -543,7 +543,7 @@
@c ***Downloading the source**************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Downloading the source, Configuration, Prerequisites, Installing GCC
+@node Downloading the source
@end ifnothtml
@ifset downloadhtml
@ifnothtml
@@ -595,14 +595,14 @@
@c ***Configuration***********************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Configuration, Building, Downloading the source, Installing GCC
+@node Configuration
@end ifnothtml
@ifset configurehtml
@ifnothtml
-@chapter Installing GCC: Configuration
+@chapter Configuration
@end ifnothtml
@cindex Configuration
-@cindex Installing GCC: Configuration
+@cindex Configuration
Like most GNU software, GCC must be configured before it can be built.
This document describes the recommended configuration procedure
@@ -2580,13 +2580,13 @@
@c ***Building****************************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Building, Testing, Configuration, Installing GCC
+@node Building
@end ifnothtml
@ifset buildhtml
@ifnothtml
@chapter Building
@end ifnothtml
-@cindex Installing GCC: Building
+@cindex Building
Now that GCC is configured, you are ready to build the compiler and
runtime libraries.
@@ -2967,14 +2967,14 @@
@c ***Testing*****************************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Testing, Final install, Building, Installing GCC
+@node Testing
@end ifnothtml
@ifset testhtml
@ifnothtml
-@chapter Installing GCC: Testing
+@chapter Testing
@end ifnothtml
@cindex Testing
-@cindex Installing GCC: Testing
+@cindex Testing
@cindex Testsuite
Before you install GCC, we encourage you to run the testsuites and to
@@ -3199,11 +3199,11 @@
@c ***Final install***********************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Final install, , Testing, Installing GCC
+@node Final install
@end ifnothtml
@ifset finalinstallhtml
@ifnothtml
-@chapter Installing GCC: Final installation
+@chapter Final installation
@end ifnothtml
Now that GCC has been built (and optionally tested), you can install it with
@@ -3358,14 +3358,14 @@
@c ***Binaries****************************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Binaries, Specific, Installing GCC, Top
+@node Binaries
@end ifnothtml
@ifset binarieshtml
@ifnothtml
-@chapter Installing GCC: Binaries
+@chapter Binaries
@end ifnothtml
@cindex Binaries
-@cindex Installing GCC: Binaries
+@cindex Binaries
We are often asked about pre-compiled versions of GCC@. While we cannot
provide these for all platforms, below you'll find links to binaries for
@@ -3446,7 +3446,7 @@
@c ***Specific****************************************************************
@ifnothtml
@comment node-name, next, previous, up
-@node Specific, Old, Binaries, Top
+@node Specific
@end ifnothtml
@ifset specifichtml
@ifnothtml
@@ -5168,7 +5168,7 @@
@c Part 6 The End of the Document
@ifinfo
@comment node-name, next, previous, up
-@node Concept Index, , GNU Free Documentation License, Top
+@node Concept Index
@end ifinfo
@ifinfo
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 9cb8421..dc0bde8 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -51,7 +51,7 @@
@c man end
@c man begin BUGS
For instructions on reporting bugs, see
-@w{@value{BUGURL}}.
+$$BUGURL$$.
@c man end
@c man begin AUTHOR
See the Info entry for @command{gcc}, or
diff --git a/gcc/fortran/gfc-internals.texi b/gcc/fortran/gfc-internals.texi
index 8644900..49de0ce 100644
--- a/gcc/fortran/gfc-internals.texi
+++ b/gcc/fortran/gfc-internals.texi
@@ -124,7 +124,6 @@
* LibGFortran:: The LibGFortran Runtime Library.
* GNU Free Documentation License::
How you can copy and share this manual.
-* Index:: Index of this documentation.
@end menu
@end ifnottex
@@ -960,8 +959,6 @@
@c Index
@c ---------------------------------------------------------------------
-@node Index
-@unnumbered Index
@printindex cp
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 0fb7e1a..f00579a 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -47,7 +47,7 @@
@c man end
@c man begin BUGS
For instructions on reporting bugs, see
-@w{@value{BUGURL}}.
+$$BUGURL$$.
@c man end
@c man begin AUTHOR
See the Info entry for @command{gfortran} for contributors to GCC and
diff --git a/gcc/go/gccgo.texi b/gcc/go/gccgo.texi
index ce6b518..b7d3e8e 100644
--- a/gcc/go/gccgo.texi
+++ b/gcc/go/gccgo.texi
@@ -90,7 +90,6 @@
* Import and Export:: Importing and exporting package data.
* Compiler Directives:: Comments to control compilation.
* C Interoperability:: Calling C from Go and vice-versa.
-* Index:: Index.
@end menu
@@ -513,9 +512,6 @@
extern int go_function(int) __asm__ ("mypkgpath.Function");
@end smallexample
-@node Index
-@unnumbered Index
-
@printindex cp
@bye
diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index 2c1f1b5..1f776b4 100644
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -54,7 +54,7 @@
@subtitle The GNU OpenMP and OpenACC Implementation
@page
@vskip 0pt plus 1filll
-@comment For the @value{version-GCC} Version*
+@comment For the $$version-GCC$$ Version*
@sp 1
Published by the Free Software Foundation @*
51 Franklin Street, Fifth Floor@*
diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi
index d71b455..a625a95 100644
--- a/libiberty/libiberty.texi
+++ b/libiberty/libiberty.texi
@@ -83,7 +83,6 @@
* Licenses:: The various licenses under which libiberty sources are
distributed.
-* Index:: Index of functions and categories.
@end menu
@node Using
@@ -304,8 +303,6 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-@node Index
-@unnumbered Index
@printindex cp
diff --git a/libitm/libitm.texi b/libitm/libitm.texi
index 7a7a109..634ed24 100644
--- a/libitm/libitm.texi
+++ b/libitm/libitm.texi
@@ -35,7 +35,7 @@
@title The GNU Transactional Memory Library
@page
@vskip 0pt plus 1filll
-@comment For the @value{version-GCC} Version*
+@comment For the $$version-GCC$$ Version*
@sp 1
@insertcopying
@end titlepage
diff --git a/libquadmath/libquadmath.texi b/libquadmath/libquadmath.texi
index f9a44ac..e870d40 100644
--- a/libquadmath/libquadmath.texi
+++ b/libquadmath/libquadmath.texi
@@ -44,7 +44,7 @@
@title The GCC Quad-Precision Math Library
@page
@vskip 0pt plus 1filll
-@comment For the @value{version-GCC} Version*
+@comment For the $$version-GCC$$ Version*
@sp 1
Published by the Free Software Foundation @*
51 Franklin Street, Fifth Floor@*
@@ -371,13 +371,13 @@
@c ---------------------------------------------------------------------
@c For BUGURL
-@include libquadmath-vers.texi
+@include gcc-vers.texi
@node Reporting Bugs
@chapter Reporting Bugs
Bugs in the GCC Quad-Precision Math Library implementation should be
-reported via @value{BUGURL}.
+reported via $$BUGURL$$.
@c ---------------------------------------------------------------------
