Merge tag 'upstream/3.3.3'

[debian/amanda] / perl / Amanda / Util.pod

diff --git a/perl/Amanda/Util.pod b/perl/Amanda/Util.pod
index 3ee51aad37e50d9f56121a9d21dd8a524e110ed6..770841788666abfe8c5aa530bd80c41a101f2988 100644 (file)
--- a/perl/Amanda/Util.pod
+++ b/perl/Amanda/Util.pod
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -421,7 +422,17 @@ function always completely overwrites the file.
   burp $filename, $header;
 
 These functions can (and should) be exported to the main namespace
-  
+
+=head1 MATCHING
+
+The following functions are available to match strings against patterns using
+the rules described in amanda(8):
+
+  match_host($pat, $str);
+  match_disk($pat, $str);
+  match_datestamp($pat, $str);
+  match_level($pat, $str);
+
 =cut
 
 %}