Merge branch 'stable' into dev

Conflicts:
	src/qml/doc/qtqml.qdocconf
	src/quick/doc/qtquick.qdocconf

Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 1121f02dba..090d173f9f 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -347,9 +347,9 @@ static void usage()
 {
     qWarning("Usage: qmlscene [options] <filename>");
     qWarning(" ");
-    qWarning(" options:");
-    qWarning("  --maximized ............................... run maximized");
-    qWarning("  --fullscreen .............................. run fullscreen");
+    qWarning(" Options:");
+    qWarning("  --maximized ............................... Run maximized");
+    qWarning("  --fullscreen .............................. Run fullscreen");
     qWarning("  --transparent ............................. Make the window transparent");
     qWarning("  --multisample ............................. Enable multisampling (OpenGL anti-aliasing)");
     qWarning("  --no-version-detection .................... Do not try to detect the version of the .qml file");
@@ -358,7 +358,7 @@ static void usage()
     qWarning("  --quit .................................... Quit immediately after starting");
     qWarning("  -I <path> ................................. Add <path> to the list of import paths");
     qWarning("  -B <name> <file> .......................... Add a named bundle");
-    qWarning("  -translation <translationfile> ........... set the language to run in");
+    qWarning("  -translation <translationfile> ............ Set the language to run in");
 
     qWarning(" ");
     exit(1);