ada: Minor fixes to native user's guide

About the removal of the mention of Emacs, note that the same change has
been made to the cross user's guide a while ago.

gcc/ada/ChangeLog:

	* doc/gnat_ugn/about_this_guide.rst: Minor fixes
	* gnat_ugn.texi: Regenerate.

diff --git a/gcc/ada/doc/gnat_ugn/about_this_guide.rst b/gcc/ada/doc/gnat_ugn/about_this_guide.rst
index d614fe1857bff479abf698eab84a57785d3e518b..fc7bd8c96fe429b3bbf4bbc0c2d80c0c0e7c6c8b 100644 (file)
--- a/gcc/ada/doc/gnat_ugn/about_this_guide.rst
+++ b/gcc/ada/doc/gnat_ugn/about_this_guide.rst
@@ -78,7 +78,7 @@ What You Should Know before Reading This Guide
 This guide assumes a basic familiarity with the Ada 95 language, as
 described in the International Standard ANSI/ISO/IEC-8652:1995, January
 1995.
-Reference manuals for Ada 95, Ada 2005, and Ada 2012 are included in
+Reference manuals for Ada 95, Ada 2005, Ada 2012 and Ada 2022 are included in
 the GNAT documentation package.
 
 
@@ -88,11 +88,12 @@ Related Information
 For further information about Ada and related tools, please refer to the
 following documents:
 
-* :title:`Ada 95 Reference Manual`, :title:`Ada 2005 Reference Manual`, and
-  :title:`Ada 2012 Reference Manual`, which contain reference
-  material for the several revisions of the Ada language standard.
+* :title:`Ada 95 Reference Manual`, :title:`Ada 2005 Reference Manual`,
+  :title:`Ada 2012 Reference Manual`,  and :title:`Ada 2022 Reference Manual`,
+  which contain reference material for the several revisions of the Ada language
+  standard.
 
-* :title:`GNAT Reference_Manual`, which contains all reference material for the GNAT
+* :title:`GNAT Reference Manual`, which contains all reference material for the GNAT
   implementation of Ada.
 
 * :title:`Using GNAT Studio`, which describes the GNAT Studio
@@ -104,11 +105,6 @@ following documents:
 * :title:`Debugging with GDB`,
   for all details on the use of the GNU source-level debugger.
 
-* :title:`GNU Emacs Manual`,
-  for full information on the extensible editor and programming
-  environment Emacs.
-
-
 Conventions
 ===========
 .. index:: Conventions, typographical
@@ -133,9 +129,9 @@ in this guide:
 
 * Examples are described by text
 
-  ::
+  .. code-block:: text
 
-    and then shown this way.
+     and then shown this way.
 
 * Commands that you enter are shown as preceded by a prompt string
   comprising the ``$`` character followed by a space.

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 241ded65e8ec54adab403e29720e76e0f0075dc5..2b6ab38dd534ee03c54e98ef7fd6dc7a684f49a9 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -648,7 +648,7 @@ in an Ada program.
 This guide assumes a basic familiarity with the Ada 95 language, as
 described in the International Standard ANSI/ISO/IEC-8652:1995, January
 1995.
-Reference manuals for Ada 95, Ada 2005, and Ada 2012 are included in
+Reference manuals for Ada 95, Ada 2005, Ada 2012 and Ada 2022 are included in
 the GNAT documentation package.
 
 @node Related Information,Conventions,What You Should Know before Reading This Guide,About This Guide
@@ -663,12 +663,13 @@ following documents:
 @itemize *
 
 @item 
-@cite{Ada 95 Reference Manual}, @cite{Ada 2005 Reference Manual}, and
-@cite{Ada 2012 Reference Manual}, which contain reference
-material for the several revisions of the Ada language standard.
+@cite{Ada 95 Reference Manual}, @cite{Ada 2005 Reference Manual},
+@cite{Ada 2012 Reference Manual},  and @cite{Ada 2022 Reference Manual},
+which contain reference material for the several revisions of the Ada language
+standard.
 
 @item 
-@cite{GNAT Reference_Manual}, which contains all reference material for the GNAT
+@cite{GNAT Reference Manual}, which contains all reference material for the GNAT
 implementation of Ada.
 
 @item 
@@ -682,11 +683,6 @@ main GNAT Studio features through examples.
 @item 
 @cite{Debugging with GDB},
 for all details on the use of the GNU source-level debugger.
-
-@item 
-@cite{GNU Emacs Manual},
-for full information on the extensible editor and programming
-environment Emacs.
 @end itemize
 
 @node Conventions,,Related Information,About This Guide