Merge tag 'upstream/1.3' into debian/master

Upstream version 1.3

1 files changed, 21 insertions, 3 deletions

diff --git a/server/wallet-report.8 b/server/wallet-report.8
index ac3714f..4cb759d 100644
--- a/server/wallet-report.8
+++ b/server/wallet-report.8
@@ -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-REPORT 8"
-.TH WALLET-REPORT 8 "2014-12-08" "1.2" "wallet"
+.TH WALLET-REPORT 8 "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
@@ -204,6 +204,9 @@ can be destroyed.
 Returns all ACLs containing an entry with given scheme and identifier.
 The scheme must be an exact match, but the <identifier> string will match
 any identifier containing that string.
+.IP "acls nested <acl>" 4
+.IX Item "acls nested <acl>"
+Returns all ACLs that contain this \s-1ACL\s0 as a nested entry.
 .IP "acls unused" 4
 .IX Item "acls unused"
 Returns all ACLs that are not referenced by any of the objects in the
@@ -249,6 +252,8 @@ Displays a summary of all available commands.
 .IX Item "objects type <type>"
 .IP "objects unused" 4
 .IX Item "objects unused"
+.IP "objects unstored" 4
+.IX Item "objects unstored"
 .PD
 Returns a list of objects in the database.  Objects will be listed in the
 form:
@@ -273,6 +278,11 @@ those where that \s-1ACL\s0 has any other, more limited permissions.
 .IP "objects flag <flag>" 4
 .IX Item "objects flag <flag>"
 Returns all objects which have the given flag set.
+.IP "objects host <hostname>" 4
+.IX Item "objects host <hostname>"
+Returns all objects that belong to the given host.  This requires adding
+local configuration to identify objects that belong to a given host.  See
+\&\*(L"\s-1OBJECT\s0 HOST-BASED \s-1NAMES\*(R"\s0 in Wallet::Config for more information.
 .IP "objects owner <acl>" 4
 .IX Item "objects owner <acl>"
 Returns all objects owned by the given \s-1ACL\s0 name or \s-1ID.\s0
@@ -300,12 +310,20 @@ The output will be one line per \s-1ACL\s0 line in the form:
 .Ve
 .Sp
 with duplicates suppressed.
+.IP "schemes" 4
+.IX Item "schemes"
+Returns a list of all registered \s-1ACL\s0 schemes.
+.IP "types" 4
+.IX Item "types"
+Returns a list of all registered object types.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Russ Allbery <eagle@eyrie.org>
 .SH "COPYRIGHT AND LICENSE"
 .IX Header "COPYRIGHT AND LICENSE"
-Copyright 2008, 2009, 2010, 2013 The Board of Trustees of the Leland
+Copyright 2016 Russ Allbery <eagle@eyrie.org>
+.PP
+Copyright 2008, 2009, 2010, 2013, 2015 The Board of Trustees of the Leland
 Stanford Junior University
 .PP
 Permission is hereby granted, free of charge, to any person obtaining a