Minor edits and configuration fixes

Task-number: QTBUG-28831

Change-Id: I6779c5e242b850ec0c77f987e149d44d2ccbdea2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

21 files changed, 46 insertions, 45 deletions

diff --git a/canvas_tutorial/about.rst b/canvas_tutorial/about.rst
index e6401b0..8cf8201 100644
--- a/canvas_tutorial/about.rst
+++ b/canvas_tutorial/about.rst
@@ -29,9 +29,11 @@ A .zip file that contains the example source code referred in each chapter:
 
 The guide is available in the following offline formats:
 
-     `PDF <http://releases.qt-project.org/learning/developerguides/canvastutorial/QtQuickCanvasTutorial.pdf>`_
-     `ePub <http://releases.qt-project.org/learning/developerguides/QtQuickCanvasTutorial.epub>`_ for ebook readers. Further details can be found `here <http://en.wikipedia.org/wiki/EPUB#Software_reading_systems>`_.
-     `Qt Help <http://releases.qt-project.org/learning/developerguides/canvastutorial/QtQuickCanvasTutorial.qch>`_ for Qt Assistant and Qt Creator. In Qt Assistant, go to the :qt:`Preferences Dialog <assistant-details.html#preferences-dialog>`, in the `Documentation` tab (in a collapsible menu for Mac users), click on the `Add` button in order to add this guide in .qch format. Do the same in Qt Creator under the `Options` dialog. In the `Help` section, you can add this guide under the `Documentation` tab.
+    * `PDF <http://releases.qt-project.org/learning/developerguides/canvastutorial/QtQuickCanvasTutorial.pdf>`_
+
+    * `ePub <http://releases.qt-project.org/learning/developerguides/canvastutorial/QtQuickCanvasTutorial.epub>`_ for ebook readers.
+
+    * `Qt Help <http://releases.qt-project.org/learning/developerguides/canvastutorial/QtQuickCanvasTutorial.qch>`_ for Qt Assistant and Qt Creator.
 
 
 License
diff --git a/canvas_tutorial/conclusion.rst b/canvas_tutorial/conclusion.rst
index fb54002..dbbb7cf 100644
--- a/canvas_tutorial/conclusion.rst
+++ b/canvas_tutorial/conclusion.rst
@@ -16,10 +16,10 @@ In this tutorial, we explored some of the capabilities of the Qt Quick Canvas ty
 
 Here is a small list of such tutorials:
 
-     `http://www.html5canvastutorials.com <http://www.html5canvastutorials.com>`_ - A page dedicated to HTML5 Canvas tutorials
-     `https://developer.mozilla.org/en/Canvas_tutorial <https://developer.mozilla.org/en/Canvas_tutorial>`_ - An HTML5 Canvas tutorial on the Mozilla Developer Network
-     `http://dev.opera.com/articles/view/html-5-canvas-the-basics <http://dev.opera.com/articles/view/html-5-canvas-the-basics>`_ - HTML5 Canvas basics on the Opera developer portal
-     `http://www.canvasdemos.com <http://www.canvasdemos.com>`_ - A page presenting HTML5 Canvas demos
+    * `http://www.html5canvastutorials.com <http://www.html5canvastutorials.com>`_ - A page dedicated to HTML5 Canvas tutorials
+    * `https://developer.mozilla.org/en/Canvas_tutorial <https://developer.mozilla.org/en/Canvas_tutorial>`_ - An HTML5 Canvas tutorial on the Mozilla Developer Network
+    * `http://dev.opera.com/articles/view/html-5-canvas-the-basics <http://dev.opera.com/articles/view/html-5-canvas-the-basics>`_ - HTML5 Canvas basics on the Opera developer portal
+    * `http://www.canvasdemos.com <http://www.canvasdemos.com>`_ - A page presenting HTML5 Canvas demos
 
 `The Qt Webkit Guide about canvas graphics <http://qt-project.org/doc/qt-4.8/qtwebkit-guide-canvas.html>`_ also gives a detailed introduction to the HTML5 Canvas API. Also note `this very handy cheat sheet <http://blog.nihilogic.dk/2009/02/html5-canvas-cheat-sheet.html>`_.
 
diff --git a/canvas_tutorial/conf.py b/canvas_tutorial/conf.py
index 185ce92..7e15308 100644
--- a/canvas_tutorial/conf.py
+++ b/canvas_tutorial/conf.py
@@ -28,7 +28,7 @@ htmlhelp_basename = 'QtQuickCanvasTutorial'
 
 latex_documents = [
   ('index', 'QtQuickCanvasTutorial.tex', u'Qt Quick Painting using Canvas Item',
-   u'Nokia, Qt Learning', 'manual'),
+   u'Digia, Qt Learning', 'manual'),
 ]
 
 # -- Options for Epub output ---------------------------------------------------
diff --git a/canvas_tutorial/introduction.rst b/canvas_tutorial/introduction.rst
index 529d391..c8239ae 100644
--- a/canvas_tutorial/introduction.rst
+++ b/canvas_tutorial/introduction.rst
@@ -12,13 +12,13 @@
 Introduction
 ============
 
-If you want to draw custom graphics within your Qt Quick application, the :qt5-snapshot:`Qt Quick Canvas <qtquick/qml-qtquick2-canvas.html>`_ item is your choice.
+If you want to draw custom graphics within your Qt Quick application, the :qt5-snapshot:`Qt Quick Canvas <qtquick/qml-qtquick2-canvas.html>` item is your choice.
 
 The Canvas type was introduced in Qt Quick 2.0 and provides an area in which you can draw using JavaScript. It uses a high-level command-set based on `the HTML5 Canvas specification <http://www.w3.org/TR/html5/the-canvas-element.html>`_. The Canvas type allows you to draw basic and complex shapes, add color, gradients, shadows, images, text, and access low-level pixel data. Using JavaScript, facilitates the presentation of dynamic content.
 
 After a brief introduction to the Canvas type, we'll develop an interactive pie chart visualization. Later in this guide, we'll see how to port existing HTML5 Canvas code to a Qt Quick 2 application.
 
-This tutorial introduces you to the Qt Quick Canvas using example programs and is not meant to show each and every aspect of this type. A detailed description of the Canvas type and its supported rendering commands can be found in the Qt documentation pages (:qt5-snapshot:`Canvas <qtquick/qml-qtquick2-canvas.html>`_, :qt5-snapshot:`Context2D <qtquick/qml-qtquick2-context2d.html>`_). Also note that a large number of good HTML5 Canvas API tutorials are available on the internet. As the Qt Quick Canvas type is based on the HTML5 specification, these tutorials can serve as an excellent starting point to learn drawing. We have listed a few of those tutorials at `the end of this tutorial <conclusion.html>`_. We also assume that you are already familiar with Qt Quick in general, as this tutorial does refer to some the non-Canvas features.
+This tutorial introduces you to the Qt Quick Canvas using example programs and is not meant to show each and every aspect of this type. A detailed description of the Canvas type and its supported rendering commands can be found in the Qt documentation pages (:qt5-snapshot:`Canvas <qtquick/qml-qtquick2-canvas.html>`, :qt5-snapshot:`Context2D <qtquick/qml-qtquick2-context2d.html>`). Also note that a large number of good HTML5 Canvas API tutorials are available on the internet. As the Qt Quick Canvas type is based on the HTML5 specification, these tutorials can serve as an excellent starting point to learn drawing. We have listed a few of those tutorials at `the end of this tutorial <conclusion.html>`. We also assume that you are already familiar with Qt Quick in general, as this tutorial does refer to some the non-Canvas features.
 
 
 A Basic Example
diff --git a/desktop_devguide/chapter_01/index.rst b/desktop_devguide/chapter_01/index.rst
index 7ea32df..a86a32d 100644
--- a/desktop_devguide/chapter_01/index.rst
+++ b/desktop_devguide/chapter_01/index.rst
@@ -40,15 +40,15 @@ Get the Source Code and the Guide in Different Formats
 
 A .zip file that contains the source code of each chapter is provided:
 
-     :download:`Source code <qtquickdesktop/notezapp_src.zip>`_
+     :download:`Source code <qtquickdesktop/notezapp_src.zip>`
 
 The guide is available in the following formats:
 
-     :download:`PDF <qtquickdesktop/QtQuickApplicationGuide4Desktop.pdf>`_
+    * :download:`PDF <qtquickdesktop/QtQuickApplicationGuide4Desktop.pdf>`
 
-     :download:`ePub <qtquickdesktop/QtQuickApplicationGuide4Desktop.epub>`_ for ebook readers. Further details can be found `here <http://en.wikipedia.org/wiki/EPUB#Software_reading_systems>`_.
+    * :download:`ePub <qtquickdesktop/QtQuickApplicationGuide4Desktop.epub>` for ebook readers.
 
-     :download:`Qt Help <qtquickdesktop/QtQuickApplicationGuide4Desktop.qch>`_ for Qt Assistant and Qt Creator. In Qt Assistant under the :creator:`Preferences Dialog <creator-help.html#adding-external-documentation>`, in the `Documentation` tab (in a collapsible menu for Mac users), you click on the Add button in order to add this guide in the .qch format. We do the same in Qt Creator, under the `Options` dialog, in the `Help` section you, can add this guide in the `Documentation` tab.
+    * :download:`Qt Help <qtquickdesktop/QtQuickApplicationGuide4Desktop.qch>` for Qt Assistant and Qt Creator.
 
 
 License
diff --git a/desktop_devguide/conf.py b/desktop_devguide/conf.py
index ca0587d..df8eafa 100644
--- a/desktop_devguide/conf.py
+++ b/desktop_devguide/conf.py
@@ -46,7 +46,7 @@ htmlhelp_basename = 'QtQuickApplicationGuide4Desktop'
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'QtQuickApplicationGuide4Desktop.tex', u'Qt Quick Application Developer Guide for Desktop',
-   u'Digia, http://qt.digia.com/Product/Learning/', 'manual'),
+   u'Digia, Qt Learning', 'manual'),
 ]
 
 
diff --git a/openGL_tutorial/conclusion.rst b/openGL_tutorial/conclusion.rst
index b207f55..cced944 100644
--- a/openGL_tutorial/conclusion.rst
+++ b/openGL_tutorial/conclusion.rst
@@ -12,7 +12,7 @@
 Conclusion & Further Reading
 ============================
 
- We hope you liked this tutorial and that we have made you even more curious about OpenGL and 3D programming. If you want to delve deeper into OpenGL, you should definitively think about getting a good book dedicated to this topic. `The OpenGL homepage <http://www.opengl.org>`_ lists quite a few recommendations. If you are looking for an even higher level approach, you may consider taking a look at `Qt/3D <http://doc-snapshot.qt-project.org/qt3d-1.0>`_ and/or `QtQuick3D <http://doc.qt.digia.com/qt-quick3d-snapshot>`_.
+We hope you liked this tutorial and that we have made you even more curious about OpenGL and 3D programming. If you want to delve deeper into OpenGL, you should definitively think about getting a good book dedicated to this topic. `The OpenGL homepage <http://www.opengl.org>`_ lists quite a few recommendations. If you are looking for an even higher level approach, you may consider taking a look at `Qt/3D <http://doc-snapshot.qt-project.org/qt3d-1.0>`_ and/or `QtQuick3D <http://doc.qt.digia.com/qt-quick3d-snapshot>`_.
 
 As OpenGL is able to compute a lot of information really fast, you may have thoughts about using it for more than just computer graphics. A framework based on this approach is called `OpenCL` (which is also managed by the Khronos Group Inc.). There even is a Qt Module for this framework. It is called `QtOpenCL <http://doc.qt.digia.com/opencl-snapshot/index.html>`_.
 
diff --git a/particles_tutorial/introduction.rst b/particles_tutorial/introduction.rst
index 0a17f67..170cb9b 100644
--- a/particles_tutorial/introduction.rst
+++ b/particles_tutorial/introduction.rst
@@ -34,11 +34,11 @@ A .zip file that contains the full code source of the tutorial's examples is pro
 
 The guide is available in the following formats:
 
-     :download:`PDF <qteffects/ParticlesTutorial.pdf>`
+    * :download:`PDF <qteffects/ParticlesTutorial.pdf>`
 
-     :download:`ePub <qteffects/ParticlesTutorial.epub>` for ebook readers. Further details can be found `here <http://en.wikipedia.org/wiki/EPUB#Software_reading_systems>`_.
+    * :download:`ePub <qteffects/ParticlesTutorial.epub>` for ebook readers.
 
-     :download:`Qt Help <qteffects/ParticlesTutorial.qch>` for Qt Assistant and Qt Creator. In Qt Assistant, in the :qt:`Preferences Dialog <assistant-details.html#preferences-dialog>` under the `Documentation` tab (in a collapsible menu for Mac users), you click on the `Add` button in order to add this guide in .qch format. We do the same in Qt Creator under the `Options` dialog in the `Help` section. Here you can add this guide in the `Documentation` tab.
+    * :download:`Qt Help <qteffects/ParticlesTutorial.qch>` for Qt Assistant and Qt Creator.
 
 
 License
diff --git a/particles_tutorial/particles.rst b/particles_tutorial/particles.rst
index c7e8c76..c28e435 100644
--- a/particles_tutorial/particles.rst
+++ b/particles_tutorial/particles.rst
@@ -17,7 +17,7 @@ Overview
 
 Qt Quick 2 comes with the `Particles` module for making nice visual particle effects, which can be used by many applications that require a lot of tiny moving particles such as fire simualtion, smoke, stars, music visualization, and so on.
 
-The :qt5:`Particles <qtquick/qtquick-particles2-qml-particlesystem.html>` module is based on four major components:
+The :qt5:`Particles <qtquick/qtquick-particles2-qtquick-effects-particles.html>` module is based on four major components:
 
 .. image:: images/particles-module.png
     :align: center
diff --git a/particles_tutorial/shaders.rst b/particles_tutorial/shaders.rst
index c5db6fe..8592cc2 100644
--- a/particles_tutorial/shaders.rst
+++ b/particles_tutorial/shaders.rst
@@ -16,7 +16,7 @@ Overview
 
 In order to perform advanced graphical effects, Qt Quick 2 enables you to use vertex and fragment shader programs with your QML local properties via the :qt5:`ShaderEffect <qtquick/qml-qtquick2-shadereffect.html>` QML type.
 
-This type enables you to combine your GLSL program with your QML code to control the graphics at a much lower level using custom shaders. `ShaderEffect` enables you to implement a vertex or fragment shader program in your QML code via the :qt5-snapshot:`vertexShader <qml-qtquick2-shadereffect.html#vertexShader-prop>` and :qt5:`fragmentShader <qtquick/qml-qtquick2-shadereffect.html#fragmentShader-prop>` properties. When you specify a QML item as variant property in your `ShaderEffect`, the item is provided to your vertex or fragment shader as `Sampler2D`.
+This type enables you to combine your GLSL program with your QML code to control the graphics at a much lower level using custom shaders. `ShaderEffect` enables you to implement a vertex or fragment shader program in your QML code via the :qt5:`vertexShader <qml-qtquick2-shadereffect.html#vertexShader-prop>` and :qt5:`fragmentShader <qtquick/qml-qtquick2-shadereffect.html#fragmentShader-prop>` properties. When you specify a QML item as variant property in your `ShaderEffect`, the item is provided to your vertex or fragment shader as `Sampler2D`.
 
 Consider the following example:
 
diff --git a/particles_tutorial/tutorial.rst b/particles_tutorial/tutorial.rst
index ca65251..21aa717 100644
--- a/particles_tutorial/tutorial.rst
+++ b/particles_tutorial/tutorial.rst
@@ -557,7 +557,7 @@ Shader Effect
 
 Now we want to display a hot air balloon moving up from the bottom of the window and have a flag attached to it. For this we need two images:
 
-     One to simulate the hot air balloon with a ``NumberAnimation`` to make it move from the bottom to the top of the window:
+One to simulate the hot air balloon with a ``NumberAnimation`` to make it move from the bottom to the top of the window:
 
 .. code-block:: js
 
diff --git a/qmlprimer/01-setup/index.rst b/qmlprimer/01-setup/index.rst
index 671a74f..d8b4a32 100644
--- a/qmlprimer/01-setup/index.rst
+++ b/qmlprimer/01-setup/index.rst
@@ -8,8 +8,8 @@
     http://creativecommons.org/licenses/by-sa/2.5/legalcode .
     ---------------------------------------------------------------------------
 
-Setting up your work environment
-================================
+Work Environment Setup
+=======================
 
 If this is your first Qt Quick project, it makes sense to take a look at the tools you need, how a new project can be started and what are the most important needs of the daily development workflow.
 
diff --git a/qmlprimer/04-javascript/index.rst b/qmlprimer/04-javascript/index.rst
index db035b4..7b87efd 100644
--- a/qmlprimer/04-javascript/index.rst
+++ b/qmlprimer/04-javascript/index.rst
@@ -140,7 +140,7 @@ The complete code of our application importing JavaScript files as discussed abo
 
 .. Topic:: More Advanced Use of JavaScript
 
-    If you are interested in a more advanced use of JavaScript with Qt Quick, consider reading "Programming with Qt Quick for Symbian and MeeGo Harmattan Devices" and "Qt Quick Application Developer Guide for Desktop" available :guides-homepage:`under this link<>`.
+    If you are interested in a more advanced use of JavaScript with Qt Quick, consider reading "Qt Quick Application Developer Guide for Desktop" available :guides-homepage:`under this link<>`.
 
 .. rubric:: What's Next?
 
diff --git a/qmlprimer/conf.py b/qmlprimer/conf.py
index 0cd2818..ef142b6 100644
--- a/qmlprimer/conf.py
+++ b/qmlprimer/conf.py
@@ -33,7 +33,7 @@ htmlhelp_basename = 'IntroToApplicationDevelopmentWithQtQuick'
 
 latex_documents = [
   ('index', 'QtQuickAppDevIntro.tex', u'Introduction to Application Development with Qt Quick',
-   u'Qt Learning', 'manual'),
+   u'Digia, Qt Learning', 'manual'),
 ]
 
 # -- Options for Epub output ---------------------------------------------------
diff --git a/quick3d/chapter01/index.rst b/quick3d/chapter01/index.rst
index a6b9b77..af0336a 100644
--- a/quick3d/chapter01/index.rst
+++ b/quick3d/chapter01/index.rst
@@ -48,10 +48,11 @@ A .zip file that contains the source code of each chapter is provided here:
 
 The guide is available in the following formats:
 
-     :download:`PDF <gamedevelopmentqt3d/GameDevelopmentQt3D.pdf>`
-     :download:`ePub <gamedevelopmentqt3d/GameDevelopmentQt3D.epub>` for ebook readers. Further details can be found `here <http://en.wikipedia.org/wiki/EPUB#Software_reading_systems>`_.
-     :download:`Qt Help <gamedevelopmentqt3d/GameDevelopmentQt3D.qch>` for Qt Assistant and Qt Creator. In Qt Assistant under the :qt:`Preferences Dialog <assistant-details.html#preferences-dialog>`, in the `Documentation` tab (in a collapsible menu for Mac users), you click on the Add button in order to add this guide in the .qch format. We do the same in Qt Creator, under the `Options` dialog, in the `Help` section you, can add this guide in the `Documentation` tab.
+    * :download:`PDF <gamedevelopmentqt3d/GameDevelopmentQt3D.pdf>`
 
+    * :download:`ePub <gamedevelopmentqt3d/GameDevelopmentQt3D.epub>` for ebook readers.
+
+    * :download:`Qt Help <gamedevelopmentqt3d/GameDevelopmentQt3D.qch>` for Qt Assistant and Qt Creator.
 
 License
 -------
diff --git a/quick3d/chapter02/index.rst b/quick3d/chapter02/index.rst
index 770ded3..572ea5d 100644
--- a/quick3d/chapter02/index.rst
+++ b/quick3d/chapter02/index.rst
@@ -8,10 +8,10 @@
     http://creativecommons.org/licenses/by-sa/2.5/legalcode .
     ---------------------------------------------------------------------------
 
-How we proceed
+How we Proceed
 ===============
 
-In the following chapters, we will start with the development of our game. We will proceed step by step and take a deeper look on Qt3D Qt Qtuick API and related technologies. The source code archive accompanying this guide contains the final version of the application. Since this guide in on an advanced level, we will discuss relevant code samples directly taken from this version and omit making small applications for each topic.
+In the following chapters, we will start with the development of our game. We will proceed step-by-step and take a deeper look on Qt3D Qt Qtuick API and related technologies. The source code archive accompanying this guide contains the final version of the application. Since this guide in on an advanced level, we will discuss relevant code samples directly taken from this version and omit making small applications for each topic.
 
 First, we will cover basics of the Qt Quick Qt3D API. After this, we learn how to load models and textures. We will also cover dynamic model creation, making Head up Displays, states, a game menu, and the usage of GLSL shaders.
 
diff --git a/quick3d/chapter02/step_1.rst b/quick3d/chapter02/step_1.rst
index 8ae1bab..3ea40af 100644
--- a/quick3d/chapter02/step_1.rst
+++ b/quick3d/chapter02/step_1.rst
@@ -9,7 +9,7 @@
     ---------------------------------------------------------------------------
 
 
-Overview of the "SpaceBurger" game
+Overview of the "SpaceBurger" Game
 ==================================
 
 Application idea
diff --git a/quick3d/chapter02/step_2.rst b/quick3d/chapter02/step_2.rst
index 378bd27..f2f989c 100644
--- a/quick3d/chapter02/step_2.rst
+++ b/quick3d/chapter02/step_2.rst
@@ -9,8 +9,8 @@
     ---------------------------------------------------------------------------
 
 
-Qt3D, the basics
-=================
+Qt3D Basics
+===========
 
 In order to starting using Qt3D API in Qt Quick you need to import it in your application with the statement:
 
diff --git a/quick3d/chapter04/index.rst b/quick3d/chapter04/index.rst
index fab511a..de5a7c4 100644
--- a/quick3d/chapter04/index.rst
+++ b/quick3d/chapter04/index.rst
@@ -239,11 +239,9 @@ One or more transformations can be applied to an `Item3D`'s `transform` or `pret
 
 As explained above, we want the     hamburger* to rotate in the flight direction, so we need to achieve three things:
 
-     When moving *hamburger* along the `x` axis (left or right), the *hamburger* should roll a bit into flight direction. (the rotation axis is the `z` axis)
-
-     When moving *hamburger* along the `x` axis (left or right), it should move the nose in flight direction. (the rotation axis is the `y` axis)
-
-     When moving *hamburger* along the `y` axis (up or down), the *hamburger* should move its front up or down. (the rotation axis is the `x` axis)
+    * When moving *hamburger* along the `x` axis (left or right), the *hamburger* should roll a bit into flight direction. (the rotation axis is the `z` axis)
+    * When moving *hamburger* along the `x` axis (left or right), it should move the nose in flight direction. (the rotation axis is the `y` axis)
+    * When moving *hamburger* along the `y` axis (up or down), the *hamburger* should move its front up or down. (the rotation axis is the `x` axis)
 
 Now we can add the different transformations to the `transform` property in the  `Player.qml` and specify their axis. We are connecting the angle of each rotation directly to the acceleration, which will have a fairly good-looking result. The scalar factors have been obtained by trial and error:
 
diff --git a/quick3d/conf.py b/quick3d/conf.py
index 1d1abbf..1539ff9 100644
--- a/quick3d/conf.py
+++ b/quick3d/conf.py
@@ -28,7 +28,7 @@ htmlhelp_basename = 'GameDevelopmentQt3D'
 
 latex_documents = [
   ('index', 'GameDevelopmentQt3D.tex', u'Developing an arcade game with Qt3D',
-   u'Nokia, Qt Learning', 'manual'),
+   u'DIgia, Qt Learning', 'manual'),
 ]
 
 # -- Options for Epub output ---------------------------------------------------
@@ -44,5 +44,5 @@ epub_title = u'GameDevelopmentQt3D'
 qthelp_basename = 'GameDevelopmentQt3D'
 
 
-version = '0.2'
-release = 'Draft - Work in Progress'
\ No newline at end of file
+version = '1.0'
+
diff --git a/scripts/qtextensions/shared/conf.py b/scripts/qtextensions/shared/conf.py
index 23be9bb..db6093e 100644
--- a/scripts/qtextensions/shared/conf.py
+++ b/scripts/qtextensions/shared/conf.py
@@ -46,8 +46,8 @@ extlinks = {
     'sdk': ('http://doc.qt.digia.com/sdk-1.1/%s', None),
     'simulator': ('http://doc.qt.digia.com/qtsimulator/%s', None),
     'qt': ('http://qt-project.org/doc/qt-4.8/%s', None),
-    'qt5': ('http://qt-project.org/doc/qt-5.0/qtdoc/%s', None),
-    'qt5-snapshot': ('http://doc-snapshot.qt-project.org/5.0/qtdoc/%s', None),
+    'qt5': ('http://qt-project.org/doc/qt-5.0/%s', None),
+    'qt5-snapshot': ('http://doc-snapshot.qt-project.org/%s', None),
     'guides-homepage': ('http://qt-project.org/wiki/Developer-Guides/%s', None),
     'download': ('http://releases.qt-project.org/learning/developerguides/%s', None),
     'qtquick-repo': ('http://qt-project.org/doc/qt-4.8/%s', None),
@@ -293,7 +293,7 @@ epub_basename = 'document_epub_basename'
 
 # Bibliographic Dublin Core info.
 epub_title = u'epub_title'
-epub_author = u'Nokia, Qt Learning'
+epub_author = u'Digia, Qt Learning'
 epub_publisher = u'http://qt.digia.com/Product/Learning/'
 epub_copyright = u'(C) 2011 Nokia'