Zorba

Merge lp:~matthias-brantner/zorba/bug-fixing into lp:~zorba-coders/zorba/data-converters-module

  1. bug-fixing
  2. Merge into data-converters-module
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: no longer in the source branch.
Merged at revision: 73
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:~zorba-coders/zorba/data-converters-module
Diff against target: 21 lines (+2/-2)
1 file modified
src/com/zorba-xquery/www/modules/converters/json.xq (+2/-2)
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+78515@code.launchpad.net

Commit message

fix a broken link in the documentation

Description of the change

fix a broken link in the documentation

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-10-06T21-58-37.448Z/log.html

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

Validation queue job bug-fixing-2011-10-06T21-58-37.448Z 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/converters/json.xq'
2--- src/com/zorba-xquery/www/modules/converters/json.xq 2011-08-18 22:09:48 +0000
3+++ src/com/zorba-xquery/www/modules/converters/json.xq 2011-10-06 21:56:26 +0000
4@@ -31,7 +31,7 @@
5 : <p>Both types of functions are available to parse and serialize two
6 : types of XDM-JSON mappings:<ul><li>the first mapping called in this document
7 : <strong>simple XDM-JSON</strong> has been
8- : <a href="http://snelson.org.uk/archives/2008/02/parsing_json_in.php#more">
9+ : <a href="http://john.snelson.org.uk/parsing-json-into-xquery">
10 : proposed by John Snelson</a></li><li>the second mapping is called
11 : <a href="http://jsonml.org/">JsonML</a></li></ul>In the following, we
12 : briefly describe both mappings.</p>
13@@ -62,7 +62,7 @@
14 : @author Sorin Nasoi
15 : @library <a href="http://www.digip.org/jansson/">Jansson library for encoding, decoding and manipulating JSON data</a>
16 :
17- : @see <a href="http://snelson.org.uk/archives/2008/02/parsing_json_in.php#more">Mapping proposed by John Snelson</a>
18+ : @see <a href="http://john.snelson.org.uk/parsing-json-into-xquery">Mapping proposed by John Snelson</a>
19 : @see <a href="http://jsonml.org" target="_blank">JSonML</a>
20 : @see <a href="http://www.digip.org/jansson/doc/2.0/">Jansson library for encoding, decoding and manipulating JSON data</a>
21 : @project data processing/data converters

Subscribers

People subscribed via source and target branches