re PR ada/65259 (Failure to build Ada DVI and PDF documentation)

        PR ada/65259

	* doc/gnat_ugn/gnat_project_manager.rst,
	doc/gnat_ugn/platform_specific_information.rst: Remove reference to
	image, too troublesome with texi format.
	* gnat_ugn.texi: Regenerate.

From-SVN: r221087

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6aaf74726133789a29cc6573da2664ded50f559f..5deda8fb5b29be1458ccde94d8c24a06bd7d444e 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-01  Arnaud Charlet  <charlet@adacore.com>
+
+       PR ada/65259
+
+       * doc/gnat_ugn/gnat_project_manager.rst,
+       doc/gnat_ugn/platform_specific_information.rst: Remove reference to
+       image, too troublesome with texi format.
+       * gnat_ugn.texi: Regenerate.
+
 2015-02-24  Thomas Schwinge  <thomas@codesourcery.com>
 
        PR libgomp/64625

diff --git a/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst b/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst
index 70d3c2842763395e636368b4c5decbb24ffc1e43..b4964f6c89ca244eaac49abdd4143452415e44ad 100644 (file)
--- a/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst
+++ b/gcc/ada/doc/gnat_ugn/gnat_project_manager.rst
@@ -2593,9 +2593,9 @@ The following three attributes can be used only in an aggregate project:
   the attribute agg1'Project_Path, nor is agg1 influenced by
   agg2'Project_Path.
 
-  This can potentially lead to errors. Consider the following example:
+  This can potentially lead to errors. Consider the following example::
 
-  .. --
+     --
      --  +---------------+                  +----------------+
      --  | Agg1.gpr      |-=--includes--=-->| Agg2.gpr       |
      --  |  'project_path|                  |  'project_path |
@@ -2616,8 +2616,6 @@ The following three attributes can be used only in an aggregate project:
      --    | R.gpr |      | R'.gpr  |
      --    +-------+      +---------+
 
-  .. image:: project-manager-figure.png
-    
   When looking for p.gpr, both aggregates find the same physical file on
   the disk. However, it might happen that with their different project
   paths, both aggregate projects would in fact find a different r.gpr.

diff --git a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst
index dc3dfec22c89eae19295e2bb2d79309c5778b7c1..b31670c6125100994416c64060581701ec49fbd2 100644 (file)
--- a/gcc/ada/doc/gnat_ugn/platform_specific_information.rst
+++ b/gcc/ada/doc/gnat_ugn/platform_specific_information.rst
@@ -135,11 +135,9 @@ their thread support.
 
 The default run-time library (when GNAT is installed) is *rts-native*.
 This default run time is selected by the means of soft links.
-For example on x86-linux:
+For example on x86-linux::
 
-  .. image:: rtlibrary-structure.png
-
-.. --
+   --
    --  $(target-dir)
    --      |
    --      +--- adainclude----------+

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 49740e7a470c555d10290a86faad22c1989b8421..3099556174fef4ff704878c774807810460cc2ef 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -21,7 +21,7 @@
 
 @copying
 @quotation
-GNAT User's Guide for Native Platforms , February 22, 2015
+GNAT User's Guide for Native Platforms , March 01, 2015
 
 AdaCore
 
@@ -19532,28 +19532,28 @@ agg2'Project_Path.
 
 This can potentially lead to errors. Consider the following example:
 
-@c --
-@c --  +---------------+                  +----------------+
-@c --  | Agg1.gpr      |-=--includes--=-->| Agg2.gpr       |
-@c --  |  'project_path|                  |  'project_path |
-@c --  |               |                  |                |
-@c --  +---------------+                  +----------------+
-@c --        :                                   :
-@c --        includes                        includes
-@c --        :                                   :
-@c --        v                                   v
-@c --    +-------+                          +---------+
-@c --    | P.gpr |<---------- withs --------|  Q.gpr  |
-@c --    +-------+---------\                +---------+
-@c --        |             |
-@c --        withs         |
-@c --        |             |
-@c --        v             v
-@c --    +-------+      +---------+
-@c --    | R.gpr |      | R'.gpr  |
-@c --    +-------+      +---------+
-
-@image{project-manager-figure,,,,png}
+@example
+--
+--  +---------------+                  +----------------+
+--  | Agg1.gpr      |-=--includes--=-->| Agg2.gpr       |
+--  |  'project_path|                  |  'project_path |
+--  |               |                  |                |
+--  +---------------+                  +----------------+
+--        :                                   :
+--        includes                        includes
+--        :                                   :
+--        v                                   v
+--    +-------+                          +---------+
+--    | P.gpr |<---------- withs --------|  Q.gpr  |
+--    +-------+---------\                +---------+
+--        |             |
+--        withs         |
+--        |             |
+--        v             v
+--    +-------+      +---------+
+--    | R.gpr |      | R'.gpr  |
+--    +-------+      +---------+
+@end example
 
 When looking for p.gpr, both aggregates find the same physical file on
 the disk. However, it might happen that with their different project
@@ -29588,29 +29588,26 @@ The default run-time library (when GNAT is installed) is @emph{rts-native}.
 This default run time is selected by the means of soft links.
 For example on x86-linux:
 
-@quotation
-
-@image{rtlibrary-structure,,,,png}
-@end quotation
-
-@c --
-@c --  $(target-dir)
-@c --      |
-@c --      +--- adainclude----------+
-@c --      |                        |
-@c --      +--- adalib-----------+  |
-@c --      |                     |  |
-@c --      +--- rts-native       |  |
-@c --      |    |                |  |
-@c --      |    +--- adainclude <---+
-@c --      |    |                |
-@c --      |    +--- adalib <----+
-@c --      |
-@c --      +--- rts-sjlj
-@c --           |
-@c --           +--- adainclude
-@c --           |
-@c --           +--- adalib
+@example
+--
+--  $(target-dir)
+--      |
+--      +--- adainclude----------+
+--      |                        |
+--      +--- adalib-----------+  |
+--      |                     |  |
+--      +--- rts-native       |  |
+--      |    |                |  |
+--      |    +--- adainclude <---+
+--      |    |                |
+--      |    +--- adalib <----+
+--      |
+--      +--- rts-sjlj
+--           |
+--           +--- adainclude
+--           |
+--           +--- adalib
+@end example
 
 If the @emph{rts-sjlj} library is to be selected on a permanent basis,
 these soft links can be modified with the following commands: