From 54f6cf0b2c2ed9b151187662c32b3300dda1c30b Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 17 Oct 2004 19:32:13 +0000 Subject: [PATCH] Clarify which kinds of regexs are used. --- doc/man/man5/slapd-meta.5 | 22 +++++++++++----------- doc/man/man5/slapd.access.5 | 26 ++++++++++++++++---------- doc/man/man5/slapd.conf.5 | 18 ++++++++++-------- doc/man/man5/slapo-pcache.5 | 3 +-- doc/man/man5/slapo-rwm.5 | 20 ++++++++++++-------- 5 files changed, 50 insertions(+), 39 deletions(-) diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5 index 55bfb773df..f9ef4fc3c8 100644 --- a/doc/man/man5/slapd-meta.5 +++ b/doc/man/man5/slapd-meta.5 @@ -338,8 +338,8 @@ server will possibly enforce additional restrictions to "foo". .SH REWRITING A string is rewritten according to a set of rules, called a `rewrite context'. -The rules are based on Regular Expressions (POSIX regex) with -substring matching; basic variable substitution and map resolution +The rules are based on POSIX (''extended'') regular expressions (regex) +with substring matching; basic variable substitution and map resolution of substrings is allowed by specific mechanisms detailed in the following. The behavior of pattern matching/substitution can be altered by a set of flags. @@ -365,7 +365,7 @@ alter the action that is taken after substitution. honors case in matching (default is case insensitive) .TP .B `R' -use POSIX Basic Regular Expressions (default is Extended) +use POSIX ''basic'' regular expressions (default is ''extended'') .TP .B `M{n}' allow no more than @@ -422,15 +422,16 @@ errors, but jump two lines ahead only in case of match. More flags (mainly Action Flags) will be added as needed. .SH "Pattern matching:" See -.BR regex (7). +.BR regex (7) +and/or +.BR re_format (7). .SH "Substitution Pattern Syntax:" Everything starting with `%' requires substitution; .LP the only obvious exception is `%%', which is left as is; .LP the basic substitution is `%d', where `d' is a digit; -0 means the whole string, while 1-9 is a submatch, as discussed in -.BR regex (7); +0 means the whole string, while 1-9 is a submatch; .LP a `%' followed by a `{' invokes an advanced substitution. The pattern is: @@ -496,10 +497,8 @@ directive. Substitution escaping has been delegated to the `%' symbol, which is used instead of `\e' in string substitution patterns because `\e' is already escaped by slapd's low level parsing routines; -as a consequence, -.BR regex (7) -escaping requires two `\e' symbols, e.g. `\fB.*\e.foo\e.bar\fP' must -be written as `\fB.*\e\e.foo\e\e.bar\fP'. +as a consequence, regex escaping requires two `\e' symbols, +e.g. `\fB.*\e.foo\e.bar\fP' must be written as `\fB.*\e\e.foo\e\e.bar\fP'. .\" .\" The symbol can be altered at will by redefining the related macro in .\" "rewrite-int.h". @@ -753,6 +752,7 @@ default slapd configuration file .BR slapd\-ldap (5), .BR slapo\-pcache (5), .BR slapd (8), -.BR regex (7). +.BR regex (7), +.BR re_format (7). .SH AUTHOR Pierangelo Masarati, based on back-ldap by Howard Chu diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5 index 00ed406810..65818ca726 100644 --- a/doc/man/man5/slapd.access.5 +++ b/doc/man/man5/slapd.access.5 @@ -142,11 +142,13 @@ qualifier is .BR regex , then .B -is a regular expression pattern, +is a POSIX (''extended'') regular expression pattern, as detailed in -.BR regex (7), +.BR regex (7) +and/or +.BR re_format (7), matching a normalized string representation of the entry's DN. -The regex form of the pattern does not (yet) support UTF-8. +The regex form of the pattern does not (yet) support UTF\-8. .LP The statement .B filter= @@ -194,8 +196,8 @@ value. If the value .B