11 files changed, 47 insertions, 102 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index 61f9c01bdb..39e72204d6 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -464,7 +464,7 @@
 */
 
 /*!
-    \externalpage ftp://ftp.qt.nokia.com/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz
+    \externalpage ftp://ftp.qt-project.org/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz
     \title Motif Extension
 */
 
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index abe7e5e349..5f989d2fa8 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -1,6 +1,26 @@
 HTML.nobreadcrumbs      = "true"
 
 HTML.stylesheets = template/style/offline.css
+HTML.extraimages += template/images/ico_out.png \
+                    template/images/ico_note.png \
+                    template/images/ico_note_attention.png \
+                    template/images/btn_prev.png \
+                    template/images/btn_next.png \
+                    template/images/bullet_dn.png \
+                    template/images/bullet_sq.png \
+                    template/images/bgrContent.png
+
+#specify which files in the output directory should be packed into the qch file.
+qhp.extraFiles +=   style/offline.css \
+                    images/ico_out.png \
+                    images/ico_note.png \
+                    images/ico_note_attention.png \
+                    images/btn_prev.png \
+                    images/btn_next.png \
+                    images/bullet_dn.png \
+                    images/bullet_sq.png \
+                    images/bgrContent.png
+
 
 HTML.headerstyles = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf
index d6c6b00e99..040a5483c2 100644
--- a/doc/global/qt-html-templates-online.qdocconf
+++ b/doc/global/qt-html-templates-online.qdocconf
@@ -1,36 +1,14 @@
 HTML.nobreadcrumbs      = "true"
 
 HTML.stylesheets =  template/style/online.css
-HTML.extraimages =  template/images/btn_next_green.png \
-                    template/images/box_bg.png \
-                    template/images/page.png \
-                    template/images/arrow_down.png \
-                    template/images/btn_prev.png \
-                    template/images/blu_dot.png \
+HTML.extraimages += template/images/ico_out.png \
+                    template/images/ico_note.png \
                     template/images/ico_note_attention.png \
-                    template/images/btn_prev_green.png \
-                    template/images/bg_ll_blank.png \
+                    template/images/btn_prev.png \
                     template/images/btn_next.png \
-                    template/images/bg_l_blank.png \
-                    template/images/ico_note.png \
-                    template/images/home.png \
-                    template/images/ico_out.png \
-                    template/images/header_bg.png \
-                    template/images/page_bg.png \
-                    template/images/bg_l.png \
-                    template/images/bg_r.png \
-                    template/images/breadcrumb.png \
                     template/images/bullet_dn.png \
-                    template/images/feedbackground.png \
-                    template/images/bullet_gt.png \
-                    template/images/arrow.png \
                     template/images/bullet_sq.png \
-                    template/images/bullet_up.png \
-                    template/images/sprites-combined.png \
-                    template/images/horBar.png \
-                    template/images/bg_ul_blank.png \
-                    template/images/bgrContent.png \
-
+                    template/images/bgrContent.png
 
 HTML.headerstyles = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n"
@@ -38,7 +16,7 @@ HTML.headerstyles = \
 HTML.endheader = \
     "</head>\n" \
     "<body>\n" \
-    "<div class=\"header\" id=\"qtdocheader\"></div>\n"
+    "<div class=\"header\" id=\"qtdocheader\"></div>\n" \
     "    <header>\n" \
     "    <div class=\"nav\">\n" \
     "        <a href=\"http://qt-project.org/\">Qt Home</a>\n" \
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index 7d0705c475..8c8df29437 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -25,8 +25,5 @@ versionsym              = QT_VERSION_STR
 
 macro.raisedaster.HTML  = "<sup>*</sup>"
 
-#for including files into the qch file
-qhp.extraFiles += style/offline.css
-
 #include the external websites
 sourcedirs += externalsites
diff --git a/doc/global/template/images/btn_next.png b/doc/global/template/images/btn_next.png
index f7bc2b7170..c649f18572 100755..100644
--- a/doc/global/template/images/btn_next.png
+++ b/doc/global/template/images/btn_next.png
diff --git a/doc/global/template/images/btn_next_green.png b/doc/global/template/images/btn_next_green.png
deleted file mode 100644
index c649f18572..0000000000
--- a/doc/global/template/images/btn_next_green.png
+++ /dev/null
diff --git a/doc/global/template/images/btn_prev.png b/doc/global/template/images/btn_prev.png
index 10a620c518..d1d29895b2 100755..100644
--- a/doc/global/template/images/btn_prev.png
+++ b/doc/global/template/images/btn_prev.png
diff --git a/doc/global/template/images/btn_prev_green.png b/doc/global/template/images/btn_prev_green.png
deleted file mode 100644
index d1d29895b2..0000000000
--- a/doc/global/template/images/btn_prev_green.png
+++ /dev/null
diff --git a/doc/global/template/images/ico_out.png b/doc/global/template/images/ico_out.png
index ff6e458fb1..790a05e51d 100755
--- a/doc/global/template/images/ico_out.png
+++ b/doc/global/template/images/ico_out.png
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 748effcee4..8b8a7d9ae1 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -8,6 +8,9 @@ margin-left:5px;
 margin-right:5px;
 }
 
+p {
+line-height: 20px;
+}
 img{
 -moz-box-shadow: 3px 3px 3px #ccc;
 -webkit-box-shadow: 3px 3px 3px #ccc;
@@ -63,6 +66,16 @@ color: #44a51c;
 text-align:left;
 }
 
+a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
+{
+text-decoration: none;
+background-image:url(../images/ico_out.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+text-align:left;
+}
+
 .flags{
 text-decoration:none;
 text-height:24px;
@@ -155,71 +168,6 @@ height:20px;
 margin-left:30px;
 }
 
-.breadcrumb{
-display: block;
-position: relative;
-top:-20px;
-/*border-top:2px solid #ffffff;*/
-border-bottom: 1px solid #cecece;
-background-color:#F2F2F2;
-z-index:1;
-height:20px;
-padding:0px;
-margin:0px;
-padding-left:10px;
-padding-top:2px;
-margin-left:-5px;
-margin-right:-5px;
-}
-
-.breadcrumb ul{
- margin:0px;
- padding:0px;
-}
-
-.breadcrumb ul li{
-background-color:#F2F2F2;
-list-style-type:none;
-padding:0;
-margin:0;
-height:20px;
-}
-
-.breadcrumb li{
-float:left;
-}
-
-.breadcrumb .first {
-background:url(../images/home.png);
-background-position:left;
-background-repeat:no-repeat;
-padding-left:20px;
-}
-
-
-.breadcrumb li a{
-color:#2C418D;
-display:block;
-text-decoration:none;
-background:url(../images/arrow.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:25px;
-padding-left:10px;
-}
-
-.breadcrumb li a:hover{
-color:#909090;
-display:block;
-text-decoration:none;
-background:url(../images/arrow.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:20px;
-padding-left:10px;
-}
-
-
 /* table of content
 no display
 */
@@ -483,7 +431,7 @@ margin: 10;
 overflow: hidden;
 overflow-x: hidden;
 overflow-y: hidden;
-padding: 20px 0 20px 0;
+padding: 20px 20px 20px 20px;
 }
 
 .qmldefault{
@@ -566,8 +514,7 @@ padding-right:5px;
 
 .toc ul li{
 margin-left:15px;
-list-style-image:url(../images/blu_dot.png);
-list-style:outside;
+list-style-image:url(../images/bullet_dn.png);
 marker-offset: 0px;
 margin-bottom:8px;
 padding-left:0px;
@@ -643,7 +590,7 @@ margin-bottom: 20px;
 
 .indexboxcont .sectionlist ul li
 {
-line-height: 12px;
+line-height: 1.5;
 }
 
 .content .indexboxcont li
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 21e371b132..f933bac5eb 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -8,6 +8,9 @@ margin-right:5px;
 background: none repeat scroll 0% 0% rgb(230,231,232);
 }
 
+p {
+line-height: 20px;
+}
 img{
 -moz-box-shadow: 3px 3px 3px #ccc;
 -webkit-box-shadow: 3px 3px 3px #ccc;
@@ -540,7 +543,7 @@ margin: 10;
 overflow: hidden;
 overflow-x: hidden;
 overflow-y: hidden;
-padding: 20px 0 20px 0;
+padding: 20px 20px 20px 20px;
 }
 
 .qmldefault{
@@ -701,7 +704,7 @@ margin-bottom: 20px;
 
 .indexboxcont .sectionlist ul li
 {
-line-height: 12px;
+line-height: 1.5;
 }
 
 .content .indexboxcont li