From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 30 May 2015 09:54:47 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.5~33
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e9b00a14a4653d767a9d0fe885aa0b6d56c42180

Merge branch 'maint'
---

e9b00a14a4653d767a9d0fe885aa0b6d56c42180
diff --cc afs.cmd
index 7bb00545,15459194..9d87d18c
--- a/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: