Fix output file name.

Refer to license in Emacs manual.
Use @copying.

1 files changed, 13 insertions, 13 deletions

diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index 193eb8f16b7..ded2031ddc2 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -1,6 +1,6 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@setfilename sasl.info
+@setfilename ../../info/sasl
 
 @set VERSION 0.2
 
@@ -11,19 +11,26 @@
 
 @settitle Emacs SASL Library @value{VERSION}
 
-@ifinfo
+@copying
 This file describes the Emacs SASL library.
 
 Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008
 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-@end ifinfo
+Texts.  A copy of the license is included in the section entitled ``GNU
+Free Documentation License'' in the Emacs manual.
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
 
 @tex
 
@@ -34,14 +41,7 @@ Free Documentation License".
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 2000 Daiki Ueno.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the section entitled "GNU
-Free Documentation License".
+@insertcopying
 @end titlepage
 @page