Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Consolidate zlib configuration redundancy
  Fixed whitespace formatting
  Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
  Split image handler plugin project files
  No explicit link to zlib/jpeg for system mng/tiff
  Removed stray line continuations
  Long live else!
  qdoc: Added a solution for creating tables of contents for manuals.
  Doc: Fixed markup.
  Fixed size hint for combo box on windows

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index da50a6d..18a1746 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -70,15 +70,15 @@
 		  <li><a href="declarativeui.html">Device UI's &amp; Qt Quick</a></li>
 		  <li><a href="qt-gui-concepts.html">Desktop UI components</a></li>
 		  <li><a href="platform-specific.html">Platform-specific info</a></li>
-		  <li><a href="qt-graphics.html">Graphics, Painting  &amp Printing</a></li>
-                  <li><a href="qt-network.html">Input/Output &amp networking</a></li>
+		  <li><a href="qt-graphics.html">Graphics, Painting &amp; Printing</a></li>
+                  <li><a href="qt-network.html">Input/Output &amp; networking</a></li>
                 </ul>
               </div>
               <div class="sectionlist">
                 <ul>
                   <li><a href="model-view-programming.html">Model/View programming</a></li>
                   <li><a href="technology-apis.html">Qt API's for other technologies</a></li>
-                  <li><a href="best-practices.html">Qt How-to's &amp best practices</a></li>
+                  <li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
                   <li><a href="developing-with-qt.html">Cross-platform development</a></li>
                 </ul>
               </div>