Merge lp:~ken-vandine/content-hub/qdoc into lp:~content-hub-team/content-hub/trunk

[Ken VanDine]

Added qdoc docs for QML bindings

Added qdoc docs for QML bindings

[Günter Schwann (schwann)]

Generates a nice documentation for me

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/content-hub-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/content-hub-ci/99/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/libcontent-hub-doc.install'
--- debian/libcontent-hub-doc.install	2013-08-13 13:20:55 +0000
+++ debian/libcontent-hub-doc.install	2013-10-23 12:34:58 +0000
@@ -1,1 +1,1 @@
-usr/share/doc/content-hub/html
+usr/share/doc/content-hub

=== modified file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	2013-07-15 11:07:50 +0000
+++ doc/CMakeLists.txt	2013-10-23 12:34:58 +0000
@@ -14,17 +14,22 @@
 #
 # Authored by: Thomas Voss <[e-mail]>
 
+add_custom_target(doc ALL)
+
 find_package(Doxygen)
 
 if(DOXYGEN_FOUND)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in 
     ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-  add_custom_target(doc ALL 
+  add_custom_target(cppdoc ALL 
     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating API documentation with Doxygen" VERBATIM)
   install(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-    DESTINATION share/doc/content-hub)
-endif(DOXYGEN_FOUND)
\ No newline at end of file
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}/cpp)
+  add_dependencies(doc cppdoc)
+endif(DOXYGEN_FOUND)
+
+add_subdirectory(qml)

=== added directory 'doc/qml'
=== added file 'doc/qml/CMakeLists.txt'
--- doc/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qml/CMakeLists.txt	2013-10-23 12:34:58 +0000
@@ -0,0 +1,25 @@
+# add a target to generate API documentation with qdoc
+FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
+if(QDOC_EXECUTABLE)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-content-hub.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-content-hub.qdocconf @ONLY)
+add_custom_target(qmldoc
+${QDOC_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-content-hub.qdocconf
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+COMMENT "Generating QML API documentation with qdoc" VERBATIM
+)
+
+# copy stylesheet files into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/css"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+  DESTINATION ${CMAKE_INSTALL_DOCDIR}/qml/html
+)
+
+add_dependencies(doc qmldoc)
+
+endif(QDOC_EXECUTABLE)
+
+

=== added directory 'doc/qml/css'
=== added file 'doc/qml/css/base.css'
--- doc/qml/css/base.css	1970-01-01 00:00:00 +0000
+++ doc/qml/css/base.css	2013-10-23 12:34:58 +0000
@@ -0,0 +1,638 @@
+/**
+* Ubuntu Developer base stylesheet
+*
+* A base stylesheet containing site-wide styles
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards
+* @copyright 2011 Canonical Ltd.
+*/
+
+/**
+* @section Global
+*/
+
+body {
+	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+	font-size: 13px;
+	line-height: 1.4;
+	color: #333;
+}
+a {
+	color: #dd4814;
+	text-decoration: none;
+	outline: 0;
+}
+p, dl {
+	margin-bottom: 10px;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+code{
+	padding: 10px;
+	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
+	background-color: #fdf6f2;
+	display: block;
+	margin-bottom: 10px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+h1 {
+	font-size: 36px;
+	line-height: 1.1;
+	margin-bottom: 20px;
+}
+article h1,
+h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin-bottom: 14px;
+}
+h3 {
+	font-size: 16px;
+	line-height: 1.3;
+	margin-bottom: 8px;
+}
+h4 {
+	font-weight: bold;
+}
+
+time {
+	color:#999;
+}
+
+/**
+* @section Structure
+*/
+
+.header-login,
+.header-navigation div,
+.header-content div {
+	margin: 0 auto;
+	width: 940px;
+}
+
+.header-content h1{
+	background-color:#ffffff;
+	display:inline-block;
+}
+
+.header-content h2{
+	background-color:#ffffff;
+	display:table;
+}
+
+.header-login ul {
+	margin: 4px 0;
+	float: right;
+}
+.header-login li {
+	margin-right: 10px;
+	float: left;
+}
+.header-login a {
+	color: #333;
+}
+.header-navigation {
+	border-top: 2px solid #dd4814;
+	border-bottom: 2px solid #dd4814;
+	background-color: #fff;
+	height: 54px;
+	clear: right;
+	overflow: hidden;
+}
+.header-navigation nav ul {
+	border-right: 1px solid #dd4814;
+	float: right;
+}
+.header-navigation nav li {
+	border-left: 1px solid #dd4814;
+	float: left;
+	height: 54px;
+}
+.header-navigation nav a {
+	padding: 18px 14px 0;
+	font-size: 14px;
+	display: block;
+	height: 36px;
+}
+.header-navigation nav a:hover {
+	background-color: #fcece7;
+}
+.header-navigation nav .current_page_item a,
+.header-navigation nav .current_page_parent a,
+.header-navigation nav .current_page_ancestor a {
+	background-color: #dd4814;
+	color: #fff;
+}
+.header-navigation input {
+	margin: 12px 10px 0 10px;
+	padding: 5px;
+	border-top: 1px solid #a1a1a1;
+	border-right: 1px solid #e0e0e0;
+	border-bottom: 1px solid #fff;
+	border-left: 1px solid #e0e0e0;
+	width: 90px;
+	font-style: italic;
+	color: #ccc;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+	border-radius: 3px;
+		-moz-box-shadow: inset 0 1px 1px #e0e0e0;
+	   -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
+   box-shadow: inset 0 1px 1px #e0e0e0;
+}
+.header-navigation h2 {
+	margin: 18px 0 0 6px;
+	text-transform: lowercase;
+	font-size: 22px;
+	color: #dd4814;
+	float: left;
+}
+.header-navigation .logo-ubuntu {
+	margin-top: 12px;
+	float: left;
+}
+.header-content .header-navigation-secondary {
+	margin-bottom: 40px;
+	padding: 0;
+	position: relative;
+	z-index: 2;
+}
+.header-navigation-secondary div {
+	padding: 0;
+	border: 2px solid #dd4814;
+		-moz-border-radius: 0px 0px 4px 4px;
+		-webkit-border-radius: 0px 0px 4px 4px;
+	border-radius: 0px 0px 4px 4px;
+	background: #fff;
+	border-top: 0px;
+	width: 936px;
+}
+.header-navigation-secondary nav li {
+	float: left;
+}
+.header-navigation-secondary nav li a {
+	color: #333;
+	display: block;
+	height: 25px;
+	padding: 8px 8px 0;
+}
+.header-navigation-secondary nav li:hover,
+.header-navigation-secondary nav .current_page_item a {
+	background: url("../img/sec-nav-hover.gif");
+}
+.header-content {
+	padding-bottom: 30px;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 1px 3px #e0e0e0;
+		-webkit-box-shadow: 0 1px 3px #e0e0e0;
+	box-shadow: 0 1px 3px #e0e0e0;
+	margin-bottom: 3px;
+	position: relative;
+	overflow: hidden;
+}
+footer {
+	padding: 10px 10px 40px 10px;
+	position: relative;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+	font-size: 12px;
+	background: url("../img/background-footer.png") repeat scroll 0 0 #f7f6f5;
+}
+footer div {
+	margin: 0 auto;
+    padding: 0 10px;
+    width: 940px;
+}
+footer a {
+	color: #000;
+}
+footer nav ul {
+	margin: 10px 17px 30px 0;
+	width: 172px;
+	display: inline-block;
+	vertical-align: top;
+	height: auto;
+	zoom: 1;
+	*display: inline;
+}
+footer nav ul.last {
+	margin-right: 0;
+}
+footer nav li {
+	margin-bottom: 8px;
+}
+footer nav li:first-child {
+	font-weight: bold;
+}
+footer p {
+	margin-bottom: 0;
+}
+#content {
+	padding-top: 35px;
+}
+.arrow-nav {
+	display: none;
+	position: absolute;
+	top: -1px;
+	z-index: 3;
+}
+.shadow {
+	margin: 30px 0 3px 0;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 2px 3px #e0e0e0;
+		-webkit-box-shadow: 0 2px 3px #e0e0e0;
+	box-shadow: 0 2px 3px #e0e0e0;
+	height: 3px;
+}
+
+/**
+* @section Site-wide
+*/
+
+#content h2{
+	font-size:24px;
+}
+
+.box-orange {
+	padding: 10px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-orange .link-action-small {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.link-bug {
+	margin-left: 10px;
+	color: #999;
+}
+.link-action {
+	float: left;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.link-action2 {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+	line-height: 1.3;
+}
+.link-action2 span{
+	display:block;
+	float:left;
+}
+.link-action2 .cta-left{
+	background:url(../img/button-cta-left.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+.link-action2 .cta-center{
+	background:url(../img/button-cta-slice.png) repeat-x;
+	line-height:45px;
+	height:48px;
+}
+.link-action2 .cta-right{
+	background:url(../img/button-cta-right.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+
+.link-action-small {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+}
+.link-action-small span{
+	display:block;
+	float:left;
+	height:42px;
+}
+.link-action-small .cta-left{
+	background:url(../img/button-cta-left-small.png) no-repeat;
+	width:19px;
+}
+.link-action-small .cta-center{
+	background:url(../img/button-cta-slice-small.png) repeat-x;
+	line-height:42px;
+}
+.link-action-small .cta-right{
+	background:url(../img/button-cta-right-small.png) no-repeat;
+	width:19px;
+}
+
+.link-action:active {
+	position: relative;
+	top: 1px;
+}
+.link-action2:active {
+	position: relative;
+	top: 1px;
+}
+.link-action-small:active {
+	position: relative;
+	top: 1px;
+}
+.list-bullets li {
+	margin-bottom: 10px;
+	list-style: disc;
+	list-style-position: inside;
+}
+.box {
+	margin-bottom: 30px;
+	padding: 15px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-padded {
+	margin-bottom: 30px;
+	padding: 5px;
+	border: 2px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background: url("../img/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
+	overflow: hidden;
+}
+.box-padded h3 {
+	 margin: 5px 0 10px 5px;
+}
+.box-padded div {
+	padding: 10px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: #fff;
+	overflow: hidden;
+}
+.box-padded li {
+	padding: 0 10px;
+	float: left;
+	width: 211px;
+	border-right: 1px dotted #aea79f;
+}
+.box-padded li.first {
+	padding: 0;
+	margin-bottom: 0;
+}
+.box-padded li.last {
+	border: 0;
+	width: 217px;
+}
+.box-padded img {
+	margin: 0 10px 50px 0;
+	float: left;
+		-moz-border-radius: 8px;
+		-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+.box-clear {
+	margin-bottom: 40px;
+}
+.box-clear .grid-4.first {
+	margin-right: 15px;
+	padding-right: 15px;
+}
+.box-clear .grid-4 {
+	margin-left: 0;
+	margin-right: 10px;
+	padding-right: 10px;
+	width: 298px;
+}
+.box-clear time {
+	display: block;
+	border-bottom: 1px dotted #aea79f;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+.box-clear div.first {
+	border-right: 1px dotted #aea79f;
+}
+.box-clear a {
+	display: block;
+}
+.box-clear .rss {
+	background: url("../img/rss.jpg") no-repeat scroll 0 center;
+	padding-left: 20px;
+}
+.box-clear .location {
+	display: block;
+	margin-bottom: 1px;
+}
+.box-clear .last {
+	margin: 0;
+	padding-right: 0;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: 293px;
+}
+
+/* Widgets */
+
+.ui-state-focus {
+	outline: none;
+}
+.ui-accordion {
+	border-bottom: 1px dotted #aea79f;
+}
+.ui-accordion a {
+	display: block;
+}
+.ui-accordion h3 {
+	margin-bottom: 0;
+	border-top: 1px dotted #aea79f;
+	position: relative;
+	font-size: 13px;
+	font-weight: bold;
+}
+.ui-accordion h3 a {
+	padding: 10px 0;
+	color: #333;
+}
+.ui-accordion h4 {
+	margin-bottom: 5px;
+}
+.ui-accordion div fieldset {
+	padding-bottom: 5px;
+}
+.ui-accordion div li,
+.ui-accordion div input {
+	margin-bottom: 10px;
+}
+.ui-accordion .ui-icon {
+	position: absolute;
+	top: 15px;
+	right: 0;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background: url("../img/icon-accordion-inactive.png") 0 0 no-repeat transparent;
+}
+.ui-accordion .ui-state-active .ui-icon {
+	background-image: url("../img/icon-accordion-active.png");
+}
+.ui-accordion .current_page_item a {
+	color: #333;
+}
+.container-tweet {
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	padding: 10px 10px 10px;
+	background-color: #f7f7f7;
+}
+.container-tweet .tweet-follow {
+	margin-top: 10px;
+	margin-bottom: -10px;
+	padding-left: 55px;
+	padding-bottom: 6px;
+	background: url("../img/tweet-follow.png") 0 5px no-repeat;
+	display: block;
+}
+.container-tweet .tweet-follow span {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.2;
+	display: block;
+}
+.tweet a {
+	display: inline;
+}
+.tweet .tweet_text {
+	padding: 10px;
+	background-color: #fff;
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	border: 1px solid #dd4814;
+	font-size: 16px;
+	display: block;
+	clear: both;
+}
+.tweet.tweet-small .tweet_text {
+	font-size: inherit;
+}
+.tweet .tweet_text a {
+	color: #333;
+}
+.tweet .tweet_time,
+.tweet .tweet_user_and_time {
+	padding: 15px 0 10px 0;
+	position: relative;
+	top: -2px;
+	background: url("../img/tweet-arrow.png") no-repeat;
+	display: block;
+}
+.tweet .tweet_odd .tweet_time,
+.tweet .tweet_odd .tweet_user_and_time {
+	background-position: right 0;
+	float: right;
+}
+.tweet .tweet_even .tweet_time,
+.tweet .tweet_even .tweet_user_and_time {
+	background-position: left 0;
+	float: left;
+}
+
+/* Search */
+
+#content .list-search li {
+	list-style-type:none;
+	border:0px;
+	margin-bottom: 15px;
+	padding-top: 15px;
+}
+
+/* Blog */
+
+.blog-article #nav-single {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+.blog-article #nav-single .nav-next {
+	float: right;
+}
+.blog-article article header .entry-meta {
+	margin-bottom: 20px;
+}
+.blog-article article .entry-meta {
+	color: #999;
+}
+.blog-article #respond form input[type="submit"] {
+	float: left;
+	cursor: pointer;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-left: 3px solid #e6633a;
+	border-right: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.blog-article #respond form input[type="submit"]:active {
+	position: relative;
+	top: 1px;
+}
+
+.alignnone{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignleft{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignright{
+    float:right;
+   margin:10px 0 10px 20px;
+}
+
+.aligncenter{
+	float:left;
+    margin:10px 20px 10px 0;
+}
+.entry-content h2, .entry-content h3{
+    margin-top:20px;
+}
+.entry-content ul li{
+    list-style-type: circle;
+    margin-left:16px;
+}
+
+.entry-content hr{
+	border:none;
+	border-top: 1px dotted #AEA79F;
+}

=== added file 'doc/qml/css/qtquick.css'
--- doc/qml/css/qtquick.css	1970-01-01 00:00:00 +0000
+++ doc/qml/css/qtquick.css	2013-10-23 12:34:58 +0000
@@ -0,0 +1,772 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    ul li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1.title
+    {
+        font-weight: bold;
+        font-size: 150%;
+    }
+    h0
+    {
+        font-weight: bold;
+        font-size: 130%;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin: 0 1.5em 0 1.5em;
+        font-family: ubuntu;
+        line-height: normal
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 1em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: black;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #202020;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-left: 5px;
+        margin-top: 5px;
+        margin-bottom: 0.5em;
+    }
+
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 130%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 110%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .toc
+    {
+        font-size: 80%
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
+
+
+/* modify the TOC layouts */
+div.toc ul {
+    padding-left: 20px;
+}
+div.toc li {
+    padding-left: 4px;
+}
+/* Remove the border around images*/
+a img
+{
+    border:none;
+}
+
+/*Add styling to the front pages*/
+
+.threecolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.threecolumn_piece
+{
+    display: inline-block;
+    margin-left: 78px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 25.5%;
+}
+div.threecolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.threecolumn_piece p {
+    margin-bottom: 7px;
+    color: #5C626E;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.threecolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.threecolumn_piece a {
+    font-weight: normal;
+}
+/* Add style to guide page*/
+.fourcolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.fourcolumn_piece
+{
+    display: inline-block;
+    margin-left: 35px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 21.3%;
+}
+div.fourcolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.fourcolumn_piece p {
+    margin-bottom: 7px;
+    color: #40444D;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.fourcolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.fourcolumn_piece a {
+    font-weight: normal;
+}

=== added file 'doc/qml/css/reset.css'
--- doc/qml/css/reset.css	1970-01-01 00:00:00 +0000
+++ doc/qml/css/reset.css	2013-10-23 12:34:58 +0000
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file

=== added file 'doc/qml/css/scratch.css'
--- doc/qml/css/scratch.css	1970-01-01 00:00:00 +0000
+++ doc/qml/css/scratch.css	2013-10-23 12:34:58 +0000
@@ -0,0 +1,61 @@
+body {
+	margin: 0;
+}
+
+
+div.toc ul {
+	padding: 0;
+}
+
+div.toc li {
+	margin-bottom: 3px;
+}
+
+h1.title {
+	font-size: 36px;
+	line-height: 1.1;
+	font-weight: normal;
+}
+h0, h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin: 14px 0;
+	font-weight: normal;
+	display: block;
+}
+a:hover {
+	color: #dd4814;
+	text-decoration: underline;
+	outline: 0;
+}
+table, pre {
+	border-radius: 0;
+}
+
+.annotated td {
+	padding: 0.8em 1em 0.3em;
+}
+.wrapper {
+	width: 940px;
+	margin: 0 auto;
+}
+.main-content {
+	width: 668px;
+	position: relative;
+	left: 270px;
+}
+.title {
+	margin-left: -270px;
+	margin-top: 30px;
+	margin-bottom: 50px;
+}
+.toc {
+	margin-left: -270px;
+	font-size: 100%;
+	margin-bottom: 40px;
+    padding: 0;
+    z-index: 2;
+    position: absolute;
+    top: 100px;
+    width: 250px;
+}

=== added directory 'doc/qml/pages'
=== added file 'doc/qml/pages/mainpage.qdoc'
--- doc/qml/pages/mainpage.qdoc	1970-01-01 00:00:00 +0000
+++ doc/qml/pages/mainpage.qdoc	2013-10-23 12:34:58 +0000
@@ -0,0 +1,125 @@
+/*!
+\page index.html overview
+\title Ubuntu Content API
+
+\contentspage {Ubuntu Content API} {Contents}
+
+\part Content Management & Exchange
+
+\chapter Introduction
+
+Unity and the overall Ubuntu experience put heavy emphasis on the
+notion of content, with Unity’s dash offering streamlined access to
+arbitrary content, both local to the device or online. More to this,
+Unity’s dash is the primary way of surfacing content on mobile form
+factors without the need to access individual applications and their
+respective content silos. The content-hub deals with
+application-specific content management and implements an architecture
+that allows an app to define its own content silo, exchange content
+with other applications/the system, and a way to provide the user with
+content picking functionality.
+
+\section1 Definitions
+To ease conversations, we start over with a set of definitions:
+
+\list
+  \li \b {Content item}: A content item is an entity that consists of meta-data
+and data. E.g., an image is a content item, where the actual pixels
+are the data, and information like size, image format, bit depth,
+location etc. is considered meta data. See also \l ContentItem.
+
+  \li \b {Content types}: A set of well-known content types. E.g., images or
+   music files. See also \l {ContentType}
+
+  \li \b {Content set}: A set of unique content items. Can be considered a
+   content item itself, e.g., in the case of playlists.
+
+  \li \b {Content owner}: The unique owner of a content item. A content item
+   has to be owned by exactly one app. See also \l {ContentPeer}
+
+  \li \b {Content store}: A container (think of it as a top-level folder in
+   the filesystem) that contains content items of a certain
+   type. Different stores exist for different scopes, where scope
+   refers to either system-wide, user-wide or app-specific storage
+   locations. See also \l {ContentStore}
+
+  \li \b {Content transfer}: Transferring content item/s to and from a source
+   or destination. A transfer is uniquely defined by a source, destination,
+   direction (import or export), and a set of items that should be exchanged.
+   See also \l {ContentTransfer}
+
+  \li \b {Content picking}: Operation that allows a user to select content for
+   subsequent import from a content source (e.g., an application). The
+   content source is responsible for providing a UI to the user.
+\endlist
+
+\section1 Architectural Overview
+
+The architecture enforces complete application isolation, both in
+terms of content separation, sandboxing/confinement and in terms of
+the application lifecycle. As we cannot assume that two apps that want
+to exchange content are running at the same time, a system-level
+component needs to mediate and control the content exchange operation,
+making sure that neither app instance assumes the existence of the
+other one. We refer to this component as the content hub. \sa {ContentHub}
+
+\section1 Example usage - Importing Pictures
+
+\qml
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Content 0.1
+
+Rectangle {
+  id: root
+  Button {
+      text: "Import from default"
+       onClicked: {
+           var peer = ContentHub.defaultSourceForType(ContentType.Pictures);
+           activeTransfer = ContentHub.importContent(ContentType.Pictures, peer);
+      }
+  }
+  Button {
+      text: "Import from a selectable list"
+       onClicked: {
+           activeTransfer = ContentHub.importContent(ContentType.Pictures);
+           activeTransfer.selectionType =ContentTransfer.Multiple;
+           activeTransfer.start();
+      }
+  }
+  ContentImportHint {
+      id: importHint
+      anchors.fill: parent
+      activeTransfer: root.activeTransfer
+  }
+  property list<ContentItem> importItems
+  property var activeTransfer
+  Connections {
+      target: root.activeTransfer
+      onStateChanged: {
+          if (root.activeTransfer.state === ContentTransfer.Charged)
+              importItmes = root.activeTransfer.items;
+      }
+  }
+}
+\endqml
+
+\part General Topics
+\list
+    \li \l {ContentHub}
+    \li \l {ContentTransfer}
+    \li \l {ContentImportHint}
+    \li \l {ContentType}
+\endlist
+
+\part Reporting Bugs
+If you find any problems with the or this documentation,
+please file a bug in Ubuntu Content API \l {https://bugs.launchpad.net/content-hub} {Launchpad page}
+
+\part Components
+Available through:
+\code
+    import Ubuntu.Content 0.1
+\endcode
+
+*/

=== added file 'doc/qml/ubuntu-content-hub.qdocconf.in'
--- doc/qml/ubuntu-content-hub.qdocconf.in	1970-01-01 00:00:00 +0000
+++ doc/qml/ubuntu-content-hub.qdocconf.in	2013-10-23 12:34:58 +0000
@@ -0,0 +1,47 @@
+project = Ubuntu Content QML API
+description = Ubuntu Content API
+
+sourcedirs = @CMAKE_CURRENT_SOURCE_DIR@/pages @CMAKE_SOURCE_DIR@/import
+exampledirs = @CMAKE_SOURCE_DIR@/examples/
+imagedirs = @CMAKE_CURRENT_SOURCE_DIR@/../images
+
+sources.fileextensions = "*.qdoc *.qml *.cpp"
+headers.fileextensions = "*.h"
+examples.fileextensions = "*.js *.qml"
+examples.imageextensions = "*.png *.jpeg *.jpg"
+
+outputdir = html
+outputformat = HTML
+
+outputprefixes = QML
+outputprefixes.QML = qml-
+
+HTML.templatedir = @CMAKE_CURRENT_SOURCE_DIR@/
+HTML.nobreadcrumbs = "true"
+		   
+HTML.stylesheets = \
+    css/reset.css \
+    css/qtquick.css \
+    css/base.css \
+    css/scratch.css
+
+HTML.headerstyles = \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/reset.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtquick.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/scratch.css\" />\n"
+
+HTML.postheader = \
+    "   <div class=\"wrapper\">\n" \
+    "   <div class=\"main-content\">\n" 
+
+HTML.footer = \
+    "</div></div>\n" \
+    "<div class=\"shadow\"></div>\n" \
+    "<footer>\n" \
+    "	<div>\n" \
+    "		<nav role=\"navigation\" class=\"clearfix\">\n" \
+    "		</nav>\n" \
+    "		<p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>\n" \
+    "	</div>\n" \
+    "</footer>\n"

=== modified file 'import/Ubuntu/Content/ContentImportHint.qml'
--- import/Ubuntu/Content/ContentImportHint.qml	2013-09-27 13:11:45 +0000
+++ import/Ubuntu/Content/ContentImportHint.qml	2013-10-23 12:34:58 +0000
@@ -28,7 +28,7 @@
     application is active. It blocks all input during that time.
     Place this component on top of your view.
 
-    See documentation for \ContentHub to see an example
+    See documentation for ContentHub to see an example
 */
 Item {
     id: root

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2013-10-23 12:34:58 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2013-10-23 12:34:58 +0000
@@ -31,9 +31,6 @@
  * \qmltype ContentHub
  * \instantiates ContentHub
  * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME documentation
- *
- * FIXME documentation
  *
  * Example usage for importing content:
  * \qml
@@ -113,7 +110,7 @@
 /*!
  * \qmlmethod ContentHub::defaultSourceForType()
  *
- *  Returns the default peer for the given content \a type
+ *  Returns the default \a ContentPeer for the given \a ContentType
  */
 ContentPeer *ContentHub::defaultSourceForType(int type)
 {
@@ -128,6 +125,11 @@
     return qmlPeer;
 }
 
+/*!
+ * \qmlmethod ContentHub::defaultStoreForType(ContentType)
+ *
+ *  Returns the default \a ContentStore for the given \a ContentType
+ */
 ContentStore *ContentHub::defaultStoreForType(int type)
 {
     qDebug() << Q_FUNC_INFO;
@@ -144,9 +146,9 @@
 }
 
 /*!
- * \qmlmethod ContentHub::knownSourcesForType()
+ * \qmlmethod ContentHub::knownSourcesForType(ContentType)
  *
- *  Returns all possible peers for the given content \a type
+ *  Returns all possible peers for the given ContentType
  */
 QVariantList ContentHub::knownSourcesForType(int type)
 {
@@ -165,9 +167,11 @@
 }
 
 /*!
- * \qmlmethod ContentHub::importContent()
+ * \qmlmethod ContentHub::importContent(ContentType)
+ * \overload ContentHub::importContent(ContentType, ContentPeer)
  *
- * Start a request to import data of \a type from a peer, the user needs to select
+ * \brief Request to import data of \a ContentType from the default
+ * ContentPeer
  */
 ContentTransfer *ContentHub::importContent(int type)
 {
@@ -181,9 +185,11 @@
 }
 
 /*!
- * \qmlmethod ContentHub::importContent()
+ * \qmlmethod ContentHub::importContent(ContentType, ContentPeer)
+ * \overload ContentHub::importContent(ContentType)
  *
- * Start a request to import data of \a type from the given \peer
+ * \brief Request to import data of \a ContentType from the
+ * specified \a ContentPeer
  */
 ContentTransfer *ContentHub::importContent(int type, ContentPeer *peer)
 {
@@ -195,9 +201,9 @@
 
 /*!
  * \brief ContentHub::importContent creates a ContentTransfer object
- * \param type
- * \param peer
- * \return
+ * \a type
+ * \a peer
+ * \internal
  */
 ContentTransfer* ContentHub::importContent(const com::ubuntu::content::Type &hubType,
                                            const com::ubuntu::content::Peer &hubPeer)
@@ -217,6 +223,7 @@
  * \qmlmethod ContentHub::restoreImports()
  *
  *  FIXME add documentation
+ * \internal
  */
 void ContentHub::restoreImports()
 {
@@ -227,6 +234,7 @@
  * \qmlproperty list<ContentTransfer> ContentHub::finishedImports
  *
  * FIXME add documentation
+ * \internal
  */
 QQmlListProperty<ContentTransfer> ContentHub::finishedImports()
 {
@@ -236,7 +244,7 @@
 
 /*!
  * \brief ContentHub::handleImport handles an incoming request for importing content
- * \param transfer
+ * \internal
  */
 void ContentHub::handleImport(com::ubuntu::content::Transfer *transfer)
 {
@@ -256,7 +264,7 @@
 
 /*!
  * \brief ContentHub::handleExport handles an incoming request for exporting content
- * \param transfer
+ * \internal
  */
 void ContentHub::handleExport(com::ubuntu::content::Transfer *transfer)
 {

=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h	2013-10-23 12:34:58 +0000
+++ import/Ubuntu/Content/contenthub.h	2013-10-23 12:34:58 +0000
@@ -39,6 +39,10 @@
 }
 }
 
+/*!
+ * \class ContentHub
+ * \brief FIXME documentaion
+ */ 
 class ContentHub : public QObject
 {
     Q_OBJECT

=== modified file 'import/Ubuntu/Content/contenthubplugin.cpp'
--- import/Ubuntu/Content/contenthubplugin.cpp	2013-10-01 16:55:39 +0000
+++ import/Ubuntu/Content/contenthubplugin.cpp	2013-10-23 12:34:58 +0000
@@ -30,9 +30,6 @@
 
 /*!
  * \brief qml_content_hub function to unstatinate the ContentHub as a singleton in QML
- * \param engine
- * \param scriptEngine
- * \return
  */
 static QObject *qml_content_hub(QQmlEngine *engine, QJSEngine *scriptEngine)
 {

=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp	2013-08-23 10:05:50 +0000
+++ import/Ubuntu/Content/contentitem.cpp	2013-10-23 12:34:58 +0000
@@ -26,7 +26,7 @@
  *
  * FIXME add documentation
  *
- * See documentation for \ContentHub
+ * See documentation for ContentHub
  */
 
 namespace cuc = com::ubuntu::content;
@@ -81,7 +81,7 @@
 
 /*!
  * \brief ContentItem::item
- * \return
+ * \internal
  */
 const com::ubuntu::content::Item &ContentItem::item() const
 {
@@ -91,7 +91,7 @@
 
 /*!
  * \brief ContentItem::setItem
- * \param item
+ * \internal
  */
 void ContentItem::setItem(const com::ubuntu::content::Item &item)
 {

=== modified file 'import/Ubuntu/Content/contentstore.cpp'
--- import/Ubuntu/Content/contentstore.cpp	2013-09-30 13:30:45 +0000
+++ import/Ubuntu/Content/contentstore.cpp	2013-10-23 12:34:58 +0000
@@ -22,11 +22,8 @@
  * \qmltype ContentStore
  * \instantiates ContentStore
  * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME add documentation
- *
- * FIXME add documentation
- *
- * See documentation for \ContentHub
+ *
+ * See documentation for ContentHub
  */
 
 namespace cuc = com::ubuntu::content;
@@ -51,7 +48,7 @@
 
 /*!
  * \brief ContentStore::store
- * \return
+ * \internal
  */
 const com::ubuntu::content::Store *ContentStore::store() const
 {
@@ -61,7 +58,7 @@
 
 /*!
  * \brief ContentStore::setStore
- * \param store
+ * \internal
  */
 void ContentStore::setStore(const com::ubuntu::content::Store *store)
 {

=== modified file 'import/Ubuntu/Content/contenttransfer.cpp'
--- import/Ubuntu/Content/contenttransfer.cpp	2013-10-01 16:55:39 +0000
+++ import/Ubuntu/Content/contenttransfer.cpp	2013-10-23 12:34:58 +0000
@@ -25,11 +25,8 @@
  * \qmltype ContentTransfer
  * \instantiates ContentTransfer
  * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME add documentation
- *
- * FIXME add documentation
- *
- * See documentation for \ContentHub
+ *
+ * See documentation for ContentHub
  */
 
 namespace cuc = com::ubuntu::content;
@@ -46,9 +43,36 @@
 }
 
 /*!
- * \qmlproperty string ContentTransfer::state
- *
- * FIXME add documentation
+   \qmlproperty ContentTransfer.State ContentTransfer::state
+
+   \table
+   \header
+     \li {2, 1} \e {ContentTransfer.State} is an enumeration:
+   \header
+     \li State
+     \li Description
+   \row
+     \li ContentTransfer.Created
+     \li Transfer created, waiting to be initiated.
+   \row
+     \li ContentTransfer.Initiated
+     \li Transfer has been initiated.
+   \row
+     \li ContentTransfer.InProgress
+     \li Transfer is in progress.
+   \row
+     \li ContentTransfer.Charged
+     \li Transfer is charged with items and ready to be collected.
+   \row
+     \li ContentTransfer.Collected
+     \li Items in the transfer have been collected.
+   \row
+     \li ContentTransfer.Aborted
+     \li Transfer has been aborted.
+   \row
+     \li ContentTransfer.Finalized
+     \li Transfer has been finished and cleaned up.
+   \endtable
  */
 ContentTransfer::State ContentTransfer::state() const
 {
@@ -73,9 +97,22 @@
 }
 
 /*!
- * \brief ContentTransfer::direction indicates if this transferobject is used for
- * import or export transaction
- * \return
+  \qmlproperty ContentTransfer.Direction ContentTransfer::direction
+  \brief ContentTransfer::direction indicates if this transferobject is used for
+  import or export transaction
+  \table
+  \header
+     \li {2, 1} \e {ContentTransfer.Direction} is an enumeration:
+  \header
+    \li Direction
+    \li Description
+  \row
+    \li ContentTransfer.Import
+    \li Transfer is a request to import content.
+  \row
+    \li ContentTransfer.Export
+    \li Transfer is a request to export content.
+  \endtable
  */
 ContentTransfer::Direction ContentTransfer::direction() const
 {
@@ -83,9 +120,22 @@
 }
 
 /*!
- * \brief ContentTransfer::selectionType indicates if this transferobject is allows
- * single or multiple selection of items
- * \return
+  \qmlproperty ContentTransfer.SelectionType ContentTransfer::selectionType
+  \brief ContentTransfer::selectionType indicates if this transfer object allows
+  single or multiple selection of items
+  \table
+  \header
+     \li {2, 1} \e {ContentTransfer.SelectionType} is an enumeration:
+  \header
+    \li Type
+    \li Description
+  \row
+    \li ContentTransfer.Single
+    \li Transfer should contain a single item.
+  \row
+    \li ContentTransfer.Multiple
+    \li Transfer can contain multiple items.
+  \endtable
  */
 ContentTransfer::SelectionType ContentTransfer::selectionType() const
 {
@@ -106,7 +156,7 @@
 /*!
  * \qmlproperty list<ContentItem> ContentTransfer::items
  *
- * FIXME add documentation
+ * List of items included in the ContentTransfer
  */
 QQmlListProperty<ContentItem> ContentTransfer::items()
 {
@@ -120,7 +170,7 @@
 /*!
  * \qmlmethod ContentTransfer::start()
  *
- *  FIXME add documentation
+ *  Start the transfer, this sets the State to ContentTransfer.Initiated
  */
 bool ContentTransfer::start()
 {
@@ -136,7 +186,7 @@
 /*!
  * \qmlmethod ContentTransfer::finalize()
  *
- *  FIXME add documentation
+ * Sets State to ContentTransfer.Finalized and cleans up temporary files
  */
 bool ContentTransfer::finalize()
 {
@@ -145,8 +195,8 @@
 }
 
 /*!
- * \brief ContentTransfer::store
- * \return
+ * \qmlproperty string ContentTransfer::store
+ * ContentStore where the ContentTransfer will add items
  */
 const QString ContentTransfer::store() const
 {
@@ -168,7 +218,7 @@
 
 /*!
  * \brief ContentTransfer::transfer
- * \return
+ * \internal
  */
 com::ubuntu::content::Transfer *ContentTransfer::transfer() const
 {
@@ -178,7 +228,7 @@
 
 /*!
  * \brief ContentTransfer::setTransfer
- * \param transfer
+ * \internal
  */
 void ContentTransfer::setTransfer(com::ubuntu::content::Transfer *transfer, Direction direction)
 {
@@ -211,6 +261,7 @@
 
 /*!
  * \brief ContentTransfer::collectItems gets the items out of the transfer object
+ * \internal
  */
 void ContentTransfer::collectItems()
 {
@@ -232,6 +283,7 @@
 
 /*!
  * \brief ContentTransfer::updateState update the state from the hub transfer object
+ * \internal
  */
 void ContentTransfer::updateState()
 {
@@ -245,6 +297,7 @@
 
 /*!
  * \brief ContentTransfer::updateSelectionType update the selectionType from the hub transfer object
+ * \internal
  */
 void ContentTransfer::updateSelectionType()
 {
@@ -259,6 +312,7 @@
 
 /*!
  * \brief ContentTransfer::updateStore update the store from the hub transfer object
+ * \internal
  */
 void ContentTransfer::updateStore()
 {

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2013-08-23 10:05:50 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2013-10-23 12:34:58 +0000
@@ -19,29 +19,46 @@
 #include <QDebug>
 
 /*!
- * \qmltype ContentType
- * \instantiates ContentType
- * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME add documentation
- *
- * FIXME add documentation
- *
- * See documentation for \ContentHub
+   \qmltype ContentType
+   \instantiates ContentType
+   \inqmlmodule Ubuntu.Content 0.1
+
+   \sa ContentHub
+
+   \e {ContentType} is an enumeration of well known content types:
+   \table
+   \header
+     \li Type
+     \li Description
+   \row
+     \li ContentType.Uknown
+     \li Unknown type
+   \row
+     \li ContentType.Documents
+     \li Documents
+   \row
+     \li ContentType.Pictures
+     \li Pictures
+   \row
+     \li ContentType.Music
+     \li Music
+   \endtable
  */
 
 namespace cuc = com::ubuntu::content;
 
+
 ContentType::ContentType(QObject *parent)
     : QObject(parent)
 {
     qDebug() << Q_FUNC_INFO;
 }
 
+
 /*!
  * \brief ContentType::contentType2HubType converts a ContentType::Type to a
  * com::ubuntu::content::Type
- * \param type integer representing a ContentType::Type
- * \return
+ * \internal
  */
 const com::ubuntu::content::Type &ContentType::contentType2HubType(int type)
 {
@@ -53,8 +70,7 @@
 /*!
  * \brief ContentType::contentType2HubType converts a ContentType::Type to a
  * com::ubuntu::content::Type
- * \param type type of the content
- * \return
+ * \internal
  */
 const com::ubuntu::content::Type &ContentType::contentType2HubType(Type type)
 {