Merge lp:~faenil/ubuntu-ui-toolkit/update_import_statement_docs into lp:ubuntu-ui-toolkit/staging

Proposed by Andrea Bernabei on 2016-01-07
Status: Merged
Approved by: Christian Dywan on 2016-01-07
Approved revision: 1797
Merged at revision: 1798
Proposed branch: lp:~faenil/ubuntu-ui-toolkit/update_import_statement_docs
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+2/-2)
2 files modified
documentation/ubuntu-components.qdoc (+1/-1)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
To merge this branch: bzr merge lp:~faenil/ubuntu-ui-toolkit/update_import_statement_docs
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2016-01-07
Christian Dywan (community) Approve on 2016-01-07
Zsombor Egri 2016-01-07 Pending
Review via email: mp+281878@code.launchpad.net

Description of the change

Update "Import Statement:" in docs of Ubuntu.Components.

Currently Developer's website shows "import Ubuntu.Components 1.2" and "since Ubuntu.Components 1.3" and that is confusing for all app developers.

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

Looks sensible.

review: Approve
Andrea Bernabei (faenil) wrote :

oops, wrong page :)

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc 2015-03-03 13:47:48 +0000
+++ documentation/ubuntu-components.qdoc 2016-01-07 15:02:48 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17/*!17/*!
18 \qmlmodule Ubuntu.Components 1.218 \qmlmodule Ubuntu.Components 1.3
19 \title Basic QML Types19 \title Basic QML Types
20 \nextpage {Ubuntu User Interface Toolkit}20 \nextpage {Ubuntu User Interface Toolkit}
21*/21*/
2222
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf 2015-09-01 11:59:13 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf 2016-01-07 15:02:48 +0000
@@ -29,7 +29,7 @@
29excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js29excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
30outputdir = $BLD/html30outputdir = $BLD/html
31outputformats = HTML31outputformats = HTML
32version = 1.232version = 1.3
33syntaxhighlighting = true33syntaxhighlighting = true
34sourceencoding = UTF-834sourceencoding = UTF-8
35outputencoding = UTF-835outputencoding = UTF-8

Subscribers

People subscribed via source and target branches