aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst
diff options
context:
space:
mode:
authorMichael Meissner <meissner@linux.vnet.ibm.com>2015-04-10 18:39:05 +0000
committerMichael Meissner <meissner@linux.vnet.ibm.com>2015-04-10 18:39:05 +0000
commitbc57afcfbb08ff10cc6fd036d580c71bfaf00ed8 (patch)
tree10f38072ae840828e4205e4f549020643cfeb678 /gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst
parent48796cb6a9ff1feb2f870a4d6bd1d49112265c12 (diff)
parent24aaa4722c67688820b40f62483a6243e552d447 (diff)
Merge up to 221977ibm/fusion3
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ibm/fusion3@221980 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst')
-rw-r--r--gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst b/gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst
index 5ae5faca67f..d46c52c6d1c 100644
--- a/gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst
+++ b/gcc/ada/doc/gnat_rm/implementation_of_ada_2012_features.rst
@@ -15,8 +15,10 @@ Implementation of Ada 2012 Features
.. index:: Ada_2012 configuration pragma
This chapter contains a complete list of Ada 2012 features that have been
-implemented as of GNAT version 6.4. Generally, these features are only
-available if the *-gnat12* (Ada 2012 features enabled) flag is set
+implemented.
+Generally, these features are only
+available if the *-gnat12* (Ada 2012 features enabled) option is set,
+which is the default behavior,
or if the configuration pragma `Ada_2012` is used.
However, new pragmas, attributes, and restrictions are