Index: b/documentation/Makefile
===================================================================
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,14 +1,13 @@
-all: pdf html info partial_clean
+FORMATS := info html pdf txt
+MANUALS := asis_ug asis_rm gnatcheck_rm
 
-pdf:  asis_ug.pdf  asis_rm.pdf gnatcheck_rm.pdf
-html: asis_ug.html asis_rm.html gnatcheck_rm.html
-info: asis_ug.info asis_rm.info gnatcheck_rm.info
+all: $(foreach m,$(MANUALS),$(foreach f,$(FORMATS),$(m).$(f))) partial_clean
 
 partial_clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.ky *.log *.pg *.toc *.tp *.vr
 
 clean: partial_clean
-	rm -rf *.ps *.info* *.html asis_rm.txt asis_ug.txt
+	rm -rf $(addprefix *.,$(FORMATS)) gnatcheck_rm.texi gnatcheck_rules.texi
 
 %.pdf: %.texi
 	echo x | texi2pdf ${@:%.pdf=%.texi}
@@ -21,27 +20,7 @@
 	makeinfo --force --no-headers --no-split -o ${@:%.info=%.txt} \
 		${@:%.info=%.texi}
 
-asis_ug.texi: edition.texi texinfo.tex texiplus.tex gfdl.texi
-asis_rm.texi: edition.texi texinfo.tex texiplus.tex gfdl.texi
-gnatcheck_rm.texi: edition.texi texinfo.tex texiplus.tex gfdl.texi
+asis_ug.texi: edition.texi texiplus.tex
+asis_rm.texi: edition.texi texiplus.tex
+gnatcheck_rm.texi: edition.texi texiplus.tex
 	cp ../tools/gnatcheck/gnatcheck_rm.texi .
-
-gfdl.texi:
-	cp ../gnat/gfdl.texi .
-
-edition.texi:
-	cp ../gnat/edition.texi .
-
-texinfo.tex:
-	cp ../gnat/texinfo.tex .
-
-texiplus.tex:
-	cp ../gnat/texiplus.tex .
-
-gnatcheck_rules.texi : ../tools/gnatcheck/gnatcheck-docgen
-	(cd ../tools/gnatcheck; ./gnatcheck-docgen$(exe_ext))
-	cp ../tools/gnatcheck/docs/gnatcheck_rules.texi .
-
-../tools/gnatcheck/gnatcheck-docgen :
-	(cd ../tools/gnatcheck; gnatmake -Pgnatcheck gnatcheck-docgen)
-
Index: b/documentation/asis_rm.texi
===================================================================
--- a/documentation/asis_rm.texi
+++ b/documentation/asis_rm.texi
@@ -71,6 +71,11 @@
 @setfilename asis_rm.info
 @include version.texi
 
+@dircategory GNU Ada tools
+@direntry
+* ASIS_RM: (asis_rm).    Ada Semantic Interface Specification: reference manual
+@end direntry
+
 @set NOW January 2008
 @c This flag is used where the text refers to conditions that exist when the
 @c text was entered into the document but which may change over time.
@@ -136,15 +141,16 @@
 
 Copyright @copyright{} 2000-2008, AdaCore
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``ASIS-for-GNAT Reference Manual'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
+ASIS-for-GNAT is free software; you can redistribute it and/or modify it
+under terms of the  GNU General Public License  as published by the Free
+Software Foundation;  either version 2,  or  (at your option)  any later
+version. ASIS-for-GNAT is distributed  in the hope  that it will be use-
+ful, but WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+CHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
+Public License for more details. You should have received a copy of the 
+GNU General Public License  distributed with ASIS-for-GNAT; see file    
+COPYING.  If not,  write  to the  Free Software Foundation,  51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301, USA.                        
 
 @end titlepage
 
@@ -180,15 +186,16 @@
 Copyright @copyright{} 2000-2009, AdaCore
 
 @noindent
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``ASIS-for-GNAT Reference Manual'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
+ASIS-for-GNAT is free software; you can redistribute it and/or modify it
+under terms of the  GNU General Public License  as published by the Free
+Software Foundation;  either version 2,  or  (at your option)  any later
+version. ASIS-for-GNAT is distributed  in the hope  that it will be use-
+ful, but WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+CHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
+Public License for more details. You should have received a copy of the 
+GNU General Public License  distributed with ASIS-for-GNAT; see file    
+COPYING.  If not,  write  to the  Free Software Foundation,  51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301, USA.                        
 
 @menu
 * About This Manual::
@@ -196,7 +203,6 @@
 * ASIS Extensions::
 * Implementation-Specific Features and Implementation Permissions::
 * Debugging Information::
-* GNU Free Documentation License::
 * Index::
 
 @detailmenu
@@ -1677,13 +1683,6 @@
 
 @end table
 
-
-@c **********************************
-@c * GNU Free Documentation License *
-@c **********************************
-@include gfdl.texi
-@c GNU Free Documentation License
-
 @c *************************************
 @node Index
 @c *************************************
Index: b/documentation/asis_ug.texi
===================================================================
--- a/documentation/asis_ug.texi
+++ b/documentation/asis_ug.texi
@@ -73,6 +73,11 @@
 @setfilename asis_ug.info
 @include version.texi
 
+@dircategory GNU Ada tools
+@direntry
+* ASIS_UG: (asis_ug).    Ada Semantic Interface Specification: user's guide
+@end direntry
+
 @set NOW January 2008
 @c This flag is used where the text refers to conditions that exist when the
 @c text was entered into the document but which may change over time.
@@ -138,16 +143,16 @@
 
 Copyright @copyright{} 2000-2009, AdaCore
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``ASIS-for-GNAT User's Guide'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
+ASIS-for-GNAT is free software; you can redistribute it and/or modify it
+under terms of the  GNU General Public License  as published by the Free
+Software Foundation;  either version 2,  or  (at your option)  any later
+version. ASIS-for-GNAT is distributed  in the hope  that it will be use-
+ful, but WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+CHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
+Public License for more details. You should have received a copy of the 
+GNU General Public License  distributed with ASIS-for-GNAT; see file    
+COPYING. If not, write to the Free Software Foundation,  59 Temple Place
+Suite 330, Boston, MA 02111-1307, USA.                                  
 @end titlepage
 
 
@@ -182,16 +187,16 @@
 Copyright @copyright{} 2000-2009, AdaCore
 
 @noindent
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``ASIS-for-GNAT User's Guide'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
-
+ASIS-for-GNAT is free software; you can redistribute it and/or modify it
+under terms of the  GNU General Public License  as published by the Free
+Software Foundation;  either version 2,  or  (at your option)  any later
+version. ASIS-for-GNAT is distributed  in the hope  that it will be use-
+ful, but WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+CHANTABILITY or  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General 
+Public License for more details. You should have received a copy of the 
+GNU General Public License  distributed with ASIS-for-GNAT; see file    
+COPYING. If not, write to the Free Software Foundation,  59 Temple Place
+Suite 330, Boston, MA 02111-1307, USA.                                  
 
 @menu
 * About This Guide::
@@ -208,7 +213,6 @@
 * ASIS-for-GNAT Warnings::
 * Exception Handling and Reporting Internal Bugs::
 * File Naming Conventions and Application Name Space::
-* GNU Free Documentation License::
 * Index::
 @detailmenu
  --- The Detailed Node Listing ---
@@ -3104,12 +3108,6 @@
 the GNAT components being a part of ASIS-for-GNAT) follow the GNAT file name
 conventions without any name ``krunch''ing.
 
-@c **********************************
-@c * GNU Free Documentation License *
-@c **********************************
-@include gfdl.texi
-@c GNU Free Documentation License
-
 @c *************************************
 @node Index
 @c *************************************
Index: b/tools/gnatcheck/gnatcheck_rm.texi
===================================================================
--- a/tools/gnatcheck/gnatcheck_rm.texi
+++ b/tools/gnatcheck/gnatcheck_rm.texi
@@ -57,6 +57,11 @@
 @setfilename gnatcheck_rm.info
 @include version.texi
 
+@dircategory GNU Ada tools
+@direntry
+* gnatcheck: (gnatcheck_rm).    Gnatcheck reference manual
+@end direntry
+
 @set NOW December 2009
 @c This flag is used where the text refers to conditions that exist when the
 @c text was entered into the document but which may change over time.
@@ -124,15 +129,16 @@
 
 Copyright @copyright{} 2009, AdaCore
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``GNATcheck Reference Manual  - Predefined Rules'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
+GNATCHECK  is  free  software;  you can  redistribute it and/or modify it
+under  terms of  the GNU General Public License  as published by the Free
+Software  Foundation;  either  version 2,  or (at your option)  any later
+version.  GNAT  is  distributed  in the  hope that it will be useful, but
+WITHOUT   ANY   WARRANTY;   without   even   the   implied   warranty  of
+MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE. See the GNU General
+Public  License  for more  details.  You should have  received  a copy of
+the  GNU  General Public License distributed with GNAT; see file COPYING.
+If  not,  write  to  the   Free  Software Foundation, 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.                                 
 
 @end titlepage
 
@@ -167,15 +173,16 @@
 Copyright @copyright{} 2009, AdaCore
 
 @noindent
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being ``GNU Free Documentation License'', with the
-Front-Cover Texts being
-``GNATcheck Reference Manual - Predefined Rules'',
-and with no Back-Cover Texts.
-A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
+GNATCHECK  is  free  software;  you can  redistribute it and/or modify it
+under  terms of  the GNU General Public License  as published by the Free
+Software  Foundation;  either  version 2,  or (at your option)  any later
+version.  GNAT  is  distributed  in the  hope that it will be useful, but
+WITHOUT   ANY   WARRANTY;   without   even   the   implied   warranty  of
+MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE. See the GNU General
+Public  License  for more  details.  You should have  received  a copy of
+the  GNU  General Public License distributed with GNAT; see file COPYING.
+If  not,  write  to  the   Free  Software Foundation, 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301, USA.                                 
 
 @menu
 * About This Manual::
@@ -187,7 +194,6 @@
 * How to add a new rule
 @end ignore
 * List of Rules::
-* GNU Free Documentation License::
 * Index::
 
 @detailmenu
@@ -253,8 +259,6 @@
 
 List of Rules
 
-GNU Free Documentation License
-
 Index
 @end detailmenu
 
@@ -2689,15 +2693,7 @@
 
 @end itemize
 
-
-
-@c **********************************
-@c * GNU Free Documentation License *
-@c **********************************
-@include gfdl.texi
-@c GNU Free Documentation License
-
-@node Index,,GNU Free Documentation License, Top
+@node Index,,List of Rules, Top
 @unnumbered Index
 
 @printindex cp
Index: b/documentation/edition.texi
===================================================================
--- a/documentation/edition.texi
+++ b/documentation/edition.texi
@@ -1 +1 @@
-@set GPLEDITION
+@set FSFEDITION
Index: b/documentation/version.texi
===================================================================
--- a/documentation/version.texi
+++ b/documentation/version.texi
@@ -1 +1 @@
-@set gnat_version 2010
+@set gnat_version 4.6
