Merge tag 'upstream/1.3' into debian/master

Upstream version 1.3

3 files changed, 48 insertions, 4 deletions

diff --git a/client/wallet-rekey.1 b/client/wallet-rekey.1
index 77b2f11..d596f5f 100644
--- a/client/wallet-rekey.1
+++ b/client/wallet-rekey.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET-REKEY 1"
-.TH WALLET-REKEY 1 "2014-12-08" "1.2" "wallet"
+.TH WALLET-REKEY 1 "2016-01-18" "1.3" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/client/wallet.1 b/client/wallet.1
index 1f41073..4b5cd83 100644
--- a/client/wallet.1
+++ b/client/wallet.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WALLET 1"
-.TH WALLET 1 "2014-12-08" "1.2" "wallet"
+.TH WALLET 1 "2016-01-18" "1.3" "wallet"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -335,6 +335,15 @@ associations with objects will be unchanged.  The \f(CW\*(C`ADMIN\*(C'\fR \s-1AC
 renamed.  <id> may be either the current name or the numeric \s-1ID. \s0 <name>
 must not be all-numeric.  To rename an \s-1ACL,\s0 the current user must be
 authorized by the \f(CW\*(C`ADMIN\*(C'\fR \s-1ACL.\s0
+.IP "acl replace <id> <new\-id>" 4
+.IX Item "acl replace <id> <new-id>"
+Find any objects owned by <id>, and then change their ownership to
+<new_id> instead.  <new\-id> should already exist, and may already have
+some objects owned by it.  <id> is not deleted afterwards, though in
+most cases that is probably your next step.  The \f(CW\*(C`ADMIN\*(C'\fR \s-1ACL\s0 may not be
+replaced from.  <id> and <new\-id> may be either the current name or the
+numeric \s-1ID. \s0 To replace an \s-1ACL,\s0 the current user must be authorized by
+the \f(CW\*(C`ADMIN\*(C'\fR \s-1ACL.\s0
 .IP "acl show <id>" 4
 .IX Item "acl show <id>"
 Display the name, numeric \s-1ID,\s0 and entries of the \s-1ACL\s0 <id>.
@@ -465,6 +474,18 @@ with \fB\-f\fR (if given) or from standard input.
 If an object with type <type> and name <name> does not already exist when
 this command is issued (as checked with the check interface), \fBwallet\fR
 will attempt to automatically create it (using autocreate).
+.IP "update <type> <name>" 4
+.IX Item "update <type> <name>"
+Prints to standard output the data associated with the object identified
+by <type> and <name>, or stores it in a file if the \fB\-f\fR option was
+given.  This will generate new data in the object, and only works for 
+objects that support generating new data automatically, such as keytabs or
+passwords.  Types that do not support generating new data will fail and
+direct you to use get instead.
+.Sp
+If an object with type <type> and name <name> does not already exist when
+this command is issued (as checked with the check interface), \fBwallet\fR
+will attempt to automatically create it (using autocreate).
 .SH "ATTRIBUTES"
 .IX Header "ATTRIBUTES"
 Object attributes store additional properties and configuration
diff --git a/client/wallet.pod b/client/wallet.pod
index 4b58bbf..672f0e4 100644
--- a/client/wallet.pod
+++ b/client/wallet.pod
@@ -227,6 +227,16 @@ renamed.  <id> may be either the current name or the numeric ID.  <name>
 must not be all-numeric.  To rename an ACL, the current user must be
 authorized by the C<ADMIN> ACL.
 
+=item acl replace <id> <new-id>
+
+Find any objects owned by <id>, and then change their ownership to
+<new_id> instead.  <new-id> should already exist, and may already have
+some objects owned by it.  <id> is not deleted afterwards, though in
+most cases that is probably your next step.  The C<ADMIN> ACL may not be
+replaced from.  <id> and <new-id> may be either the current name or the
+numeric ID.  To replace an ACL, the current user must be authorized by
+the C<ADMIN> ACL.
+
 =item acl show <id>
 
 Display the name, numeric ID, and entries of the ACL <id>.
@@ -375,6 +385,19 @@ If an object with type <type> and name <name> does not already exist when
 this command is issued (as checked with the check interface), B<wallet>
 will attempt to automatically create it (using autocreate).
 
+=item update <type> <name>
+
+Prints to standard output the data associated with the object identified
+by <type> and <name>, or stores it in a file if the B<-f> option was
+given.  This will generate new data in the object, and only works for 
+objects that support generating new data automatically, such as keytabs or
+passwords.  Types that do not support generating new data will fail and
+direct you to use get instead.
+
+If an object with type <type> and name <name> does not already exist when
+this command is issued (as checked with the check interface), B<wallet>
+will attempt to automatically create it (using autocreate).
+
 =back
 
 =head1 ATTRIBUTES