Merge lp:~zorba-coders/zorba/system_doc into lp:zorba/system-module

Proposed by William Candillon
Status: Merged
Approved by: Matthias Brantner
Approved revision: 35
Merged at revision: 35
Proposed branch: lp:~zorba-coders/zorba/system_doc
Merge into: lp:zorba/system-module
Diff against target: 29 lines (+3/-3)
1 file modified
src/com/zorba-xquery/www/modules/system.xq (+3/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/system_doc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
William Candillon Approve
Review via email: mp+126740@code.launchpad.net

This proposal supersedes a proposal from 2012-09-27.

Commit message

Minor documentation improvement.

Description of the change

Minor documentation improvement

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal

You were trying to merge the system into the process module.

Is that on purpose?

review: Needs Information
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job system_doc-2012-10-03T00-14-39.319Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/system.xq'
2--- src/com/zorba-xquery/www/modules/system.xq 2012-04-11 09:50:31 +0000
3+++ src/com/zorba-xquery/www/modules/system.xq 2012-09-27 16:59:28 +0000
4@@ -24,7 +24,7 @@
5 : all environment variables are prefixed with <i>env.</i>.
6 : <br />
7 : For instance, the following query: <br />
8- : <pre class="brush: xquery;">
9+ : <pre class="ace-static">
10 : import module namespace system = "http://www.zorba-xquery.com/modules/system";
11 :
12 : for $prop in system:properties()
13@@ -33,7 +33,7 @@
14 : </pre>
15 : <br />
16 : Will output:
17- : <pre>
18+ : <pre class="ace-static">
19 : env.TERM_PROGRAM: Apple_Terminal
20 : ...
21 : </pre>
22@@ -41,7 +41,7 @@
23 : with the key env.PATH.
24 :
25 : @author Markus Pilman
26- : @project external
27+ : @project Zorba/IO/System
28 :)
29 module namespace system = 'http://www.zorba-xquery.com/modules/system';
30

Subscribers

People subscribed via source and target branches

to all changes: