* doc/cp-tools.texinfo: Move copying information in @copying section.

2 files changed, 24 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index b099dc0e6..94597c154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-05  Mark Wielaard  <mark@klomp.org>
+
+	* doc/cp-tools.texinfo: Move copying information in @copying section.
+
 2010-06-03  Andrew John Hughes  <ahughes@redhat.com>
 
 	* examples/gnu/classpath/examples/CORBA/NamingService/Demo.java,
diff --git a/doc/cp-tools.texinfo b/doc/cp-tools.texinfo
index 76783d6d9..0be7f540c 100644
--- a/doc/cp-tools.texinfo
+++ b/doc/cp-tools.texinfo
@@ -5,6 +5,23 @@
 @settitle GNU Classpath Tools Guide
 @c %**end of header
 
+@copying
+This file documents the Tools included in a standard distribution of the GNU
+Classpath project deliverables.
+
+Copyright @copyright{} 2006, 2007 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.
+@end quotation
+@end copying
+
+@ifinfo
+@ifnotplaintext
 @setchapternewpage on
 
 @c Common macros to support generating man pages:
@@ -18,13 +35,6 @@
 @end smallexample
 @end macro
 
-@ifinfo
-This file documents the Tools included in a standard distribution of the GNU
-Classpath project deliverables.
-
-Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-
-@ifnotplaintext
 @dircategory GNU Libraries
 @direntry
 * Classpath Tools: (cp-tools).  GNU Classpath Tools Guide
@@ -38,14 +48,7 @@ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 2006 Free Software Foundation, Inc.
-@sp 2
-Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.
-
+@insertcopying
 @end titlepage
 
 @contents
@@ -2435,14 +2438,14 @@ with the header @samp{CVS ID}, you would specify:
 Let's say that a class javadoc comment contains
 
 @smallexample
-@@cvsid $Id: cp-tools.texinfo,v 1.7 2008-08-13 13:32:05 jsumali Exp $
+@@cvsid $Id: cp-tools.texinfo,v 1.8 2010-06-05 20:18:00 mark Exp $
 @end smallexample
 
 Then the HTML output will contain something like
 
 @smallexample
 CVS ID:
-  $Id: cp-tools.texinfo,v 1.7 2008-08-13 13:32:05 jsumali Exp $
+  $Id: cp-tools.texinfo,v 1.8 2010-06-05 20:18:00 mark Exp $
 @end smallexample
 @end table