diff --git a/doc/images/qtcreator-project-options-deploy.png b/doc/images/qtcreator-project-options-deploy.png
index d4c0f8cad2f..d921afe180e 100644
Binary files a/doc/images/qtcreator-project-options-deploy.png and b/doc/images/qtcreator-project-options-deploy.png differ
diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc
index 7ec6f935c0e..adb348bc56c 100644
--- a/doc/src/howto/creator-ui.qdoc
+++ b/doc/src/howto/creator-ui.qdoc
@@ -451,6 +451,13 @@
     Select toolbar buttons to run applications, to attach the debugger to the
     running application, and to stop running or debugging.
 
+    To specify settings for displaying application output, select
+    \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
+    \uicontrol General. You can select whether to open the
+    \uicontrol{Application Output} pane on output when running or debugging
+    applications, to clear old output on a new run, to word-wrap output, and to
+    limit output to the specified number of lines.
+
     \section2 Compile Output
 
     The \uicontrol{Compile Output} pane provides all output from the compiler.
@@ -464,6 +471,11 @@
 
     Select the \uicontrol {Cancel Build} button to cancel the build.
 
+    To specify whether to open the \uicontrol {Compile Output} pane on output
+    when building applications, select \uicontrol Tools > \uicontrol Options >
+    \uicontrol {Build & Run} > \uicontrol General, and then select the
+    \uicontrol {Open Compile Output pane when building} check box.
+
     \section2 Debugger Console
 
     In the \uicontrol {Debugger Console}, you can type JavaScript expressions and use them to get
diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc
index 3b1b6016604..be8f94fe1db 100644
--- a/doc/src/projects/creator-projects-builds-customizing.qdoc
+++ b/doc/src/projects/creator-projects-builds-customizing.qdoc
@@ -47,4 +47,13 @@
 
     \image qtcreator-project-options-deploy.png "Project General Options"
 
+    On Windows, you can use \c jom instead of \c nmake for building the project
+    to distribute the compilation process to multiple CPU cores. You can download
+    \c jom from \l{http://download.qt.io/official_releases/jom}{Qt Downloads}.
+    To use \c jom, select the \uicontrol {Use jom instead of nmake} check box.
+    Deselect the check box if you experience build problems.
+
+    You can specify the default build directory  in the
+    \uicontrol {Default build directory} field using \QC variables (2).
+
 */