Merge lp:~zorba-coders/zorba/quick-doc-fix into lp:zorba

[Chris Hillery]

Removed note about JSONiq (not in 2.5 after all).

[Chris Hillery (ceejatec)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/quick-doc-fix-2012-05-07T23-15-02.838Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job quick-doc-fix-2012-05-07T23-15-02.838Z is finished. The final status was:

All tests succeeded!

=== modified file 'doc/zorba/build_parameters.dox'
--- doc/zorba/build_parameters.dox	2012-05-02 10:40:42 +0000
+++ doc/zorba/build_parameters.dox	2012-05-07 23:14:21 +0000
@@ -6,14 +6,6 @@
 
 \section configure_enable Enabling/Disabling Zorba Features
 
-\subsection ZORBA_WITH_JSON Integral JSON Support
-
-Zorba 2.5 introduces support for JSON data as a first-class citizen in
-the XQuery world. See http://www.jsoniq.org/ for more information
-about this exciting development.
-
-To enable this support, configure with <tt>-D ZORBA_WITH_JSON=ON</tt>.
-
 \subsection ZORBA_WITH_BIG_INTEGER Big Integer Support
 
 The Zorba XQuery processor by default has arbitrary precision for the