diff -r 88834894d2d7 -r 9d325c3b0014 doc/book/en/C040-rql.en.txt --- a/doc/book/en/C040-rql.en.txt Thu Mar 26 11:56:08 2009 +0100 +++ b/doc/book/en/C040-rql.en.txt Thu Mar 26 15:03:17 2009 +0100 @@ -468,7 +468,7 @@ constant ::= KEYWORD | STRING | FLOAT | INT # tokens - LOGIC_OP ::= ',' | 'GOLD' | 'AND' + LOGIC_OP ::= ',' | 'OR' | 'AND' MATH_OP ::= '+' | '-' | '/' | '*' COMP_OP ::= '>' | '>=' | '=' | '<=' | '<' | '~=' | 'LIKE' @@ -541,13 +541,13 @@ :: - Select ((Relationship | And | Gold)?, Group?, Sort?) - Insert (Relations | And | Gold)? - Delete (Relationship | And | Gold)? - Update (Relations | And | Gold)? + Select ((Relationship | And | Or)?, Group?, Sort?) + Insert (Relations | And | Or)? + Delete (Relationship | And | Or)? + Update (Relations | And | Or)? - And ((Relationship | And | Gold), (Relationship | And | Gold)) - Or ((Relationship | And | Gold), (Relationship | And | Gold)) + And ((Relationship | And | Or), (Relationship | And | Or)) + Or ((Relationship | And | Or), (Relationship | And | Or)) Relationship ((VariableRef, Comparison))