Merge branch 'maint'

diff --cc afs.cmd
index 7bb005454049617f43c1c9cac8efc7f4c4bf7cca,15459194cb7a4f0289890f3b6919eca1f33136c0..9d87d18cadc6dd0526ced4d7ca142582dd1c9d76
--- 1/afs.cmd
--- 2/afs.cmd
+++ b/afs.cmd
@@@ -259,10 -280,11 +259,10 @@@ T: l
  N: ls@member@
  O: int com_ls@member@(struct command_context *cc);
  P: AFS_READ
- D: List blobs of type @member@ matching a pattern.
+ D: List blobs of type @member@ which match a pattern.
  U: ls@member@ [-i] [-l] [-r] [pattern]
 -H: Print a list of the names of all blobs in the corresponding
 -H: osl table which match the given pattern. If no pattern is
 -H: given, the full list is printed.
 +H: Print the list of all blobs which match the given pattern. If no
 +H: pattern is given, the full list is printed.
  H:
  H: Options:
  H: