Merge tag 'upstream/1.0' into debian

Upstream version 1.0

1 files changed, 27 insertions, 6 deletions

diff --git a/contrib/wallet-summary b/contrib/wallet-summary
index b782a97..4e76119 100755
--- a/contrib/wallet-summary
+++ b/contrib/wallet-summary
@@ -1,11 +1,6 @@
 #!/usr/bin/perl -w
 #
-# wallet-summary -- Summarize keytabs in the wallet database.
-#
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2003, 2008, 2010 Board of Trustees, Leland Stanford Jr. University
-#
-# See LICENSE for licensing terms.
+# Summarize keytabs in the wallet database.
 
 ##############################################################################
 # Site configuration
@@ -174,6 +169,9 @@ close REPORT;
 # Documentation
 ##############################################################################
 
+=for stopwords
+-hm keytab keytabs MERCHANTABILITY NONINFRINGEMENT sublicense
+
 =head1 NAME
 
 wallet-summary - Report on keytabs in the wallet database
@@ -237,4 +235,27 @@ future development.
 
 Russ Allbery <rra@stanford.edu>
 
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2003, 2008, 2010, 2013 The Board of Trustees of the Leland
+Stanford Junior University
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
 =cut