svn rev #21698: trunk/doc/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21698
Commit By: raeburn
Log Message:
fix merge of new openldap notice


Changed Files:
U   trunk/doc/copyright.texinfo
Modified: trunk/doc/copyright.texinfo
===================================================================
--- trunk/doc/copyright.texinfo	2009-01-05 05:01:04 UTC (rev 21697)
+++ trunk/doc/copyright.texinfo	2009-01-05 17:49:00 UTC (rev 21698)
@@ -609,9 +609,6 @@
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notices and this permission notice are
-preserved on all copies.
 
 @iftex
 @vskip 12pt
@@ -620,6 +617,10 @@
 @end iftex
 @end quotation
 
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notices and this permission notice are
+preserved on all copies.
+
 @ignore
 Permission is granted to process this file through TeX and print the
 results, provided the printed document carries a copying permission