diff --git a/doc/images/qtcreator-code-style-settings-edit-nim.png b/doc/images/qtcreator-code-style-settings-edit-nim.png
new file mode 100644
index 00000000000..9f77ebe8387
Binary files /dev/null and b/doc/images/qtcreator-code-style-settings-edit-nim.png differ
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index f2534685923..eb9a5049ba9 100644
Binary files a/doc/images/qtcreator-new-qt-quick-project-wizard.png and b/doc/images/qtcreator-new-qt-quick-project-wizard.png differ
diff --git a/doc/images/qtcreator-options-code-style-nim.png b/doc/images/qtcreator-options-code-style-nim.png
new file mode 100644
index 00000000000..5f4d42ac50b
Binary files /dev/null and b/doc/images/qtcreator-options-code-style-nim.png differ
diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc
index a69019bba9f..4a28c5830a4 100644
--- a/doc/src/editors/creator-editors-writing-code.qdoc
+++ b/doc/src/editors/creator-editors-writing-code.qdoc
@@ -73,8 +73,8 @@
         \li \l{Indenting Text or Code}
 
             \QC indents text and code according to rules that you
-            specify separately for files that contain C++ or QML code and for
-            other text files.
+            specify separately for files that contain C++, QML, or
+            Nim (experimental) code and for other text files.
 
         \li \l{Using Qt Quick Toolbars}
 
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 4b42c3f895e..7ac3dfaeaac 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -1190,6 +1190,8 @@
 
         \li QML files
 
+        \li Nim files
+
         \li Other text files
 
     \endlist
@@ -1273,6 +1275,33 @@
     To specify different settings for a particular project, select
     \uicontrol Projects > \uicontrol {Code Style Settings}.
 
+    \section1 Indenting Nim Files
+
+    To specify settings for the Nim editor (experimental):
+
+    \list 1
+
+        \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Nim.
+
+        \li In the \uicontrol {Current settings} field, select the settings to
+            modify and click \uicontrol Copy.
+
+            \image qtcreator-options-code-style-nim.png "Nim Code Style options"
+
+        \li Give a name to the settings and click \uicontrol OK.
+
+        \li Click \uicontrol Edit to specify code style settings for the project.
+
+            \image qtcreator-code-style-settings-edit-nim.png "Edit Code Style Settings dialog"
+
+    \endlist
+
+    You can specify how to interpret the \key Tab key presses and how to align
+    continuation lines.
+
+    To specify different settings for a particular project, select
+    \uicontrol Projects > \uicontrol {Code Style}.
+
     \section1 Indenting Other Text Files
 
     To specify indentation settings for text files that do not contain C++ or
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index f02ec75d528..40c1222d7e6 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -213,11 +213,22 @@
 
         \list
 
-            \li Plain C or C++ Project
+            \li Plain C or C++ Application
 
-                Plain C or C++ project that uses qmake, Qbs, or CMake but does
+                Plain C or C++ application that uses qmake, Qbs, or CMake but does
                 not use the Qt library
 
+            \li Nim Application (experimental)
+
+                \l{http://nim-lang.org/}{Nim} application that uses qmake
+                or CMake but does not use the Qt library
+
+                \note The \uicontrol {Nim Application} option becomes visible
+                after you enable the experimental Nim plugin. Select
+                \uicontrol Help > \uicontrol {About Plugins} >
+                \uicontrol {Other Languages} > \uicontrol Nim, and then restart
+                \QC.
+
         \endlist
 
         \li Import Project
@@ -316,6 +327,10 @@
             Python class and source files that you can use to create Python
             classes and scripts with UTF-8 encoding.
 
+        \li Nim (experimental)
+
+            Nim source files with UTF-8 encoding.
+
     \endlist
 
     \section2 Creating C++ Classes
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index ebcbccc3419..db5420621ec 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -87,7 +87,8 @@
 
     You can specify command-line arguments in the arguments fields:
     \uicontrol {Additional arguments}, \uicontrol {Command arguments},
-    \uicontrol {Make arguments}, or \uicontrol Arguments. You can create shell command lines
+    \uicontrol {Make arguments}, \uicontrol Arguments, \uicontrol {Default Arguments},
+    or \uicontrol {Extra arguments}. You can create shell command lines
     that can contain redirection and other advanced constructs. However, some
     more complex use cases, such as piping test data into the application being
     tested or grouping commands, are not supported because the value of the