From: Ronan Desplanques <[email protected]>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/doc/gnat_ugn/about_this_guide.rst | 20 ++++++++------------
gcc/ada/gnat_ugn.texi | 16 ++++++----------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/gcc/ada/doc/gnat_ugn/about_this_guide.rst
b/gcc/ada/doc/gnat_ugn/about_this_guide.rst
index d614fe1857b..fc7bd8c96fe 100644
--- 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 241ded65e8e..2b6ab38dd53 100644
--- 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
--
2.51.0
