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

Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 81
Merged at revision: 75
Proposed branch: lp:~kalikiana/u1db-qt/concepts
Merge into: lp:u1db-qt
Diff against target: 41 lines (+5/-3)
3 files modified
documentation/concepts.qdoc (+1/-1)
documentation/overview.qdoc (+3/-1)
documentation/u1db.tutorial.qdoc (+1/-1)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/concepts
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+160077@code.launchpad.net

Commit message

Add Design Concepts to the overview

Description of the change

Add Design Concepts to the overview

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'documentation/concepts.qdoc'
2--- documentation/concepts.qdoc 2013-04-04 15:31:50 +0000
3+++ documentation/concepts.qdoc 2013-04-22 11:30:51 +0000
4@@ -21,7 +21,7 @@
5
6 /*!
7 \page concepts.html
8-\title U1DB Design Conctepts
9+\title Design Concepts
10
11 This concept guide will describe a wide variety of U1Db-Qt functionality and usage. It will cover:
12
13
14=== modified file 'documentation/overview.qdoc'
15--- documentation/overview.qdoc 2013-04-22 10:35:32 +0000
16+++ documentation/overview.qdoc 2013-04-22 11:30:51 +0000
17@@ -24,8 +24,10 @@
18
19 \part General Topics
20 \list
21- \li \l {U1Db-Qt Tutorial} gives a quick start guide from storing a document
22+ \li \l {Tutorial} gives a quick start guide from storing a document
23 to querying a database and displaying it in Ubuntu Components.
24+ \li \l {Design Concepts} provides an overview of the design and
25+ terminology.
26 \endlist
27
28 \part Document Storage
29
30=== modified file 'documentation/u1db.tutorial.qdoc'
31--- documentation/u1db.tutorial.qdoc 2013-04-22 10:35:32 +0000
32+++ documentation/u1db.tutorial.qdoc 2013-04-22 11:30:51 +0000
33@@ -2,7 +2,7 @@
34
35 \page tutorial.html
36
37-\title U1Db-Qt Tutorial
38+\title Tutorial
39
40
41 \chapter 1.0.0 Overview of U1Db-Qt

Subscribers

People subscribed via source and target branches

to all changes: