Zorba

Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

  1. bug-fixing
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: no longer in the source branch.
Merged at revision: 10481
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 37 lines (+3/-2)
3 files modified
doc/zorba/xqddf.dox (+1/-0)
modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq (+1/-1)
modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq (+1/-1)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Review via email: mp+77635@code.launchpad.net

Commit message

xqddf documentation fixes

Description of the change

xqddf documentation fixes

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-09-30T03-44-09.564Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-fixing-2011-09-30T03-44-09.564Z is finished. The final status was:

All tests succeeded!

lp:~matthias-brantner/zorba/bug-fixing updated
10481. By Matthias Brantner

xqddf documentation fixes Approved: Matthias Brantner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/zorba/xqddf.dox'
2--- doc/zorba/xqddf.dox 2011-09-14 06:15:19 +0000
3+++ doc/zorba/xqddf.dox 2011-09-30 03:16:25 +0000
4@@ -1266,6 +1266,7 @@
5 where $art/empid eq $emp/id
6 return $art)
7 return $emp
8+\endcode
9
10 <a name="query_no_probe_3" id="query_no_probe_3"></a>
11 \code
12
13=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq'
14--- modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq 2011-09-16 13:26:06 +0000
15+++ modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq 2011-09-30 03:16:25 +0000
16@@ -21,7 +21,7 @@
17 : declared in the prolog of a module.
18 : For example, it provides functions to create, delete, or introspect collections.
19 :
20- : <p>This module is part of <a href="../../../html/xqddf.html">Zorba's XQuery Data
21+ : <p>This module is part of <a href="../../html/xqddf.html">Zorba's XQuery Data
22 : Definition Facility</a>. All the collections managed by this module
23 : have to be pre-declared in the prolog of a module. Please refer to the
24 : <a href="../../html/data_lifecycle.html">general documentation</a>
25
26=== modified file 'modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq'
27--- modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2011-08-26 23:36:24 +0000
28+++ modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq 2011-09-30 03:16:25 +0000
29@@ -20,7 +20,7 @@
30 : This modules provides a set of functions to modify a collection and retrieve the nodes
31 : contained in a particular collection.
32 :
33- : <p>This module is part of <a href="../../html/xqddf.htm">Zorba's XQuery Data
34+ : <p>This module is part of <a href="../../html/xqddf.html">Zorba's XQuery Data
35 : Definition Facility</a>. All the collections managed by this module
36 : have to be pre-declared in the prolog of a module. Please refer to the
37 : <a href="../../html/data_lifecycle.html">general documentation</a>

Subscribers

People subscribed via source and target branches