Add missing defintion of Parameter_List and use single pipes in the

Defaults EBNF definition.

diff --git a/sudoers.man.in b/sudoers.man.in
index 9c1615de7cfa93e044c9d8820fa8e683070ea90e..350059bb7136877a00f6ab6082d24b21c0efe133 100644 (file)
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -167,7 +167,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "January 12, 2004" "1.6.8" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "January 17, 2004" "1.6.8" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"
@@ -365,9 +365,9 @@ multiple entries match, they are applied in order.  Where there are
 conflicting values, the last value on a matching line takes effect.
 .PP
 .Vb 4
-\& Default_Type ::= 'Defaults' ||
-\&                  'Defaults' '@' Host ||
-\&                  'Defaults' ':' User ||
+\& Default_Type ::= 'Defaults' |
+\&                  'Defaults' '@' Host |
+\&                  'Defaults' ':' User |
 \&                  'Defaults' '>' RunasUser
 .Ve
 .PP
@@ -375,11 +375,16 @@ conflicting values, the last value on a matching line takes effect.
 \& Default_Entry ::= Default_Type Parameter_List
 .Ve
 .PP
+.Vb 2
+\& Parameter_List ::= Parameter |
+\&                    Parameter ',' Parameter_List
+.Ve
+.PP
 .Vb 4
-\& Parameter ::= Parameter '=' Value ||
-\&               Parameter '+=' Value ||
-\&               Parameter '-=' Value ||
-\&               '!'* Parameter ||
+\& Parameter ::= Parameter '=' Value |
+\&               Parameter '+=' Value |
+\&               Parameter '-=' Value |
+\&               '!'* Parameter
 .Ve
 .PP
 Parameters may be \fBflags\fR, \fBinteger\fR values, \fBstrings\fR, or \fBlists\fR.

diff --git a/sudoers.pod b/sudoers.pod
index 6a9736c6acf89e3cf2007b6ea2ce8318eb905f71..303119d96d28ca482a41c38be3b5f06604d8f4c1 100644 (file)
--- a/sudoers.pod
+++ b/sudoers.pod
@@ -208,17 +208,20 @@ specific user, or commands being run as a specific user.  When
 multiple entries match, they are applied in order.  Where there are
 conflicting values, the last value on a matching line takes effect.
 
- Default_Type ::= 'Defaults' ||
-                 'Defaults' '@' Host ||
-                 'Defaults' ':' User ||
+ Default_Type ::= 'Defaults' |
+                 'Defaults' '@' Host |
+                 'Defaults' ':' User |
                  'Defaults' '>' RunasUser
 
  Default_Entry ::= Default_Type Parameter_List
 
- Parameter ::= Parameter '=' Value ||
-              Parameter '+=' Value ||
-              Parameter '-=' Value ||
-              '!'* Parameter ||
+ Parameter_List ::= Parameter |
+                   Parameter ',' Parameter_List
+
+ Parameter ::= Parameter '=' Value |
+              Parameter '+=' Value |
+              Parameter '-=' Value |
+              '!'* Parameter
 
 Parameters may be B<flags>, B<integer> values, B<strings>, or B<lists>.
 Flags are implicitly boolean and can be turned off via the '!'