Zorba

Merge lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal into lp://staging/zorba

zorba-documentation-merge-proposal
Merge into trunk

Proposed by Sorin Marian Nasoi on 2013-09-17

Status:

Merged

Merged at revision:

11644

Proposed branch:

lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal

Merge into:

lp://staging/zorba

Diff against target:

22696 lines (+7918/-11362)

88 files modified

doc/CMakeLists.txt (+22/-0)
doc/c/doxy.config.in (+8/-10)
doc/c/manual/indexpage.dox (+19/-3)
doc/csharp/manual/indexpage.dox (+14/-13)
doc/cxx/manual/indexpage.dox (+58/-2)
doc/java/doxy.config.in (+1/-1)
doc/java/manual/indexpage.dox (+19/-6)
doc/php/manual/indexpage.dox (+18/-8)
doc/python/manual/indexpage.dox (+21/-14)
doc/ruby/manual/indexpage.dox (+20/-14)
doc/xqj/manual/indexpage.dox (+14/-11)
doc/zorba/JSONforXQuery.dox (+4/-0)
doc/zorba/JSONforXQuery.html (+1/-1)
doc/zorba/XQueryforJSON.dox (+4/-0)
doc/zorba/XQueryforJSON.html (+1/-1)
doc/zorba/build_and_install.dox (+8/-10)
doc/zorba/build_configure.dox (+4/-4)
doc/zorba/build_macos.dox (+1/-1)
doc/zorba/build_prepare.dox (+12/-11)
doc/zorba/build_prerequisites.dox (+13/-13)
doc/zorba/commandline.dox (+3/-3)
doc/zorba/conformance.dox (+147/-179)
doc/zorba/conformanceXQFTTS.dox (+5/-8)
doc/zorba/conformanceXQUTS.dox (+11/-11)
doc/zorba/conformance_XQ10.dox (+1513/-3017)
doc/zorba/conformance_XQ30.dox (+1517/-2985)
doc/zorba/data_converters.dox (+6/-5)
doc/zorba/data_lifecycle.dox (+3/-3)
doc/zorba/doxy.config.in (+5/-4)
doc/zorba/errors_warnings.dox (+3/-3)
doc/zorba/ft_intro.dox (+1/-1)
doc/zorba/impl_dep_features.dox (+1/-1)
doc/zorba/indexpage.dox.in (+11/-11)
doc/zorba/memory_leaks.dox (+2/-2)
doc/zorba/modules_top.dox (+7/-7)
doc/zorba/overview.dox (+2/-2)
doc/zorba/scripting_spec.dox (+4/-0)
doc/zorba/scripting_spec.html (+760/-1468)
doc/zorba/tut_image.dox (+12/-14)
doc/zorba/xml_json.dox (+42/-26)
doc/zorba/xqddf.dox (+148/-144)
doc/zorba/xqdoc/images/modules.svg (+1692/-1605)
doc/zorba/xqdoc/images/modules_new.svg (+1575/-1611)
doc/zorba/xqdoc/src/xqdoc-html.xq (+40/-7)
doc/zorba/xqdoc/src/zorba_module_dependencies.xqy (+8/-1)
modules/atomic/math.xq (+1/-1)
modules/atomic/random.xq (+1/-1)
modules/atomic/string.xq (+1/-1)
modules/com/zorba-xquery/www/modules/datetime.xq (+1/-1)
modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq (+1/-1)
modules/com/zorba-xquery/www/modules/fetch.xq (+7/-7)
modules/com/zorba-xquery/www/modules/reflection.xq (+1/-1)
modules/com/zorba-xquery/www/modules/store/documents/dynamic.xq (+3/-3)
modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq (+3/-3)
modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq (+3/-3)
modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq (+3/-3)
modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq (+3/-3)
modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq (+5/-5)
modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq (+5/-5)
modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq (+5/-5)
modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq (+5/-5)
modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq (+5/-5)
modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq (+5/-5)
modules/com/zorba-xquery/www/modules/uri.xq (+5/-5)
modules/com/zorba-xquery/www/modules/xqdoc/html.xq (+1/-1)
modules/full-text/full-text.xq (+3/-3)
modules/http-client/json/http-client.xq (+7/-7)
modules/http-client/xml/http-client.xq (+6/-6)
modules/item/item.xq (+1/-1)
modules/json/json-csv.jq (+1/-1)
modules/json/json-xml.xq (+4/-4)
modules/org/jsoniq/www/function-library.xq (+4/-7)
modules/pregenerated/jsoniq-errors.xq (+1/-0)
modules/pregenerated/zorba-errors.xq (+1/-0)
modules/pregenerated/zorba-warnings.xq (+1/-0)
modules/schema/schema.xq (+1/-1)
modules/store/unordered-maps.xq (+1/-0)
modules/structured-items/node-position.xq (+1/-1)
modules/structured-items/node.xq (+1/-1)
modules/structured-items/reference.xq (+3/-3)
modules/w3c/pregenerated/xqt-errors.xq (+1/-0)
modules/xml/xml.xq (+3/-3)
modules/zorba-query/zorba-query.xq (+6/-6)
src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp (+11/-7)
src/diagnostics/diagnostic_list_xq.xq (+7/-0)
test/rbkt/ExpQueryResults/zorba/xqdoc/basic.xml.res (+3/-2)
test/rbkt/ExpQueryResults/zorba/xqdoc/content.xml.res (+3/-2)
test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq (+4/-2)

To merge this branch:

bzr merge lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal

Related bugs:

Bug #1187663: Broken links in DDL xqdoc	High	In Progress
Bug #1210442: Fix all bogus links in documentation	Critical	In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sorin Marian Nasoi			Approve on 2013-09-26
Chris Hillery			Approve on 2013-09-26
Review via email: mp+186036@code.staging.launchpad.net

Commit message

- removed all HTML pages from the list of files installed in the 'doc' component
- updated the install target for the C examples from 'doc' to 'c_example'
- delete previous version of the XQDoc documentation
- automatically generate language API's examples
- fixed documentation pages and examples for the Zorba API's
- fixed Doxygen documentation pages
- added support for \htmlonly and \htmlinclude
- fixed the left menu for the Doxygen documentation

Description of the change

https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_archive/+merge/187902
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_util_jvm/+merge/187908
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_system/+merge/187907
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_read_pdf/+merge/187906
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_geoproj/+merge/187905
https://code.launchpad.net/~zorba-coders/zorba/xqdoc_fixes_data_cleaning/+merge/187904

lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal updated on 2013-09-17

11617. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - fixed conformance XQDoc pages by using \htmlonly Doxygen tag. Please note that the code inside \htmlonly and \endhtmlonly has to be valid XHTML
11618. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - fixed JSONforXQuery and XQueryforJSON by using \htmlinclude Doxygen tag
11619. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - corrected DDL spec and added some line breaks in order to improve lisibility
- corrected XQuery Scripting Extension Proposal by using \htmlinclude Doxygen tag
11620. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - removed line from HTML page
11621. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - fixed language API links

Revision history for this message

Zorba Build Bot (zorba-buildbot) wrote on 2013-09-17:

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/zorba-documentation-merge-proposal/+merge/186036

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message

Zorba Build Bot (zorba-buildbot) wrote on 2013-09-17:

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/zorba-documentation-merge-proposal/+merge/186036 :
Votes: {'Pending': 1}

Revision history for this message

Zorba Build Bot (zorba-buildbot) wrote on 2013-09-17:

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/zorba-documentation-merge-proposal/+merge/186036

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/183/console to view the results.

lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal updated on 2013-09-26

11622. By sorin.marian.nasoi <email address hidden> on 2013-09-17: - fixed images tutorial
11623. By sorin.marian.nasoi <email address hidden> on 2013-09-18: - updated @project tag for:
- pregenerated modules
- HTTP Client module
11624. By sorin.marian.nasoi <email address hidden> on 2013-09-18: - updated @project TAG
11625. By sorin.marian.nasoi <email address hidden> on 2013-09-18: - merged lp:zorba trunk.
11626. By sorin.marian.nasoi <email address hidden> on 2013-09-19: - merged lp:zorba trunk
11627. By sorin.marian.nasoi <email address hidden> on 2013-09-19: - fixed the language declaration in XQDoc (XQuery of JSONiq)
11628. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - XQDoc Examples as copied in a location that is later on picked up by the new-website branch
- XQDoc Schemas and actual code for the modules is generated as XML and is also picked up by the new-website branch
11629. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - XQDoc fixes
11630. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - merged lp:zorba trunk

Revision history for this message

Chris Hillery (ceejatec) on 2013-09-26:

review: Approve

lp://staging/~zorba-coders/zorba/zorba-documentation-merge-proposal updated on 2013-09-26

11631. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - examples are also added as XML files
11632. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - updated @project tag according to zorba.io/modules
11633. By sorin.marian.nasoi <email address hidden> on 2013-09-26: - updated @project tags according to zorba.io
- updated code snippets with ACE syntax highlighting
- updated links to Doxygen documentation and to other modules
- updated module dependency graph