gcc/patches/gcc-4.7.2-gnat-texinfo5.patch

2013-02-21  Jakub Jelinek  <jakub@redhat.com>

	PR bootstrap/56258
	* doc/invoke.texi (-fdump-rtl-pro_and_epilogue): Use @item
	instead of @itemx.

	* gnat-style.texi (@title): Remove @hfill.
	* projects.texi: Avoid line wrapping inside of @pxref or
	@xref.

	* doc/cp-tools.texinfo (Virtual Machine Options): Use just
	one @gccoptlist instead of 3 separate ones.

--- gcc/ada/gnat-style.texi.jj	2012-08-10 12:57:33.000000000 +0200
+++ gcc/ada/gnat-style.texi	2013-02-20 13:06:03.042667300 +0100
@@ -42,7 +42,7 @@ Texts.  A copy of the license is include
 @titlepage
 @titlefont{GNAT Coding Style:}
 @sp 1
-@title @hfill A Guide for GNAT Developers
+@title A Guide for GNAT Developers
 @subtitle GNAT, The GNU Ada Compiler
 @versionsubtitle
 @author Ada Core Technologies, Inc.
--- gcc/ada/projects.texi.jj	2013-01-04 11:16:24.000000000 +0100
+++ gcc/ada/projects.texi	2013-02-20 17:48:41.582645159 +0100
@@ -48,8 +48,7 @@ project files allow you to specify:
 @item Source file naming conventions; you can specify these either globally or for
   individual compilation units (@pxref{Naming Schemes}).
 @item Change any of the above settings depending on external values, thus enabling
-  the reuse of the projects in various @b{scenarios} (@pxref{Scenarios
-  in Projects}).
+  the reuse of the projects in various @b{scenarios} (@pxref{Scenarios in Projects}).
 @item Automatically build libraries as part of the build process
   (@pxref{Library Projects}).
 
@@ -360,8 +359,8 @@ locating the specified source files in t
 
 @item For various reasons, it is sometimes useful to have a project with no
   sources (most of the time because the attributes defined in the project
-  file will be reused in other projects, as explained in @pxref{Organizing
-  Projects into Subsystems}. To do this, the attribute
+  file will be reused in other projects, as explained in
+  @pxref{Organizing Projects into Subsystems}. To do this, the attribute
   @emph{Source_Files} is set to the empty list, i.e. @code{()}. Alternatively,
   @emph{Source_Dirs} can be set to the empty list, with the same
   result.
@@ -388,8 +387,9 @@ locating the specified source files in t
   This can be done thanks to the attribute @b{Excluded_Source_Files}
   (or its synonym @b{Locally_Removed_Files}).
   Its value is the list of file names that should not be taken into account.
-  This attribute is often used when extending a project, @xref{Project
-  Extension}. A similar attribute @b{Excluded_Source_List_File} plays the same
+  This attribute is often used when extending a project,
+  @xref{Project Extension}. A similar attribute
+  @b{Excluded_Source_List_File} plays the same
   role but takes the name of file containing file names similarly to
   @code{Source_List_File}.
 
--- libjava/classpath/doc/cp-tools.texinfo.jj	2012-12-20 11:38:51.000000000 +0100
+++ libjava/classpath/doc/cp-tools.texinfo	2013-02-20 19:10:42.573925165 +0100
@@ -2025,7 +2025,7 @@ Doclet, grouped by type.  Explanations a
 
 @item Virtual Machine Options
 @xref{Virtual Machine Options,,Options Controlling Gjdoc Behavior}.
-@gccoptlist{-classpath}  @gccoptlist{-bootclasspath}  @gccoptlist{-J}@var{vmopt}
+@gccoptlist{-classpath  -bootclasspath  -J @var{vmopt}}
 
 @end table
 
1	niro	2113	2013-02-21 Jakub Jelinek <jakub@redhat.com>
2
3			PR bootstrap/56258
4			* doc/invoke.texi (-fdump-rtl-pro_and_epilogue): Use @item
5			instead of @itemx.
6
7			* gnat-style.texi (@title): Remove @hfill.
8			* projects.texi: Avoid line wrapping inside of @pxref or
9			@xref.
10
11			* doc/cp-tools.texinfo (Virtual Machine Options): Use just
12			one @gccoptlist instead of 3 separate ones.
13
14			--- gcc/ada/gnat-style.texi.jj 2012-08-10 12:57:33.000000000 +0200
15			+++ gcc/ada/gnat-style.texi 2013-02-20 13:06:03.042667300 +0100
16			@@ -42,7 +42,7 @@ Texts. A copy of the license is include
17			@titlepage
18			@titlefont{GNAT Coding Style:}
19			@sp 1
20			-@title @hfill A Guide for GNAT Developers
21			+@title A Guide for GNAT Developers
22			@subtitle GNAT, The GNU Ada Compiler
23			@versionsubtitle
24			@author Ada Core Technologies, Inc.
25			--- gcc/ada/projects.texi.jj 2013-01-04 11:16:24.000000000 +0100
26			+++ gcc/ada/projects.texi 2013-02-20 17:48:41.582645159 +0100
27			@@ -48,8 +48,7 @@ project files allow you to specify:
28			@item Source file naming conventions; you can specify these either globally or for
29			individual compilation units (@pxref{Naming Schemes}).
30			@item Change any of the above settings depending on external values, thus enabling
31			- the reuse of the projects in various @b{scenarios} (@pxref{Scenarios
32			- in Projects}).
33			+ the reuse of the projects in various @b{scenarios} (@pxref{Scenarios in Projects}).
34			@item Automatically build libraries as part of the build process
35			(@pxref{Library Projects}).
36
37			@@ -360,8 +359,8 @@ locating the specified source files in t
38
39			@item For various reasons, it is sometimes useful to have a project with no
40			sources (most of the time because the attributes defined in the project
41			- file will be reused in other projects, as explained in @pxref{Organizing
42			- Projects into Subsystems}. To do this, the attribute
43			+ file will be reused in other projects, as explained in
44			+ @pxref{Organizing Projects into Subsystems}. To do this, the attribute
45			@emph{Source_Files} is set to the empty list, i.e. @code{()}. Alternatively,
46			@emph{Source_Dirs} can be set to the empty list, with the same
47			result.
48			@@ -388,8 +387,9 @@ locating the specified source files in t
49			This can be done thanks to the attribute @b{Excluded_Source_Files}
50			(or its synonym @b{Locally_Removed_Files}).
51			Its value is the list of file names that should not be taken into account.
52			- This attribute is often used when extending a project, @xref{Project
53			- Extension}. A similar attribute @b{Excluded_Source_List_File} plays the same
54			+ This attribute is often used when extending a project,
55			+ @xref{Project Extension}. A similar attribute
56			+ @b{Excluded_Source_List_File} plays the same
57			role but takes the name of file containing file names similarly to
58			@code{Source_List_File}.
59
60			--- libjava/classpath/doc/cp-tools.texinfo.jj 2012-12-20 11:38:51.000000000 +0100
61			+++ libjava/classpath/doc/cp-tools.texinfo 2013-02-20 19:10:42.573925165 +0100
62			@@ -2025,7 +2025,7 @@ Doclet, grouped by type. Explanations a
63
64			@item Virtual Machine Options
65			@xref{Virtual Machine Options,,Options Controlling Gjdoc Behavior}.
66			-@gccoptlist{-classpath} @gccoptlist{-bootclasspath} @gccoptlist{-J}@var{vmopt}
67			+@gccoptlist{-classpath -bootclasspath -J @var{vmopt}}
68
69			@end table
70