Merge remote-tracking branch 'upstream/master' into krbldap

NOTICE

@@ -1,4 +1,4 @@
-Copyright (C) 1985-2011 by the Massachusetts Institute of Technology.
+Copyright (C) 1985-2012 by the Massachusetts Institute of Technology.
 
 All rights reserved.
 
@@ -8,18 +8,22 @@ All rights reserved.
      contemplating export to obtain such a license before exporting.
 
 WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
-this software and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of M.I.T. not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Furthermore if you
-modify this software you must label your software as modified software
-and not distribute it in such a fashion that it might be confused with
-the original MIT software.  M.I.T. makes no representations about the
+this software for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of M.I.T. not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  Furthermore if you modify
+this software you must label your software as modified software and not
+distribute it in such a fashion that it might be confused with the
+original MIT software.  M.I.T. makes no representations about the
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 
+Documentation components of this software distribution are licensed
+under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+(`http://creativecommons.org/licenses/by-sa/3.0/')
+
 Individual source code files are copyright MIT, Cygnus Support, Novell,
 OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
 FundsXpress, and others.

doc/Makefile

@@ -27,6 +27,8 @@ MANPAGES=$(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $
 USER_GUIDE_INCLUDES=definitions.texinfo copyright.texinfo glossary.texinfo
 USER_GUIDE_DEPS=user-guide.texinfo $(USER_GUIDE_INCLUDES)
 
+SPHINX_BUILD=sphinx-build
+
 .PHONY: all
 all:: admin-guide-full install-guide-full user-guide-full clean-temp-ps clean-tex
 
@@ -155,3 +157,16 @@ tgz::
 
 ../NOTICE: notice.texinfo definitions.texinfo copyright.texinfo
 	makeinfo --plaintext -o $@ notice.texinfo
+
+RSTMAN=k5identity.5 k5login.5 k5srvutil.1 kadmin.1 kadmind.8 kdb5_ldap_util.8 \
+	kdb5_util.8 kdc.conf.5 kdestroy.1 kinit.1 klist.1 kpasswd.1 kprop.8 \
+	kpropd.8 kproplog.8 krb5.conf.5 krb5kdc.8 ksu.1 kswitch.1 ktutil.1 \
+	kvno.1
+
+# The file editing loop deletes some trailing whitespace that the
+# docutils manpage writer outputs near the end of its output files.
+rstman::
+	$(SPHINX_BUILD) -q -b man rst_source ../src/man
+	(cd ../src/man && for f in $(RSTMAN); do \
+		(echo '$$'; echo '?^.." $$?d'; echo 'w'; echo 'q' ) | ed $$f; \
+	done)

doc/copyright.texinfo

@@ -2,7 +2,7 @@
 @begingroup
 @smallfonts @rm
 @end iftex
-Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
+Copyright @copyright{} 1985-2012 by the Massachusetts Institute of Technology.
 
 All rights reserved.
 
@@ -13,18 +13,22 @@ Government.  It is the responsibility of any person or organization
 contemplating export to obtain such a license before exporting.
 @end quotation
 
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
-this software and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appear in all
-copies and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of M.I.T. not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Furthermore if you
-modify this software you must label your software as modified software
-and not distribute it in such a fashion that it might be confused with
-the original MIT software.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided ``as is''
-without express or implied warranty.
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+distribute this software for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of M.I.T. not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  Furthermore if you modify
+this software you must label your software as modified software and
+not distribute it in such a fashion that it might be confused with the
+original MIT software.  M.I.T. makes no representations about the
+suitability of this software for any purpose.  It is provided ``as
+is'' without express or implied warranty.
+
+Documentation components of this software distribution are licensed
+under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+(@uref{http://creativecommons.org/licenses/by-sa/3.0/})
 
 Individual source code files are copyright MIT, Cygnus Support,
 Novell, OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
@@ -1252,29 +1256,6 @@ required by the GPL in this and the other files of this package. If you do
 not delete the provisions above, a recipient may use your version of this
 file under either the BSD or the GPL.
 @end quotation
-@ifclear noticefile
-
-@cdivider
-
-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
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-@end ignore
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also 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.
-@end ifclear
 @iftex
 @pagealignmacro
 @endgroup

doc/notice.texinfo

@@ -3,7 +3,6 @@
 @paragraphindent 0
 @exampleindent 2
 @documentencoding UTF-8
-@set noticefile
 @node Top,  , (dir), (dir)
 @comment  node-name,  next,  previous,  up
 @include definitions.texinfo