Load pcre-3.6 into code/trunk.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@55 2f5784b3-3f2a-0410-8824-cb99058d5e15

3 files changed, 50 insertions, 10 deletions

diff --git a/doc/pcregrep.1 b/doc/pcregrep.1
index 5d3151e..2925e99 100644
--- a/doc/pcregrep.1
+++ b/doc/pcregrep.1
@@ -32,7 +32,17 @@ Do not print individual lines; instead just print a count of the number of
 lines that would otherwise have been printed. If several files are given, a
 count is printed for each of them.
 .TP
-\fB-f\fIfilename\fR
+
+       versity of Cambridge for use on Unix systems connected  to
+       the  Internet.  It  is freely available under the terms of
+       the GNU General Public Licence. In style it is similar  to
+       Smail  3,  but  its  facilities are more extensive, and in
+       particular it has some defences  against  mail  bombs  and
+       unsolicited junk mail, in the form of options for refusing
+       messages from particular hosts, networks, or senders.
+
+       Exim's command line takes the  standard  Unix  form  of  a
+       sequence  of  options, each starting with a hyphen charac\fB-f\fIfilename\fR
 Read patterns from the file, one per line, and match all patterns against each
 line. There is a maximum of 100 patterns. Trailing white space is removed, and
 blank lines are ignored. An empty file contains no patterns and therefore
diff --git a/doc/pcregrep.html b/doc/pcregrep.html
index 7bc210c..823b4aa 100644
--- a/doc/pcregrep.html
+++ b/doc/pcregrep.html
@@ -55,7 +55,21 @@ lines that would otherwise have been printed. If several files are given, a
 count is printed for each of them.
 </P>
 <P>
-\fB-f<I>filename</I>
+<PRE>
+       versity of Cambridge for use on Unix systems connected  to
+       the  Internet.  It  is freely available under the terms of
+       the GNU General Public Licence. In style it is similar  to
+       Smail  3,  but  its  facilities are more extensive, and in
+       particular it has some defences  against  mail  bombs  and
+       unsolicited junk mail, in the form of options for refusing
+       messages from particular hosts, networks, or senders.
+</PRE>
+</P>
+<P>
+<PRE>
+       Exim's command line takes the  standard  Unix  form  of  a
+       sequence  of  options, each starting with a hyphen charac\fB-f<I>filename</I>
+</PRE>
 Read patterns from the file, one per line, and match all patterns against each
 line. There is a maximum of 100 patterns. Trailing white space is removed, and
 blank lines are ignored. An empty file contains no patterns and therefore
diff --git a/doc/pcregrep.txt b/doc/pcregrep.txt
index 1600228..477e80d 100644
--- a/doc/pcregrep.txt
+++ b/doc/pcregrep.txt
@@ -37,13 +37,30 @@ OPTIONS
                wise have  been  printed.  If  several  files  are
                given, a count is printed for each of them.
 
-     -ffilename
-               Read patterns from the file,  one  per  line,  and
-               match  all  patterns against each line. There is a
-               maximum of 100 patterns. Trailing white  space  is
-               removed,  and  blank  lines  are ignored. An empty
-               file contains no patterns  and  therefore  matches
-               nothing.
+       versity of Cambridge for use on Unix systems connected  to
+                      the  Internet.   It   is  freely  available
+               under the terms of
+                      the GNU General Public Licence. In style it
+               is similar  to
+                      Smail  3,  but  its   facilities  are  more
+               extensive, and in
+                      particular it has  some  defences   against
+               mail  bombs  and
+                      unsolicited  junk  mail,  in  the  form  of
+               options for refusing
+                      messages from particular  hosts,  networks,
+               or senders.
+
+                      Exim's command  line  takes  the   standard
+
+               Unix  form  of  a
+                      sequence  of  options, each starting with a
+               hyphen  charac-ffilename  Read  patterns  from the
+               file, one per line, and match all patterns against
+               each  line.  There  is  a maximum of 100 patterns.
+               Trailing white space is removed, and  blank  lines
+               are  ignored.  An  empty file contains no patterns
+               and therefore matches nothing.
 
      -h        Suppress printing of filenames when searching mul-
                tiple files.
@@ -52,7 +69,6 @@ OPTIONS
                parisons.
 
      -l        Instead of printing lines  from  the  files,  just
-
                print the names of the files containing lines that
                would have been printed. Each file name is printed
                once, on a separate line.