zorba-coders team mailing list archive

[William Candillon <william.candillon@xxxxxxxxxx>]

William Candillon has proposed merging lp:~zorba-coders/zorba/xqddf_doc into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqddf_doc/+merge/93593

Minor documentation fixes
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqddf_doc/+merge/93593
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'doc/zorba/xqddf.dox'
--- doc/zorba/xqddf.dox	2011-10-30 08:04:47 +0000
+++ doc/zorba/xqddf.dox	2012-02-17 15:35:22 +0000
@@ -333,12 +333,12 @@
 \subsection collection_declaration Collection Declaration
 
 \code
-  Prolog ::= ((DefaultNamespaceDecl | Setter | NamespaceDecl | Import) Separator)*
-             ((ContextItemDecl | AnnotatedDecl | OptionDecl | CollectionDecl | IndexDecl | ICDecl) Separator)*
-  
-  CollectionDecl ::= 'declare'  Annotation* 'collection' QName CollectionTypeDecl?
+  AnnotatedDecl
+          ::= 'declare' ( CompatibilityAnnotation | Annotation )*
+              ( VarDecl | FunctionDecl | CollectionDecl | IndexDecl | ICDecl )
+  CollectionDecl ::= 'collection' QName CollectionTypeDecl?
 
-  CollectionTypeDeclaration ::= 'as' KindTest OccurrenceIndicator?
+  CollectionTypeDecl ::= 'as' KindTest OccurrenceIndicator?
 \endcode
 
 Collections are defined by <strong>collection declaration statements</strong>,
@@ -1355,10 +1355,7 @@
 
 
 \code
-  Prolog ::= ((DefaultNamespaceDecl | Setter | NamespaceDecl | Import) Separator)*
-             ((ContextItemDecl | AnnotatedDecl | OptionDecl | CollectionDecl | IndexDecl | ICDecl) Separator)*
-  
-  IndexDecl ::= 'declare' Annotation* 'index' IndexName
+  IndexDecl ::= 'index' IndexName
                'on' 'nodes' IndexDomainExpr
                'by' IndexKeySpec (',' IndexKeySpec)*
 
@@ -1374,7 +1371,7 @@
 
   AtomicType ::= QName
 
-  IndexKeyCollation ::= 'collation' UriLiteral
+  IndexKeyCollation ::= 'collation' URILiteral
 
   Note: the following annotations are accepted within the context of an index declaration:
 
@@ -2103,7 +2100,7 @@
 \section integrity_constraints Integrity Constraints in Zorba 
 
 \code
-  ICDecl                ::=  'declare' 'integrity' 'constraint' QName (ICCollection | ICForeignKey)
+  ICDecl                ::=  'integrity' 'constraint' QName (ICCollection | ICForeignKey)
 
   ICCollection          ::=  'on' 'collection' QName
        ( ICCollSequence | ICCollSequenceUnique | ICCollNode )