Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/navi into lp:ubuntu-ui-toolkit

[Cris Dywan]

Implement bread crumbs in API docs

Implement bread crumbs in API docs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/123/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/123/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Nice one, looking forward to seeing navigation!

A few things I've noticed:

1) There are some changes required to the docs done by the documentation/generate_html.sh script. However, I believe this script was put there to manually build the documentation for testing purposes. Thus it is not called during the package build and these changes will not be applied, if I understand it correctly:

51 +sed -r -i 's@("main-content">)@\1<ul class="breadcrumb">@g' html/*[a-z].html

2) When running the ./generate_html.sh script locally I get this warning:

$ ./generate_html.sh
/tmp/navi/modules/Ubuntu/Components/overview.qdoc:17: warning: Can't link to 'All Modules'

3) The tables on the home page should not be full width, there seems to be a regression on the layout of the home page. I.e.:

In this branch:
  http://people.canonical.com/~dpm/sdk-docs/html/ubuntu-module.html

Expected:
  http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/overview-ubuntu-sdk.html

4) There are no breadcrumbs on the "Basic QML Types" page, and thus no way to go back to the home page [1]

  http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html

5) The same for the pages for topics such as theming: there are no breadcrumbs there and one cannot go back to the home page [1]

  http://people.canonical.com/~dpm/sdk-docs/html/theming-components.html

6) Just a nitpick, but if technically possible, 'ubuntu' should be capitalized as 'Ubuntu' on the 'Modules ubuntu' line at the top of the home page [1].

[1] http://people.canonical.com/~dpm/sdk-docs/html/ubuntu-module.html

review: Needs Fixing

[Cris Dywan (kalikiana)]

1)2) Rebased on the 'online' branch and moved the sed into a script to be called from 'make docs'.

3) I apologize, it came up when discussing the new styling and I thought it was a bug, reverted that.

4)5)6) Fixed

[David Planella (dpm)]

Great, thanks. There are still a couple of things. I'm not sure if they're all related to the same issue, but here are the ones that I've noticed:

1) Breadcrumbs appear reversed:

I.e.:
http://people.canonical.com/~dpm/sdk-docs/html/theming-components.html

- Expected: "Overview > Theming Ubuntu Components"
- Actual: "Theming Ubuntu Components Overview >"

2) Last breadcrumb missing:

http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html

- Expected: "Basic QML Types"
- Actual: ""

3) Unrelated breadcrumbs:

http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html

- Expected: "Overview > Basic QML Types"
- Actual: "Resolution Independence > Overview" (reversed as per pint 1), but notice the unrelated "Resolution Independence" here)

4) Inconsistent navigation

In some pages the home page is called "Overview >", whereas in others it is "Modules > Ubuntu". E.g.

- "Overview": http://people.canonical.com/~dpm/sdk-docs/html/all-modules.html
- "Ubuntu": http://people.canonical.com/~dpm/sdk-docs/html/ubuntu-module.html

review: Needs Fixing

[David Planella (dpm)]

5) Duplicate breadcrumbs

See the bottom of the page at [1]

6) Wider top margin of breadcrumb underline

Compare the distance between the breadcrumb text and its underline on [1] and [2] and see the difference.

[1] http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html
[2] http://people.canonical.com/~dpm/sdk-docs/html/ubuntu-module.html

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/125/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/125/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

6) Wider top margin of breadcrumb underline
cf. qmlmodule-ubuntu-components0-ubuntu-components-0-1.html ubuntu-module.html resolution-independence.html

Depending on the page a <p> is used or isn't by the generated HTML, which I added work-arounds for. It should be better now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/128/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/128/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

3) qmlmodule-ubuntu-components0-ubuntu-components-0-1.html
- Expected: "Overview > Basic QML Types"
- Actual: "Resolution Independence > Overview" unrelated "Resolution Independence" here)

Fixed

[Cris Dywan (kalikiana)]

Re-cap of the currently unresolved issues:

1) theming-components.html
- Expected: "Overview > Theming Ubuntu Components"
- Actual: "Theming Ubuntu Components Overview >"
5) Duplicate breadcrumbs in qmlmodule-ubuntu-components0-ubuntu-components-0-1.html
2) qmlmodule-ubuntu-components0-ubuntu-components-0-1.html
- Expected: "Basic QML Types"
- Actual: ""

Here I'm running into wrongly generated HTML which can't be fixed easily with a regular expression. Unsure.

4) Inconsistent navigation
In some pages the home page is called "Overview >", whereas in others it is "Modules > Ubuntu"
cf. all-modules.html ubuntu-module.html

Overview is not the same Modules, which is actually empty at this point, it's qdoc standard behavior to generate theses pages in this way.
I'd like to know what you may expect here instead. An option might be to forcibly hide it if we don't have a use for it (yet).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/131/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/131/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

What I meant was consistency in the breadcrumb names. Right now, in HTML page terms, we've got the following:

 - all-modules.html > ubuntu-module.html

On http://people.canonical.com/~dpm/sdk-docs/html/all-modules.html it's:

 1) All Modules > Overview

On http://people.canonical.com/~dpm/sdk-docs/html/ubuntu-module.html

 2) Modules > Ubuntu

Both 1) and 2) refer to the same locations, yet different names are used for the breadcrumbs. We should pick one of the naming schemes and stick to that.

[Cris Dywan (kalikiana)]

I think you've got an outdated version there, let me push the re-based branch to be sure we're on the same page (no pun intended).

[Cris Dywan (kalikiana)]

I apologize, qmake sucks and again fooled me into seeing something that shouldn't be there. It somehow changes between generating and not generating that page without any obvious action taken.

[Cris Dywan (kalikiana)]

There must be a race condition and I can't track down why. I tried using && instead of ; in the .pro file to no avail.

[Cris Dywan (kalikiana)]

Reported the race condition upstream https://bugreports.qt-project.org/browse/QTBUG-31578

For now the modules page is disabled and that also settles the naming inconsistency.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/146/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Updated online docs for testing at http://people.canonical.com/~dpm/sdk-docs/html/overview-ubuntu-sdk.html

[David Planella (dpm)]

As requested by Christian, here's the feedback after reviewing. Here are the existing known issues:

1) Breadcrumbs appear reversed: http://people.canonical.com/~dpm/sdk-docs/html/theming-components.html
2) Last breadcrumb missing: http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html
5) Duplicate breadcrumbs in http://people.canonical.com/~dpm/sdk-docs/html/qmlmodule-ubuntu-components0-ubuntu-components-0-1.html

And here is one I've noticed was fixed but then manifested in a different way:

4) Inconsistent navigation

The root page is called "Overview" in the breadcrumbs:
http://people.canonical.com/~dpm/sdk-docs/html/resolution-independence.html

But on the root page itself, it's called "Ubuntu User Interface Toolkit" in the breadcrumbs:
http://people.canonical.com/~dpm/sdk-docs/html/overview-ubuntu-sdk.html

I'd recommend settling on one of the two (either "Overview" or "Ubuntu User Interface Toolkit") and use it throughout the docs.

[Cris Dywan (kalikiana)]

1,2,5) These are non-trivial qdoc bugs, the generated HTML is wrong. I'm reluctant to add special cases that would require magic command lines for all new doc pages. Btw Qt5 docs are differently produced, if you see bread crumbs there that's not something we can use (short of a complete rethink of how our docs are generated).

4) I guess I didn't follow your train of thought before. I'll stop using the term "Overview".

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/navi]

525. By Cris Dywan on 2013-06-12

Stop using Overview to refer to the contents page

526. By Cris Dywan on 2013-06-12

Remove navigation to Basic QML Types from RI

527. By Cris Dywan on 2013-06-12

Change the bread crumb CSS to correct the order

528. By Cris Dywan on 2013-06-12

Replace Basic QML Types with UUITK in component pages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:527
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/167/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/167/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/168/rebuild

review: Approve (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/navi]

529. By Cris Dywan on 2013-06-25

Use JQuery to re-order bread crumbs

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/65/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/208/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Looks great now, thank you for your excellent work on this. This is going to be a major improvement in the API documentation for app developers.

Here are the online pages generated from the latest branch revision:

http://people.canonical.com/~dpm/sdk-docs/breadcrumbs-final/overview-ubuntu-sdk.html

review: Approve

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/navi]

530. By Cris Dywan on 2013-06-27

Add a license header to breadcrumbs.js

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/85/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/228/rebuild

review: Approve (continuous-integration)

=== added file 'documentation/css/breadcrumbs.js'
--- documentation/css/breadcrumbs.js	1970-01-01 00:00:00 +0000
+++ documentation/css/breadcrumbs.js	2013-06-27 10:58:25 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready(function(){
+    var ul = $("ul.breadcrumb");
+    var li = ul.children("li:has(a)").remove();
+    ul.prepend(li);
+});

=== modified file 'documentation/css/scratch.css'
--- documentation/css/scratch.css	2013-06-25 05:36:50 +0000
+++ documentation/css/scratch.css	2013-06-27 10:58:25 +0000
@@ -1,16 +1,12 @@
 body {
 	margin: 0;
 }
-
-
 div.toc ul {
 	padding: 0;
 }
-
 div.toc li {
 	margin-bottom: 3px;
 }
-
 h1.title {
 	font-size: 36px;
 	line-height: 1.1;
@@ -32,7 +28,6 @@
 	border-radius: 0;
         white-space: pre-wrap;
 }
-
 .annotated td {
 	padding: 0.8em 1em 0.3em;
 }
@@ -60,3 +55,34 @@
     top: 100px;
     width: 250px;
 }
+.breadcrumb {
+	position: relative;
+	left: -270px;
+	top: 30px;
+	width: auto;
+	padding-bottom: 30px;
+	margin-bottom: 30px;
+	float:left;
+}
+.breadcrumb li {
+	float: left;
+	margin-right: 8px;
+}
+.breadcrumb a:link,
+.breadcrumb a:visited {
+	color: #AEA79F;
+}
+.breadcrumb a:after {
+	content: '\0000a0\0000a0 >';
+}
+.title {
+	margin-top: 50px;
+	clear:both;
+}
+.breadcrumb + .toc {
+	top: 170px;
+}
+.breadcrumb p {
+    display: inline;
+}
+

=== added file 'documentation/fix-markup.sh'
--- documentation/fix-markup.sh	1970-01-01 00:00:00 +0000
+++ documentation/fix-markup.sh	2013-06-27 10:58:25 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+sed -r -i 's@("main-content">)@\1<ul class="breadcrumb">@g' $1/html/*.html
+sed -r -i 's@(<div class="toc">|<h1 class="title">)@</ul>\1@g' $1/html/*.html
+sed -r -i 's@(</p>)<p/>@\1@g' $1/html/*.html
+sed -r -i 's@(<a class="(next|prev)Page" href=".+">)(.+)(</a>)@<li>\1\3\4</li>@g' $1/html/*.html
+sed -r -i 's@(href="qmlmodule-ubuntu-components0-ubuntu-components-0-1.html">Basic QML Types)@href="overview-ubuntu-sdk.html">Ubuntu User Interface Toolkit@g' $1/html/*.html

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2013-06-24 09:42:43 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2013-06-27 10:58:25 +0000
@@ -17,5 +17,4 @@
 outputencoding = UTF-8
 
 HTML.templatedir = .
-HTML.nobreadcrumbs = "true"
 HTML.endheader = "</head>\n"

=== modified file 'documentation/ubuntu-ui-toolkit-offline.qdocconf'
--- documentation/ubuntu-ui-toolkit-offline.qdocconf	2013-05-02 19:46:36 +0000
+++ documentation/ubuntu-ui-toolkit-offline.qdocconf	2013-06-27 10:58:25 +0000
@@ -1,6 +1,8 @@
 include(ubuntu-ui-toolkit-common.qdocconf)
+HTML.nobreadcrumbs = "true"
 
 HTML.stylesheets = \
+    documentation/css/breadcrumbs.js \
     documentation/css/reset.css \
     documentation/css/qtquick.css \
     documentation/css/base.css \

=== modified file 'documentation/ubuntu-ui-toolkit-online.qdocconf'
--- documentation/ubuntu-ui-toolkit-online.qdocconf	2013-05-27 08:45:27 +0000
+++ documentation/ubuntu-ui-toolkit-online.qdocconf	2013-06-27 10:58:25 +0000
@@ -2,7 +2,11 @@
 include(ubuntu-appdev-site-header.qdocconf)
 include(ubuntu-appdev-site-footer.qdocconf)
 
+HTML.nobreadcrumbs = "false"
+
 HTML.headerstyles = \
+  "<script src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js\"></script>\n" \
+  "<script type=\"text/javascript\" src=\"style/breadcrumbs.js\"></script>\n" \
   "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://fonts.googleapis.com/css?family=Ubuntu:400,400italic\">\n" \
   "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://fonts.googleapis.com/css?family=Ubuntu+Mono:400\">\n" \
   "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/reset.css\" />\n" \

=== added file 'modules/Ubuntu/Components/all-modules.qdoc'
--- modules/Ubuntu/Components/all-modules.qdoc	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/all-modules.qdoc	2013-06-27 10:58:25 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*!
+    \page all-modules.html
+    \title All Modules
+    \nextpage {Ubuntu User Interface Toolkit}
+*/
+

=== modified file 'modules/Ubuntu/Components/overview.qdoc'
--- modules/Ubuntu/Components/overview.qdoc	2013-06-25 13:42:22 +0000
+++ modules/Ubuntu/Components/overview.qdoc	2013-06-27 10:58:25 +0000
@@ -17,7 +17,6 @@
 /*!
      \page overview-ubuntu-sdk.html overview
      \title Ubuntu User Interface Toolkit
-     \contentspage {Ubuntu User Interface Toolkit} {Contents}
 
      \part General Topics
      \list
@@ -30,7 +29,7 @@
      for them to behave well on a variety of devices.
      \endlist
 
-     \part Base Items
+     \part Basic QML Types
      Available through:
      \code
          import Ubuntu.Components 0.1

=== modified file 'modules/Ubuntu/Components/resolution-independence.qdoc'
--- modules/Ubuntu/Components/resolution-independence.qdoc	2013-04-20 01:52:21 +0000
+++ modules/Ubuntu/Components/resolution-independence.qdoc	2013-06-27 10:58:25 +0000
@@ -17,7 +17,7 @@
 /*!
     \page resolution-independence.html resolution-independence
     \title Resolution Independence
-    \contentspage {Ubuntu User Interface Toolkit}
+    \nextpage {Ubuntu User Interface Toolkit}
 
     The objective of resolution independence is to make it easy for graphical
     user interfaces in Ubuntu to scale to all the form factors that Ubuntu

=== modified file 'modules/Ubuntu/Components/ubuntu-components-theming.qdoc'
--- modules/Ubuntu/Components/ubuntu-components-theming.qdoc	2013-03-13 09:16:25 +0000
+++ modules/Ubuntu/Components/ubuntu-components-theming.qdoc	2013-06-27 10:58:25 +0000
@@ -18,6 +18,7 @@
   \page theming-components.html
   \ingroup theming-description
   \title Theming Ubuntu Components
+  \nextpage {Ubuntu User Interface Toolkit}
 
   \b{The theming is under heavy development, therefore changes may occur leaving
   the documentation out of date.}

=== modified file 'modules/Ubuntu/Components/ubuntu-components.qdoc'
--- modules/Ubuntu/Components/ubuntu-components.qdoc	2013-02-26 10:30:04 +0000
+++ modules/Ubuntu/Components/ubuntu-components.qdoc	2013-06-27 10:58:25 +0000
@@ -16,5 +16,6 @@
 
 /*!
     \qmlmodule Ubuntu.Components 0.1
-    \title Base Items
+    \title Basic QML Types
+    \nextpage {Ubuntu User Interface Toolkit}
 */

=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2013-06-04 09:42:07 +0000
+++ ubuntu-sdk.pro	2013-06-27 10:58:25 +0000
@@ -43,5 +43,6 @@
 docs.commands += test ! -s $$DOC_PATH/qdoc.err || exit 1;
 docs.commands += qhelpgenerator -o "$$DOC_PATH/html/ubuntuuserinterfacetoolkit.qch" "$$DOC_PATH/html/ubuntuuserinterfacetoolkit.qhp";
 docs.commands += qdoc $$DOC_PATH/ubuntu-ui-toolkit-online.qdocconf;
+docs.commands += $$DOC_PATH/fix-markup.sh $$DOC_PATH;
 QMAKE_EXTRA_TARGETS += docs