Merge lp:~kalikiana/u1db-qt/indexQueryExistToday into lp:u1db-qt

[Cris Dywan]

Index and Query work today

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-utopic-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-utopic-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/51/rebuild

review: Approve (continuous-integration)

Unmerged revisions

117. By Cris Dywan on 2014-06-19

Index and Query work today

=== modified file 'documentation/u1db.tutorial.qdoc'
--- documentation/u1db.tutorial.qdoc	2013-05-02 00:25:55 +0000
+++ documentation/u1db.tutorial.qdoc	2014-06-19 10:49:14 +0000
@@ -23,7 +23,7 @@
  
 \chapter 2.0.0 Database Element
 
-In U1Db-Qt, the Database element is the the central figure that works in conjunction with Document elements, and in the future indexing (currently under development), and querying (currently under development) elements.	 It is the Database element that defines the location of the data repository.
+In U1Db-Qt, the Database element is the the central figure that works in conjunction with Document elements, and indexing and querying elements.	 It is the Database element that defines the location of the data repository.
 
 A Database element is also a valuable tool for cases where specific data from a repository needs to be retrieved quickly, without indexing or querying ahead of time.	The 'contents' object associated with the Database element can be used together with base items such as TextField or TextArea and model-based items like ListView and \l {Standard}{ListItems.Standard}.