← Back to team overview

uonedb-qt team mailing list archive

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

 

Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/indexQueryExistToday into lp:u1db-qt.

Commit message:
Index and Query work today

Requested reviews:
  PS Jenkins bot (ps-jenkins): continuous-integration
  David Planella (dpm)
  U1DB Qt developers (uonedb-qt)
Related bugs:
  Bug #1328508 in U1DB Qt/ QML: "U1Db documentation needs update"
  https://bugs.launchpad.net/u1db-qt/+bug/1328508

For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/indexQueryExistToday/+merge/223710
-- 
https://code.launchpad.net/~kalikiana/u1db-qt/indexQueryExistToday/+merge/223710
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/indexQueryExistToday into lp:u1db-qt.
=== 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}.