On Wed, Dec 3, 2014 at 5:41 PM, Ted Unangst <[email protected]> wrote: > On Wed, Dec 03, 2014 at 15:12, Theo de Raadt wrote: > >>> >>>If you think my diff is too wordy, we could move the text around a >>>bit, perhaps later in the section and say "-and and -or are >>>alternatives to -a and -o" or such. >> >> For scripting stuff, we have tended to lean towards the "portable approach", >> since such code gets used on other systems very often. > > Here's a revised diff against current. It just notes that the > extension spellings are such. > > Index: find.1 > =================================================================== > RCS file: /cvs/src/usr.bin/find/find.1,v > retrieving revision 1.89 > diff -u -p -r1.89 find.1 > --- find.1 3 Dec 2014 19:39:57 -0000 1.89 > +++ find.1 3 Dec 2014 22:40:18 -0000 > @@ -509,7 +509,6 @@ operator. > It evaluates to true if the expression is false. > .Pp > .It Ar expression Cm -a Ar expression > -.It Ar expression Cm -and Ar expression > .It Ar expression expression > The logical AND operator. > As it is implied by the juxtaposition of two expressions it does not > @@ -518,7 +517,6 @@ The expression evaluates to true if both > The second expression is not evaluated if the first expression is false. > .Pp > .It Ar expression Cm -o Ar expression > -.It Ar expression Cm -or Ar expression > The logical OR operator. > The expression evaluates to true if either the first or the second expression > is true. > @@ -529,6 +527,11 @@ Operators, primaries, and arguments to p > arguments to > .Nm find , > i.e. they should be separated by whitespace. > +.Pp > +As an extension, the AND and OR operators may also be spelled > +.Cm -and > +and > +.Cm -or . > .Sh EXIT STATUS > The > .Nm >
I personally like jmc's existing version better. I feel like we typically document the whole command as implemented on .Ox, and note any extensions in the STANDARDS section as he's done. Deleting -and and -or from the OPERATORS sections feels a bit inconsistent/incomplete to me compared to other pages.
