You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2014/04/10 00:21:41 UTC

[46/51] [abbrv] git commit: first pass on switching documentation to git from svn.

first pass on switching documentation to git from svn.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/7ad806fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/7ad806fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/7ad806fb

Branch: refs/heads/vxquery_0_3_staging
Commit: 7ad806fb0015f4b827b637d2572ff65265a49ef7
Parents: 43e6daa
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 17:13:22 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 17:13:22 2014 -0700

----------------------------------------------------------------------
 pom.xml                                       |  8 ++---
 src/site/apt/development_eclipse_setup.apt    | 25 +++++++-------
 src/site/apt/development_tips.apt             | 40 +++++++++++-----------
 src/site/apt/development_xml_node_details.apt | 14 ++++----
 src/site/apt/user_query.apt                   | 27 +++++++++------
 src/site/apt/user_running_tests.apt           |  4 +--
 6 files changed, 61 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index daaea8b..a09be4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
   </licenses>
   
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection>
-    <url>https://svn.apache.org/repos/asf/incubator/vxquery</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</url>
   </scm>
 
   <issueManagement>
@@ -401,7 +401,7 @@
         <configuration>
           <linkOnly>true</linkOnly>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-          <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</developerConnection>
+          <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/development_eclipse_setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_eclipse_setup.apt b/src/site/apt/development_eclipse_setup.apt
index 4d9342a..9df9fbc 100644
--- a/src/site/apt/development_eclipse_setup.apt
+++ b/src/site/apt/development_eclipse_setup.apt
@@ -52,31 +52,30 @@ Eclipse Setup
     development.
 
 ----------------------------------------
-$ git clone https://code.google.com/p/hyracks/ hyracks_for_vxquery
-$ cd hyracks_for_vxquery
-$ git checkout -b ecarm002/vxquery_compatibility origin/ecarm002/vxquery_compatibility
-$ mvn install -DskipTests
+$ git clone https://code.google.com/p/hyracks/
+$ cd hyracks
+$ mvn install
 $ cd ..
 ----------------------------------------
 
-    Finally, from Eclipse's File menu "import" the Maven Hyracks project you have just downloaded 
-    through SVN.
+    The mvn "-DskipTests" option can be used to save about 20 minutes, but will skip the verification tests.
+
+    Finally, from Eclipse's File menu "import" the Maven Hyracks project you have just downloaded through git.
 
   [[1]] Import VXQuery Code Base
 
     The VXQuery code base must be installed so eclipse has full access. Similar to the Hyracks
-    installation, VXQuery needs to be downloaded from Apache's SVN repository.
+    installation, VXQuery needs to be downloaded from Apache's git repository.
 
 ----------------------------------------
-$ svn checkout https://svn.apache.org/repos/asf/incubator/vxquery/trunk/ apache_vxquery_incubating
+$ git clone https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git apache-vxquery
 (Accept the certificate information for *.apache.org.)
-$ cd apache_vxquery_incubating/vxquery
-$ mvn package -DskipTests
-$ cd ../..
+$ cd apache-vxquery
+$ mvn package
+$ cd ..
 ----------------------------------------
  
-    Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded 
-    through SVN. 
+    Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded through git. 
     
   [[1]] Additional Project Configuration
     

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/development_tips.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_tips.apt b/src/site/apt/development_tips.apt
index b4e78c3..bfbf818 100644
--- a/src/site/apt/development_tips.apt
+++ b/src/site/apt/development_tips.apt
@@ -50,29 +50,29 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:byte                 | BytePointable        |             1 |
 *-------------------------+----------------------+---------------:
-| xs:date                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:date                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:dateTime             | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
+| xs:dateTime             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:dayTimeDuration      | LongPointable        |             8 |
 *-------------------------+----------------------+---------------:
-| xs:decimal              | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
+| xs:decimal              | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
 *-------------------------+----------------------+---------------:
 | xs:double               | DoublePointable      |             8 |
 *-------------------------+----------------------+---------------:
-| xs:duration             | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
+| xs:duration             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:float                | FloatPointable       |             4 |
 *-------------------------+----------------------+---------------:
-| xs:gDay                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gDay                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonth               | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonth               | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonthDay            | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonthDay            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYear                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYear                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYearMonth           | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYearMonth           | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
 | xs:int                  | IntegerPointable     |             4 |
 *-------------------------+----------------------+---------------:
@@ -88,7 +88,7 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:short                | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
-| xs:time                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
+| xs:time                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
 *-------------------------+----------------------+---------------:
 | xs:unsignedByte         | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
@@ -119,13 +119,13 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:anyURI               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:base64Binary         | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:base64Binary         | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:hexBinary            | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:hexBinary            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
 | xs:NOTATION             | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:QName                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
+| xs:QName                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
 *-------------------------+----------------------+---------------:
 | xs:string               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
@@ -139,19 +139,19 @@ Developer Tips
   an end of string value. Stacking iterators can be used to alter the string
   into a desired form.
   
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
 
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
   
 * Array Backed Value Store
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/development_xml_node_details.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_xml_node_details.apt b/src/site/apt/development_xml_node_details.apt
index 479572d..8cf2900 100644
--- a/src/site/apt/development_xml_node_details.apt
+++ b/src/site/apt/development_xml_node_details.apt
@@ -24,19 +24,19 @@ Data XML and Node Types
 *--------------------------------+----------------------+---------------+
 | <<Data Type>>                  | <<Pointable Name>>   | <<Data Size>> |
 *--------------------------------+----------------------+---------------:
-| Attribute Nodes                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
+| Attribute Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Document Nodes                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
+| Document Nodes                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Element Nodes                  | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
+| Element Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Node Tree Nodes                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
+| Node Tree Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Processing Instruction Nodes   | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
+| Processing Instruction Nodes   | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Comment Nodes                  | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Comment Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Text Nodes                     | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Text Nodes                     | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
 
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index d6ba5f6..eb9c46e 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -25,17 +25,22 @@ sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq
 * Command Line Options
 
 ----------------------------------------
- -O N          : Optimization Level. Default: Full Optimization
- -compileonly  : Compile the query and stop
- -repeatexec N : Number of times to repeat execution
- -showast      : Show abstract syntax tree
- -showoet      : Show optimized expression tree
- -showquery    : Show query string
- -showrp       : Show Runtime plan
- -showtet      : Show translated expression tree
- -timing       : Produce timing information
- -x            : Bind an external variable
-----------------------------------------
+ -O N                       : Optimization Level. Default: Full Optimization
+ -available-processors N    : Number of available processors. (default java's available processors)
+ -client-net-ip-address VAL : IP Address of the ClusterController
+ -client-net-port N         : Port of the ClusterController (default 1098)
+ -compileonly               : Compile the query and stop
+ -frame-size N              : Frame size in bytes. (default 65536)
+ -local-node-controllers N  : Number of local node controllers (default 1)
+ -repeatexec N              : Number of times to repeat execution
+ -showast                   : Show abstract syntax tree
+ -showoet                   : Show optimized expression tree
+ -showquery                 : Show query string
+ -showrp                    : Show Runtime plan
+ -showtet                   : Show translated expression tree
+ -timing                    : Produce timing information
+ -x                         : Bind an external variable
+ ----------------------------------------
  
 * Java Options
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index 503d65a..0e41ab5 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -26,6 +26,7 @@ sh ./apache-vxquery-X.Y-incubating/vxquery/vxquery-xtest/target/appassembler/bin
 
 ----------------------------------------
  -O N            : Optimization Level
+ -catalog VAL    : Test Catalog XML
  -exclude VAL    : Exclude filter regular expression
  -htmlreport VAL : HTML Report output file
  -include VAL    : Include filter regular expression
@@ -35,7 +36,6 @@ sh ./apache-vxquery-X.Y-incubating/vxquery/vxquery-xtest/target/appassembler/bin
  -threads N      : Number of threads
  -v              : Verbose
  -xmlreport VAL  : XML Report output file
- -xqtsbase VAL   : XQTS Base Directory
 ----------------------------------------
  
 * Java Options
@@ -70,7 +70,7 @@ $ cd ..
   * run the tests, and
 
 ----------------------------------------
-JAVA_OPTS="-Xmx1024m  -Djava.util.logging.config.file=/path/to/logging.properties" sh ./apache-vxquery-X.Y-incubating/vxquery-xtest/target/appassembler/bin/xtest -xqtsbase xqts -htmlreport /tmp/full_report.html
+JAVA_OPTS="-Xmx1024m  -Djava.util.logging.config.file=/path/to/logging.properties" sh ./apache-vxquery-X.Y-incubating/vxquery-xtest/target/appassembler/bin/xtest -catalog xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
 ----------------------------------------
 
   * view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.