From: Ken Raeburn Date: Mon, 5 Jan 2009 17:49:00 +0000 (+0000) Subject: fix merge of new openldap notice X-Git-Tag: krb5-1.7-alpha1~110 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30643d28a4f577dd031199a9caaa411ba3d57752;p=krb5.git fix merge of new openldap notice git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21698 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/doc/copyright.texinfo b/doc/copyright.texinfo index 58b53f786..5d58c592a 100644 --- a/doc/copyright.texinfo +++ b/doc/copyright.texinfo @@ -609,9 +609,6 @@ OpenLDAP is a registered trademark of the OpenLDAP Foundation. 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 @@ preserved on all copies. @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