Merge lp:~zorba-coders/zorba/doxygen into lp:zorba

[William Candillon]

Remove dead links in the documentation.

Remove dead links in the documentation.

[William Candillon (wcandillon)]

review: Approve

[Matthias Brantner (matthias-brantner)]

Why do the build instructions not point to the latest version but to 2.2.0?

http://www.zorba-xquery.com/html/documentation/2.2.0/zorba/build

review: Needs Fixing

[lp:~zorba-coders/zorba/doxygen]

10840. By William Candillon on 2012-05-15

Improve links.

10841. By William Candillon on 2012-05-16

Fix documentation link.

10842. By William Candillon on 2012-05-31

Merge from trunk.

10843. By William Candillon on 2012-05-31

Remove reference to the old sourceforge mailing-list.

Unmerged revisions

=== modified file 'doc/zorba/impl_dep_features.dox'
--- doc/zorba/impl_dep_features.dox	2012-05-03 12:31:51 +0000
+++ doc/zorba/impl_dep_features.dox	2012-05-15 10:46:23 +0000
@@ -36,12 +36,12 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>The circumstances in which warnings are raised, and the ways in which warnings are handled.</td>
-    <td>Warnings are handled via instances of the zorba::DiagnosticHandler class. For details, see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1DiagnosticHandler.html and http://www.zorba-xquery.com/site2/doc/latest/zorba/xqdoc/xhtml/www.zorba-xquery.com_warnings.html.</td>
+    <td>Warnings are handled via instances of the zorba::DiagnosticHandler class. For details, see http://www.zorba-xquery.com/html/doc/latest/cxx/html/classzorba_1_1DiagnosticHandler.html and http://www.zorba-xquery.com/html/doc/latest/zorba/xqdoc/xhtml/www.zorba-xquery.com_warnings.html.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>The method by which errors are reported to the external processing environment.</td>
-    <td>Errors are handled via instances of the zorba::DiagnosticHandler class. For details, see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1DiagnosticHandler.html.</td>
+    <td>Errors are handled via instances of the zorba::DiagnosticHandler class. For details, see http://www.zorba-xquery.com/html/doc/latest/cxx/html/classzorba_1_1DiagnosticHandler.html.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -51,7 +51,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</td>
-    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; http://www.zorba-xquery.com/errors 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*</td>
+    <td>The following static context components are overwritten/augmented: 1. Statically known namespaces: Augmented with zerr –&gt; <a href="http://www.zorba-xquery.com/html/modules/zorba/errors">http://www.zorba-xquery.com/errors</a> 2. Context item static type: item() 3. Default order for empty sequences: empty_greatest 4. Static Base URI: We use the rules in 4.5, where the implementation-defined default mentioned there is http://www.zorba-xquery.com, 5. Statically known default collection type: item()*</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -71,17 +71,17 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>The names and semantics of any option declarations recognized by the implementation.</td>
-    <td>See http://www.zorba-xquery.com/site2/doc/latest/zorba/html/options_and_annotations.html.</td>
+    <td>See http://www.zorba-xquery.com/html/doc/latest/options_and_annotations.html.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>Protocols (if any) by which parameters can be passed to an external function, and the result of the function can returned to the invoking query.</td>
-    <td>See http://www.zorba-xquery.com/site2/doc/latest/zorba/html/external_functions.html.</td>
+    <td>See http://www.zorba-xquery.com/html/doc/latest/external_functions.html.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>The process by which the specific modules to be imported by a module import are identified, if the Module Feature is supported (includes processing of location hints, if any.)</td>
-    <td>See http://www.zorba-xquery.com/site2/doc/latest/zorba/html/modules_top.html.</td>
+    <td>See http://www.zorba-xquery.com/html/doc/latest/modules_top.html.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -91,7 +91,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>The means by which serialization is invoked, if the Serialization Feature is supported.</td>
-    <td>The result of an XQuery program can be serialized via the zorba::XQuery::execute methods (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1XQuery.html). Sequence of items can be serialized via the zorba::Serializer::serialize method (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1Serializer.html).</td>
+    <td>The result of an XQuery program can be serialized via the zorba::XQuery::execute methods (see http://www.zorba-xquery.com/html/documentation/2.2.0/cxx/classzorba_1_1XQuery). Sequence of items can be serialized via the zorba::Serializer::serialize method (see http://www.zorba-xquery.com/html/documentation/latest/cxx/classzorba_1_1Serializer).</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
@@ -286,7 +286,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery and XPath Full Text 1.0</td>
     <td>It is implementation-defined which thesaurus relationships an implementation supports.</td>
-    <td>This is covered in the Zorba Full Text Thesaurus documentation, http://www.zorba-xquery.com/site2/doc/latest/zorba/html/ft_thesaurus.html</td>
+    <td>This is covered in the Zorba Full Text Thesaurus documentation, http://www.zorba-xquery.com/html/documentation/latest/zorba/ft_thesaurus</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery and XPath Full Text 1.0</td>
@@ -670,13 +670,13 @@
     <td>W3C XQuery 1.0</td>
     <td>Available documents</td>
     <td>dynamic</td>
-    <td>The URIs returned by the availale-documents function of module http://www.zorba-xquery.com/modules/store/dynamic/documents (see http://www.zorba-xquery.com/site2/doc/latest/zorba/xqdoc/xhtml/www.zorba-xquery.com_modules_store_dynamic_documents.html)</td>
+    <td>The URIs returned by the availale-documents function of module http://www.zorba-xquery.com/modules/store/dynamic/documents (see http://www.zorba-xquery.com/html/modules/zorba/store/Documents)</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>
     <td>Available collections</td>
     <td>dynamic</td>
-    <td>The URIs returned by the available-collections function of module http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl (see http://www.zorba-xquery.com/site2/doc/latest/zorba/xqdoc/xhtml/www.zorba-xquery.com_modules_store_dynamic_collections_w3c_ddl.html)</td>
+    <td>The URIs returned by the available-collections function of module http://www.zorba-xquery.com/modules/store/dynamic/collections/w3c/ddl (see http://www.zorba-xquery.com/html/modules/zorba/store/collection/w3c-ddl)</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery 1.0</td>

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2012-05-03 12:31:51 +0000
+++ doc/zorba/options.dox	2012-05-15 10:46:23 +0000
@@ -333,7 +333,7 @@
 \paragraph variadic_annotation Variadic Functions
 A function annotated with the <tt>%ann:variadic</tt> annotation is a function of indefinite arity, i.e. one that accepts a variable number of arguments.  
 
-For example, the function to create an unordered map with an arbitrary number of key types (see module http://www.zorba-xquery.com/modules/store/data-structures/unordered-map) is declared as follow:
+For example, the function to create an unordered map with an arbitrary number of key types (see module <a href="http://www.zorba-xquery.com/html/modules/zorba/store/data-structures/unordered-map">http://www.zorba-xquery.com/modules/store/data-structures/unordered-map</a>) is declared as follow:
 
 \code
 declare %ann:variadic %ann:sequential function map:create(
@@ -360,7 +360,7 @@
 
 However, the disadvantage is that a streamable string can only be consumed exactly once.
 If a streamable string is consumed more than once, an error is raised.
-In order to enable multiple consumers of a streamable string, the materialize function of the string module (http://www.zorba-xquery.com/modules/string) should be used to materialize the entire contents in an (regular) xs:string item.
+In order to enable multiple consumers of a streamable string, the materialize function of the string module (<a href="http://www.zorba-xquery.com/html/modules/zorba/xdm/atomic/string">http://www.zorba-xquery.com/modules/string</a>) should be used to materialize the entire contents in an (regular) xs:string item.
 
 \code
 import module namespace file = "http://expath.org/ns/file";

=== modified file 'doc/zorba/php_ubuntu.dox'
--- doc/zorba/php_ubuntu.dox	2012-05-03 12:31:51 +0000
+++ doc/zorba/php_ubuntu.dox	2012-05-15 10:46:23 +0000
@@ -138,5 +138,5 @@
 
 <a href="http://www.ibm.com/developerworks/xml/library/x-zorba/?ca=drs-"> Building XQuery-powered applications with PHP and Zorba</a>
 
-<a href="http://www.zorba-xquery.com/doc/zorba-latest/zorba/html/build.html"> Zorba build instructions</a>
+<a href="http://www.zorba-xquery.com/html/documentation/2.2.0/zorba/build"> Zorba build instructions</a>
 */

=== modified file 'doc/zorba/python_windows.dox'
--- doc/zorba/python_windows.dox	2012-05-03 12:31:51 +0000
+++ doc/zorba/python_windows.dox	2012-05-15 10:46:23 +0000
@@ -98,5 +98,5 @@
 \endcode
 
 <strong> Useful links</strong>
-<a href="http://www.zorba-xquery.com/doc/zorba-latest/python/html/index.html" target="_blank">Zorba Python API Documentation</a>
+<a href="http://www.zorba-xquery.com/html/documentation/latest/python" target="_blank">Zorba Python API Documentation</a>
 */