Doc: Do not use the term "Output pane" in docs

When necessary, replace it with "view". When possible,
rephrase to omit the term. Link to descriptions of the
output views.

Update screenshots.

Change-Id: I80ccd12f5a10f221bbea6de994a15ddd07d20842
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

40 files changed, 151 insertions, 158 deletions

diff --git a/doc/qtcreator/images/qtcreator-code-pasting-options.png b/doc/qtcreator/images/qtcreator-code-pasting-options.png
index 38a1d4a397..d9bb548098 100644
--- a/doc/qtcreator/images/qtcreator-code-pasting-options.png
+++ b/doc/qtcreator/images/qtcreator-code-pasting-options.png
diff --git a/doc/qtcreator/images/qtcreator-external-tools.png b/doc/qtcreator/images/qtcreator-external-tools.png
index 31b325b180..949eff9ae2 100644
--- a/doc/qtcreator/images/qtcreator-external-tools.png
+++ b/doc/qtcreator/images/qtcreator-external-tools.png
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index c9d9fe89b4..f95f7dda85 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -504,6 +504,6 @@
             the performance counters system.
     \endlist
 
-    Output from the helper program that processes the data is displayed in the
-    \uicontrol {General Messages} output pane.
+    Output from the helper program that processes the data is displayed in
+    \l{Viewing Output}{General Messages}.
 */
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index 7af5767204..9d815d0f8c 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -295,8 +295,8 @@
     the application for debugging.
 
     \note \QC cannot debug applications on Android devices if Android Studio is
-    running. If the following message is displayed in the \uicontrol Output
-    pane, close Android Studio and try again:
+    running. If the following message is displayed in \l {Application Output},
+    close Android Studio and try again:
 
     \badcode
     Ignoring second debugger -accepting and dropping.
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index 97c12b936d..bc52fb782d 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -138,7 +138,7 @@
     \l{androiddeployqt}.
 
     You can view information about what the \c androiddeployqt tool is doing in
-    the \uicontrol {Compile Output} pane. To view additional information, select the
+    \l {Compile Output}. To view additional information, select the
     \uicontrol {Verbose output} check box.
 
     Select \uicontrol {Add debug server} to include the debug server binary
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index 45e55f4298..d2c760b6e1 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -237,6 +237,5 @@
 
     \image qtcreator-cmake-clean-steps.png
 
-    The build errors and warnings are parsed and displayed in the
-    \l Issues output pane.
+    The build errors and warnings are parsed and displayed in \l Issues.
 */
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index 5cac40c637..f9e83a01bb 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -166,7 +166,7 @@
 
     \endlist
 
-    Warnings and errors are displayed in the \l {Issues} output pane.
+    Warnings and errors are displayed in \l {Issues}.
 
    \section1 Adding External Libraries to CMake Projects
 
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
index f1d74a9d8e..bd2551e620 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdocinc
@@ -203,9 +203,9 @@
     views, select the \uicontrol {Use Python dumper} check box.
     For more information, see \l{Debugging Helper Implementation}.
 
-    To add information about first-chance and second-chance exceptions
-    to the \uicontrol Issues output pane, select the check boxes
-    in the \uicontrol {Add Exceptions to the Issues View} group.
+    To display information about first-chance and second-chance exceptions
+    in \l Issues, select the check boxes
+    in the \uicontrol {Add Exceptions to Issues View} group.
 
     \section2 Setting CDB Paths on Windows
 
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index 28265fb931..1791b8b948 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -1497,7 +1497,7 @@
     You might have created a release build that does not contain debug
     information. A GNU Compiler Collection (GCC) debug build has the \c {-g}
     option on the compiler command line. Check that this option is present in
-    the \uicontrol {Compile Output} pane. If it is not, adjust your build
+    the \l {Compile Output}. If it is not, adjust your build
     settings in the \uicontrol Projects mode.
 
     \section1 Debugger Does Not Work
diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
index 51afd4ba68..9375d05fb6 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc
@@ -104,7 +104,7 @@
             \image qtquick-example-setting-breakpoint3.png
 
         \li To execute JavaScript commands in the current context, open the
-            \uicontrol {QML Debugger Console} output pane.
+            \uicontrol {QML Debugger Console}.
 
             \image qml-script-console.png
 
diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
index 02897e71a9..be900ea655 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
@@ -253,8 +253,8 @@
 
     When the application is interrupted by a breakpoint, you can use the
     \uicontrol {QML Debugger Console} to execute JavaScript expressions in the
-    current context. To open it, choose \uicontrol View >
-    \uicontrol {Output Panes} > \uicontrol {QML Debugger Console}.
+    current context. To open it, choose \uicontrol View > \uicontrol Output >
+    \uicontrol {QML Debugger Console}.
 
     \image qml-script-console.png "QML Debugger Console"
 
diff --git a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
index 371aaeee16..de6d476d53 100644
--- a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc
@@ -89,8 +89,8 @@
         \endif
     \endlist
 
-    The \uicontrol {Search Results} pane shows the location
-    and number of search hits in the current project.
+    \l{Search Results} shows the location and number of search hits in the
+    current project.
 
     \if defined(qtcreator)
     \image qtcreator-refactoring-find.png
@@ -101,12 +101,11 @@
     You can browse the search results in the following ways:
 
     \list
-        \li To go directly to an instance, double-click the instance in the
-            \uicontrol {Search Results} pane.
+        \li To go directly to an instance, double-click the instance in
+            \uicontrol {Search Results}.
         \li To move between instances, click the \inlineimage icons/next.png
             (\uicontrol {Next Item}) button and \inlineimage icons/prev.png
-            (\uicontrol {Previous Item}) button in the
-            \uicontrol {Search Results} pane.
+            (\uicontrol {Previous Item}) button in \uicontrol {Search Results}.
         \li To expand and collapse the list of all instances, click the
             \inlineimage icons/qtcreator-expand.png
             (\uicontrol {Expand All}) button.
@@ -139,7 +138,7 @@
     \uicontrol {QML/JS} > \uicontrol {Rename Symbol Under Cursor}
     or press \key {Ctrl+Shift+R}.
 
-    The \uicontrol {Search Results} pane shows the location
+    \uicontrol {Search Results} shows the location
     and number of instances of the symbol in the current project.
 
     \if defined(qtcreator)
@@ -153,15 +152,15 @@
     To omit an instance, deselect the check box next to the instance.
 
     \note This action replaces all selected instances of the symbol in
-    all files listed in the \uicontrol {Search Results} pane. You cannot
+    all files listed in \uicontrol {Search Results}. You cannot
     undo this action.
 
     \if defined(qtcreator)
     If the symbol is a class, select the \uicontrol {Rename files} check
     box to also change the filenames that match the class name.
 
-    \note Renaming local symbols does not open the \uicontrol {Search Results}
-    pane. The instances of the symbol are highlighted in code and you can edit
+    \note Renaming local symbols does not open \uicontrol {Search Results}.
+    The instances of the symbol are highlighted in code and you can edit
     the symbol. All instances of the local symbol are changed as you type.
     \endif
 
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index f54337dd90..c320b19271 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -106,7 +106,7 @@
     find common problems. To run the checks, select \uicontrol Tools >
     \uicontrol {QML/JS} > \uicontrol {Run Checks} or press \key {Ctrl+Shift+C}.
     The results are shown in the \uicontrol QML and \uicontrol {QML Analysis}
-    filters of the \uicontrol Issues output pane.
+    filters in \l Issues.
 
     Many of the error messages are similar to the ones in Douglas Crockford's
     \l{http://www.jslint.com}{JSLint} tool. For more information about JSLint
diff --git a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
index 5fbc28c832..3110d8800f 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc
@@ -56,9 +56,9 @@
         \li Select the \uicontrol {Copy-paste URL to clipboard} check box to
             copy the URL of the post on the code pasting service to the
             clipboard when you paste a post.
-        \li Select the \uicontrol {Display Output pane after sending a post}
-            check box to display the URL in the \uicontrol {General Messages}
-            output pane when you paste a post.
+        \li Select the \uicontrol {Display General Messages after sending a post}
+            check box to display the URL in \l{Viewing Output}{General Messages}
+            when you paste a post.
     \endlist
 
     Select \uicontrol Fileshare to specify the path to a shared network drive.
@@ -70,8 +70,7 @@
     To paste a snippet of code onto the server, select \uicontrol Tools >
     \uicontrol {Code Pasting} > \uicontrol {Paste Snippet} or press
     \key {Alt+C,Alt+P}. By default, \QC copies the URL of the snippet to the
-    clipboard and displays the URL in the \uicontrol {General Messages} output
-    pane.
+    clipboard and displays the URL in \uicontrol {General Messages}.
 
     To paste any content that you copied to the clipboard, select
     \uicontrol Tools > \uicontrol {Code Pasting} > \uicontrol {Paste Snippet}.
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index 001e85c146..056d8d8640 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -116,9 +116,9 @@
             patterns to extend the MIME types, separated by semicolons.
         \li In the \uicontrol {Startup behavior} field, select whether the
             language server is started when \QC starts or when a project or file
-            with a matching MIME type is opened. The
-            \uicontrol {General Messages} \l{Viewing Output}{output pane}
-            displays information about the connection to the language server.
+            with a matching MIME type is opened. \l{Viewing Output}
+            {General Messages} displays information about the connection to the
+            language server.
         \li In the \uicontrol Initialization field, you can add language server
             specific JSON attributes to pass to an \c initialize request.
         \li In the \uicontrol Executable field, enter the path to the language
diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
index 19edbf3784..fadaa0853f 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
@@ -90,7 +90,7 @@
     chart, select \inlineimage icons/statistics.png
     (\uicontrol {View Statistics}).
 
-    To search from the state chart, use the \uicontrol Search pane. The search
+    To search from the state chart, use \l {Search Results}. The search
     checks the whole SCXML tree for attributes that match the search criteria.
 
     To save the currently visible part of the state chart as an image, select
diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc
index 7a1e7dd9de..e68c1725ca 100644
--- a/doc/qtcreator/src/editors/creator-search.qdoc
+++ b/doc/qtcreator/src/editors/creator-search.qdoc
@@ -194,8 +194,8 @@
 
             \image qtcreator-searchresults.png
 
-             A list of files containing the searched text is displayed in the
-            \uicontrol {Search Results} pane.
+            A list of files containing the searched text is displayed in
+            \l {Search Results}.
 
             \list
 
diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
index 42983fe632..a2a7f8b48f 100644
--- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
+++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc
@@ -73,8 +73,8 @@
     If the editor cannot find the highlight definition for a file that you open
     for editing, it prompts you to download additional highlight definition
     files. Select \uicontrol {Download Definitions} to download the files.
-    Information about the downloaded files is displayed in the
-    \uicontrol {General Messages} \l{Viewing Output}{output pane}.
+    Information about the downloaded files is displayed in \l{Viewing Output}
+    {General Messages}.
 
     To suppress the message for a particular file pattern, select
     \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor}
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 35aae547c7..a492b11d85 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -135,8 +135,8 @@
             working directory.
 
         \li In the \uicontrol Output field, select how to handle output from the
-            tool. You can ignore the output, view it in the \uicontrol {General
-            Messages} output pane, or replace the selected text with the
+            tool. You can ignore the output, view it in \l{Viewing Output}
+            {General Messages}, or replace the selected text with the
             output in the code editor.
 
         \li In the \uicontrol {Error output} field, select how to handle error
diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
index a323726b77..2ff220a8c2 100644
--- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc
@@ -227,22 +227,22 @@
             \li  Switch to \uicontrol Help mode
             \li  Ctrl+6
         \row
-            \li  Toggle \uicontrol{Issues} pane
+            \li  Toggle \uicontrol{Issues}
             \li  Alt+1 (Cmd+1 on \macos)
         \row
-            \li  Toggle \uicontrol{Search Results} pane
+            \li  Toggle \uicontrol{Search Results}
             \li  Alt+2 (Cmd+2 on \macos)
         \row
-            \li  Toggle \uicontrol{Application Output} pane
+            \li  Toggle \uicontrol{Application Output}
             \li  Alt+3 (Cmd+3 on \macos)
         \row
-            \li  Toggle \uicontrol{Compile Output} pane
+            \li  Toggle \uicontrol{Compile Output}
             \li  Alt+4 (Cmd+4 on \macos)
         \row
-            \li  Toggle other output panes
+            \li  Toggle other output views
             \li  Alt+number (Cmd+number on \macos)
 
-            Where the number is the number of the output pane.
+            Where the number is the number of the view.
         \if defined(qtcreator)
         \row
             \li  Activate \uicontrol Bookmarks view
@@ -255,13 +255,13 @@
             \li  Activate \uicontrol{Open Documents} view
             \li  Alt+O
         \row
-            \li  Maximize output panes
+            \li  Maximize output views
             \li  Alt+9
         \row
-            \li  Move to next item in output panes
+            \li  Move to next item in output
             \li  F6
         \row
-            \li  Move to previous item in output panes
+            \li  Move to previous item in output
             \li  Shift+F6
         \row
             \li  Activate \uicontrol Projects view
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index 89064fe4de..74aee3aacb 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -332,7 +332,7 @@
 
         \li In the \uicontrol Tests view, select the tests to run.
 
-        \li In the \uicontrol {Test Results} output pane, select:
+        \li In the \uicontrol {Test Results}, select:
 
             \list
                 \li \inlineimage icons/run_small.png
@@ -437,8 +437,8 @@
     are omitted by default. To view them, deselect the \uicontrol {Omit internal
     messages} and \uicontrol {Omit run configuration warnings} check boxes.
 
-    By default, test result output is limited to 100,000 characters. The output
-    pane is automatically scrolled down when new results are added. To display
+    By default, test result output is limited to 100,000 characters. The view
+    is automatically scrolled down when new results are added. To display
     full results, deselect the \uicontrol {Limit result output} check box.
     To disable automatic scrolling, deselect the
     \uicontrol {Automatically scroll results} check box.
@@ -598,7 +598,7 @@
 
     \section1 Viewing Test Output
 
-    The test results are displayed in the \uicontrol {Test Results} output pane
+    The test results are displayed in \l{Viewing Output}{Test Results}
     in XML format. XML can be parsed more easily and reliably than plain text.
 
     However, if a Qt test crashes, it might not produce complete XML code that
@@ -608,11 +608,11 @@
     \uicontrol Options > \uicontrol {Testing} > \uicontrol {Qt Test}, and
     then deselect the \uicontrol {Use XML output} check box. Then select the
     \inlineimage icons/text.png
-    (\uicontrol {Switch Between Visual and Text Display}) button in the
-    \uicontrol {Test Results} output pane to switch to the text display.
+    (\uicontrol {Switch Between Visual and Text Display}) button in
+    \uicontrol {Test Results} to switch to the text display.
 
-    The following table lists the messages that the \uicontrol {Test Results}
-    output pane displays:
+    The following table lists the messages that \uicontrol {Test Results}
+    displays:
 
     \table
         \header
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index cbee052d36..3562e08864 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -43,7 +43,7 @@
     \li \l {Move between open files}
     \li \l {Switch to Edit mode}
     \li \l {Find a specific setting}
-    \li \l {Open output panes}
+    \li \l {View output}
     \li \l {Find keyboard shortcuts}
     \li \l {Run \QC from the command line}
     \li \l {Show and hide sidebars}
@@ -114,13 +114,16 @@
     To find specific settings in \uicontrol Tools > \uicontrol Options,
     use the filter located at the top left of the \uicontrol Options dialog box.
 
-    \section1 Open output panes
+    \section1 View output
 
-    The \l{Viewing Output}{output panes} provide a list of errors and warnings
-    encountered during a build, detailed output from the compiler, status of a
-    program when it is executed, debug output, and search results.
+    The \l{Viewing Output}{taskbar} provides different views to output from
+    several sources, such as a list of errors and warnings encountered during
+    a build, detailed output from the compiler, status of a program when it is
+    executed, debug output, or search results.
 
-    To open output panes, use the following shortcuts:
+    \image qtcreator-output-panes-taskbar.png "Output on the taskbar"
+
+    To view different types of output, use the following shortcuts:
 
     \list
 
@@ -134,7 +137,7 @@
 
     \endlist
 
-    For additional ways to open all output panes, see \l{Viewing Output}.
+    For additional ways to view other types of output, see \l{Viewing Output}.
 
     \section1 Find keyboard shortcuts
 
diff --git a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
index e337a15573..0b7b830de1 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc
@@ -34,11 +34,11 @@
     \page creator-task-lists.html
     \nextpage creator-logging-viewer.html
 
-    \title Showing Task List Files in Issues Pane
+    \title Showing Task List Files in Issues
 
     You can use code scanning and analysis tools to examine source code. These
     tools report issues for you to fix. \QC enables you to load lists of
-    issues into the \uicontrol Issues pane for easier navigation.
+    issues into \l Issues for easier navigation.
 
     \QC expects tasks to be defined in a simple line-based file format that is
     easy to generate using scripts. The scripts can either convert reports from
@@ -49,13 +49,13 @@
 
     \section1 Managing Task List Entries
 
-    To open task list files in the \uicontrol Issues pane, choose \uicontrol File  >
+    To open task list files in \uicontrol Issues, choose \uicontrol File  >
     \uicontrol Open. Right-click a task list entry to open a context menu that
     contains commands for managing the entry. You can copy or remove task list
     entries or navigate to the corresponding source code.
 
-    \QC monitors the loaded files and displays the changes in the \uicontrol Issues
-    pane. To keep the current entries in a task list, but stop checking for
+    \QC monitors the loaded files and displays the changes in \uicontrol Issues.
+    To keep the current entries in a task list, but stop checking for
     changes, select \uicontrol {Stop Monitoring}.
 
     \section1 Task List File Format
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
index bcb5b6ee9e..d922281b4d 100644
--- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
@@ -256,7 +256,7 @@
 
     \b {On Unix (Linux and \macos):} \c qDebug() and related functions use
     the standard output and error output. When you run or debug the
-    application, you can view the output in the \uicontrol{Application Output} pane.
+    application, you can view the output in \l{Application Output}.
 
     For console applications that require input, select \uicontrol Projects >
     \uicontrol {Run Settings} > \uicontrol {Run in terminal}. To specify the
@@ -287,9 +287,9 @@
     \uicontrol {Run in terminal} for console applications.
 
     For GUI applications, \c qDebug() and related functions use the Windows API
-    function \c OutputDebugString(). The output is displayed in the
-    \uicontrol{Application Output} pane. However, only one output pane tab may be
-    open at a time or the output is not displayed correctly. You can use an
+    function \c OutputDebugString(). The output is displayed in
+    \uicontrol{Application Output}. However, \QC can show output from only one
+    source at the time for it to be displayed correctly. You can use an
     external debug output viewer, such as the
     \l{https://technet.microsoft.com/en-us/sysinternals/bb896647}
     {DebugView for Windows} to display output from GUI applications.
diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
index 84c754d23a..68a4042d4e 100644
--- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
+++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
@@ -51,8 +51,7 @@
     In the \uicontrol {Target and configuration} group, specify the command
     helper and arguments that will be used to construct the build command.
 
-    The build errors and warnings are parsed and displayed in the
-    \uicontrol Issues output pane.
+    The build errors and warnings are parsed and displayed in \l Issues.
 
     Select the \uicontrol {Keep original jobs number} check box to stop
     IncrediBuild from overriding the \c {-j} command line switch, which
@@ -142,6 +141,5 @@
 
     For more information about the settings, see \l{IncrediBuild Build Steps}.
 
-    The build errors and warnings are parsed and displayed in the
-    \uicontrol Issues output pane.
+    The build errors and warnings are parsed and displayed in \l Issues.
 */
diff --git a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
index dcf1a3996e..288630105f 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
@@ -66,7 +66,6 @@
 
     \image qtcreator-meson-clean-steps.png "Meson clean steps"
 
-    The build errors and warnings are parsed and displayed in the
-    \uicontrol Issues output pane.
+    The build errors and warnings are parsed and displayed in \uicontrol Issues.
 
 */
diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
index b64bc84267..b3949a0d92 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc
@@ -88,12 +88,11 @@
 
     \list
 
-        \li \l{Showing Task List Files in Issues Pane}
+        \li \l{Showing Task List Files in Issues}
 
             You can load report files created by code scanning and analysis
-            tools to the \uicontrol Issues output pane. You can navigate to the
-            corresponding source code by clicking the error message or by using
-            keyboard shortcuts.
+            tools to \l Issues. You can navigate to the corresponding source
+            code by clicking the error message or by using keyboard shortcuts.
 
         \li \l{Inspecting Internal Logs}
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
index bac658aef5..250551f442 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
@@ -104,7 +104,7 @@
             items with names consisting of plain characters, numbers,
             underscores, and hyphens.
 
-        \li  If error messages displayed in the \uicontrol {Compile Output} pane contain
+        \li  If error messages displayed in \l {Compile Output} contain
             paths where slashes are missing (for example, C:QtSDK),
             check your PATH variable. For more information, see
             \l{Troubleshooting MinGW Compilation Errors}.
diff --git a/doc/qtcreator/src/projects/creator-only/creator-custom-output-parser.qdoc b/doc/qtcreator/src/projects/creator-only/creator-custom-output-parser.qdoc
index fd49fe581b..499a5ff1fd 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-custom-output-parser.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-custom-output-parser.qdoc
@@ -32,7 +32,7 @@
 
     Custom output parsers scan command line output for error
     and warning patterns that you specify and create entries
-    for found patterns in the \uicontrol Issues output pane.
+    for found patterns in \l Issues.
 
     To view or add custom output parsers, select
     \uicontrol Tools > \uicontrol Options >
@@ -68,9 +68,9 @@
         \li In the \uicontrol {Error message capture pattern} field, specify
             a regular expression to define what is an error. The custom
             parser matches the compile output line by line against the
-            regular expression and displays errors in the \uicontrol Issues
-            output pane. Create regular expression groups that contain
-            the file name, line number and error message.
+            regular expression and displays errors in \l Issues. Create
+            regular expression groups that contain the file name, line number
+            and error message.
         \li In the \uicontrol {Capture Positions} field, map the regular
             expression groups to \uicontrol {File name}, \uicontrol {Line number},
             and \uicontrol Message.
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index 7d44a42884..93949aa658 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -85,8 +85,8 @@
         \li Click \inlineimage icons/run_small.png
             (\uicontrol Run) to build and run the application.
 
-        \li To see the compilation progress, press \key{Alt+4} to open the
-            \uicontrol {Compile Output} pane.
+        \li To see the compilation progress, press \key{Alt+4} to open
+            \l {Compile Output}.
 
             If build errors occur, check that a Qt version and
             \l{Adding Compilers}{compiler} are installed and
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
index a16d5bc93d..762be99728 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
@@ -46,8 +46,7 @@
 
     To check that the application code can be compiled and linked for a device,
     you can build the project. The build errors and warnings are displayed in
-    the \uicontrol {Issues} output pane. More detailed information is displayed
-    in the \uicontrol {Compile Output} pane.
+    the \l Issues. More detailed information is displayed in \l {Compile Output}.
 
     To build an application:
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index 79280560dc..86b6f16871 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -245,7 +245,7 @@
 
     \section1 Troubleshooting \MinGW Compilation Errors
 
-    If error messages displayed in the \uicontrol {Compile Output} pane contain
+    If error messages displayed in \l {Compile Output} contain
     paths where slashes are missing (for example, \c {C:QtSDK}),
     check your PATH variable. At the command line, enter the following commands:
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
index 329b69094b..02975bb398 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
@@ -86,7 +86,7 @@
                     errors occur, if possible.
 
                 \li Select \uicontrol {Show command lines} to print actual
-                    command lines to the compile output pane instead of
+                    command lines to \l{Compile Output} instead of
                     high-level descriptions.
 
                 \li Select \uicontrol {Force probes} to force re-execution of
diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc
index 4d4bbbe4f3..d96d832951 100644
--- a/doc/qtcreator/src/projects/creator-projects-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc
@@ -77,9 +77,9 @@
     Select \uicontrol Manage to manage device settings. For example, you can add
     AVDs or manually start disconnected AVDs.
 
-    The \uicontrol {Application Output} pane displays the status of the
+    \l {Application Output} displays the status of the
     application while it is running. You can select the \uicontrol Run button
-    in the pane to re-run applications without building them first. This is
+    to re-run applications without building them first. This is
     useful when developing Qt Quick applications, because the QML files are
     interpreted at runtime. Therefore, the application does not need to be
     built again if you edited only QML files. This saves time especially if
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 23bc02bec2..ffdc1f1f03 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -228,7 +228,7 @@
             \li \l{Using Command Line Options}
             \li \l{Keyboard Shortcuts}
             \li \l{Using External Tools}
-            \li \l{Showing Task List Files in Issues Pane}
+            \li \l{Showing Task List Files in Issues}
             \li \l{Inspecting Internal Logs}
             \li \l{Managing Data Collection}
                 \list
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 8e8536d776..60dcf969ba 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -77,8 +77,8 @@
 
     You can use the kit selector (2) to select the
     \l{glossary-buildandrun-kit}{kit} for running (3), debugging (4), or
-    building (5) the application. Output from these actions is displayed in the
-    output panes (7).
+    building (5) the application. Output from these actions is displayed on
+    the task bar (7).
 
     You can use the \l{Searching with the Locator}{locator} (6) to browse
     through projects, files, classes, functions, documentation, and file
@@ -93,7 +93,7 @@
         \li \l{Selecting Modes}{Mode selector}
         \li \l{Working with Sidebars}{Sidebars}
         \li \l{Browsing Project Contents}{Views}
-        \li \l{Viewing Output}{Output panes}
+        \li \l{Viewing Output}{Output}
     \endlist
 
     \else
@@ -377,9 +377,9 @@
 
     \title Viewing Output
 
-    \image qtcreator-general-messages.png "General Messages output pane"
+    \image qtcreator-general-messages.png "General Messages"
 
-    The task pane in \QC can display one of the following panes:
+    The taskbar in \QC can display following types of output:
 
     \list
 
@@ -405,30 +405,30 @@
 
     \endlist
 
-    Output panes are available on the taskbar in all \l{Selecting Modes}{modes}.
+    Output is available on the taskbar in all \l{Selecting Modes}{modes}.
 
-    \image qtcreator-output-panes-taskbar.png "Output panes on the taskbar"
+    \image qtcreator-output-panes-taskbar.png "Output on the taskbar"
 
-    You can open output panes in the following ways:
+    You can view output in the following ways:
 
     \list
-        \li Select the output pane on the taskbar.
-        \li Select \key Alt (\key Cmd on \macos) and the number of the pane on
+        \li Select the output view on the taskbar.
+        \li Select \key Alt (\key Cmd on \macos) and the number of the view on
             the taskbar.
         \li Select \inlineimage icons/output-pane-menu.png
-            , and then select the pane to open.
-        \li Select \uicontrol View > \uicontrol {Output Panes}.
+            , and then select the view to open.
+        \li Select \uicontrol View > \uicontrol Output.
             The menu items also display the keyboard shortcuts that you can use.
     \endlist
 
-    To maximize an open output pane, select the \inlineimage icons/arrowup.png
-    (\uicontrol {Maximize Output Pane}) button or press \key {Alt+Shift+9}.
+    To maximize an open output view, select the \inlineimage icons/arrowup.png
+    (\uicontrol Maximize) button or press \key {Alt+Shift+9}.
 
 
     To increase or decrease the output text size, select \inlineimage icons/plus.png
     (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
     (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-. Zooming is
-    not supported in all output panes.
+    not supported in all output views.
 
     To open the \uicontrol{General Messages} and
     \if defined(qtcreator)
@@ -436,16 +436,15 @@
     \else
     \l{Using Git}{Version Control}
     \endif
-     panes, select \uicontrol View > \uicontrol {Output Panes}.
+     views, select \uicontrol View > \uicontrol Output.
     \if defined(qtcreator)
-    To display the \uicontrol {To-Do Entries} pane, enable the \uicontrol Todo
-    plugin.
+    To view \uicontrol {To-Do Entries}, enable the \uicontrol Todo plugin.
     \endif
 
     For more information about the \uicontrol {QML Debugger Console} view, see
     \l{Executing JavaScript Expressions}.
 
-    If the text in the output panes is not displayed correctly, \QC might
+    If the text in the output is not displayed correctly, \QC might
     be using a different codec from the one used by the tools that generate
     the output. To specify the codec to use, select \uicontrol Tools >
     \uicontrol Options > \uicontrol Environment > \uicontrol Interface, and
@@ -455,7 +454,7 @@
 
     \section1 Finding and Filtering Output
 
-    To search from output, press \key {Ctrl+F} when the pane is active. Enter
+    To search from output, press \key {Ctrl+F} when the view is active. Enter
     search criteria in the \uicontrol Find field. For more information, see
     \l{Finding and Replacing}.
 
@@ -466,11 +465,11 @@
     case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
     hide the lines that match the filter.
 
-    Finding and filtering are not supported in all output panes.
+    Finding and filtering are not supported in all output views.
 
     \section1 Issues
 
-    The \uicontrol{Issues} pane provides lists of following types of issues:
+    \uicontrol{Issues} provides lists of following types of issues:
 
     \list
 
@@ -491,8 +490,8 @@
             {Errors and warnings from the current editor}.
         \endif
 
-        \li \uicontrol Compile - Selected output from the compiler. Open the
-            \uicontrol {Compile Output} pane for more detailed information.
+        \li \uicontrol Compile - Selected output from the compiler. Open
+            \uicontrol {Compile Output} for more detailed information.
 
        \li \uicontrol{Debug Information} - Lists debug information packages that might
             be missing.
@@ -510,7 +509,7 @@
 
         \if defined(qtcreator)
         \li \uicontrol {My Tasks} - Entries from a task list file (.tasks) generated
-            by \l{Showing Task List Files in Issues Pane}
+            by \l{Showing Task List Files in Issues}
             {code scanning and analysis tools}.
 
         \li \uicontrol Python - Runtime errors and exceptions of Python scripts.
@@ -522,12 +521,12 @@
 
     \endlist
 
-    The pane filters out irrelevant output from the build tools and presents the
+    The view filters out irrelevant output from the build tools and presents the
     issues in an organized way. To further filter the output by type, select
     \inlineimage icons/filtericon.png
     (\uicontrol {Filter Tree}) and then select a filter.
 
-    \image qtcreator-issues.png "Issues output pane"
+    \image qtcreator-issues.png "Issues"
 
     Select one or several lines to apply context-menu actions to their contents.
     You can remove the selected lines or copy their contents to the clipboard.
@@ -539,23 +538,23 @@
     select \uicontrol {Show in Editor} in the context menu. The entry must contain the
     name of the file where the issue was found.
 
-    To view more information about an issue in the \uicontrol {Compile Output} pane,
+    To view more information about an issue in \l {Compile Output},
     select \uicontrol {Show Output} in the context menu.
 
     To jump from one issue to the next or previous one, press \key F6 and
     \key Shift+F6.
 
-    By default, the \uicontrol Issues pane is cleared on a new build. To keep
+    By default, the \uicontrol Issues view is cleared on a new build. To keep
     the issues from the previous build rounds, deselect \uicontrol Tools >
     \uicontrol Options > \uicontrol {Build & Run} > \uicontrol General >
     \uicontrol {Clear issues list on new build}.
 
     \section1 Search Results
 
-    In the \uicontrol{Search Results} pane, you can search through projects, files on
+    In \uicontrol{Search Results}, you can search through projects, files on
     a file system or the currently open files:
 
-    \image qtcreator-search-results.png "Search Results output pane"
+    \image qtcreator-search-results.png "Search Results"
 
     The search results are stored in the search history (1) from which you can
     select earlier searches.
@@ -570,7 +569,7 @@
 
     \section1 Application Output
 
-    The \uicontrol{Application Output} pane displays the status of a program when
+    \uicontrol{Application Output} displays the status of a program when
     it is executed, and the debug output.
 
     \image qtcreator-application-output.png
@@ -589,37 +588,36 @@
     \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} >
     \uicontrol {Application Output}, or click the \inlineimage icons/settings.png
     (\uicontrol {Open Settings Page}) button. You can select whether to open
-    the \uicontrol{Application Output} pane on output when running or debugging
+    \uicontrol{Application Output} 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.
 
     \section1 Compile Output
 
-    The \uicontrol{Compile Output} pane provides all output from the compiler.
+    \uicontrol{Compile Output} provides all output from the compiler.
     The \uicontrol{Compile Output} is a more detailed version of information
-    displayed in the \uicontrol{Issues} pane.
+    displayed in \l Issues.
 
-    \image qtcreator-compile-output.png "Compile Output pane"
+    \image qtcreator-compile-output.png "Compile Output"
 
     Double-click on a file name in an error message to open the file in the
     code editor.
 
     Select the \uicontrol {Cancel Build} button to cancel the build.
 
-    To specify whether to open the \uicontrol {Compile Output} pane on output
+    To specify whether to open the \uicontrol {Compile Output} view on output
     when building applications, select \uicontrol Tools > \uicontrol Options >
     \uicontrol {Build & Run} > \uicontrol {Compile Output}, and then select the
-    \uicontrol {Open pane when building} check box.
+    \uicontrol {Open view when building} check box.
     In the \uicontrol {Limit output to} field, you can specify the maximum
-    amount of build output lines to display in the pane.
+    amount of build output lines to display.
 
     You can also reach the options page by clicking \inlineimage icons/settings.png
     (\uicontrol {Open Settings Page}).
 
-    To copy the output from the pane to the clipboard, select
-    \uicontrol {Select All} in the context menu, and then select
-    \uicontrol Copy. Save the output as a file if you want to
-    examine it later without having to build the project again.
+    To copy the output to the clipboard, select \uicontrol {Select All} in the
+    context menu, and then select \uicontrol Copy. Save the output as a file if
+    you want to examine it later without having to build the project again.
     This is useful for large projects that take a long time to build.
 
     \section2 Parsing Existing Compile Output
@@ -641,8 +639,8 @@
         \li In the \uicontrol {Use parsers from kit} field, select the kit to
             use for parsing the output. Select \uicontrol Manage to view
             and modify kit settings.
-        \li The parser displays the parsed output in the \uicontrol Issues
-            pane. By default, the pane is cleared before adding the new output.
+        \li The parser displays the parsed output in \l Issues. By default, the
+            view is cleared before adding the new output.
             Deselect the \uicontrol {Clear existing tasks} check box to append
             the new output to the old output.
         \li Select \uicontrol OK to start parsing.
@@ -651,7 +649,7 @@
     \if defined(qtcreator)
     \section1 To-Do Entries
 
-    The \uicontrol {To-Do Entries} pane lists the BUG, FIXME, NOTE, TODO, and
+    \uicontrol {To-Do Entries} lists the BUG, FIXME, NOTE, TODO, and
     WARNING keywords from the current file, from all project files, or from a
     subproject. Click the icons on the toolbar to show only the selected
     keywords.
@@ -688,8 +686,8 @@
     and load the plugin.
 
     In addition, you can open task list files generated by code scanning and
-    analysis tools in the \uicontrol Issues pane. For more information, see
-    \l{Showing Task List Files in Issues Pane}.
+    analysis tools in \l Issues. For more information, see
+    \l{Showing Task List Files in Issues}.
     \endif
 
 */
diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
index c00cd06cb1..3555b137d8 100644
--- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
+++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc
@@ -129,9 +129,9 @@
         \li \l{Using Subversion}
     \endlist
 
-    The \uicontrol{Version Control} output pane displays the commands that are
+    \uicontrol{Version Control} displays the commands that are
     executed, a timestamp, and the relevant output. Select \uicontrol View >
-    \uicontrol {Output Panes} > \uicontrol {Version Control} to open the pane.
+    \uicontrol Output > \uicontrol {Version Control} to open the view.
 
     \image qtcreator-vcs-pane.png
 
diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
index 28ff2daa27..4f3842dd8c 100644
--- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
+++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc
@@ -198,9 +198,9 @@
 
     \section2 Viewing Git Status
 
-    To view the status of the repository in the \uicontrol {Version Control}
-    output pane, select \uicontrol Status. The context menu contains additional
-    actions, such as selecting and clearing all entries in the pane, copying
+    To view the status of the repository in \uicontrol {Version Control},
+    select \uicontrol Status. The context menu contains additional
+    actions, such as selecting and clearing all entries, copying
     text, and opening files.
 
     \section2 Committing Changes to Git
diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc
index 7a1e1093be..11942e052a 100644
--- a/doc/qtcreatordev/src/qtcreator-dev.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc
@@ -224,11 +224,11 @@
     One way to handle that would be to let the tool create an output file, which
     is then opened within \QC. You provide an editor (probably read-only) for
     handling this file. For lists of issues, consider creating task list files
-    which are shown in the \uicontrol Issues output pane.
+    which are shown in \l Issues.
 
     \list
         \li \l{https://doc.qt.io/qtcreator/creator-task-lists.html}
-            {Showing Task List Files in the Issues Pane}
+            {Showing Task List Files in Issues}
         \li \l{Creating Plugins}
         \li \l{Qt Creator Coding Rules}
         \omit
diff --git a/doc/qtcreatordev/src/qtcreator-ui-text.qdoc b/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
index f7fbad1809..059ef89c03 100644
--- a/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
@@ -404,7 +404,7 @@
             \li  Dialog that provides feedback to users, in the form of status
                  information, a warning, or an error message.
                  \image qtcreator-error-message.png "Message box"
-                 Output from Qt Creator should be displayed in output panes,
+                 Output from Qt Creator should be displayed in output views,
                  instead.
             \li  Use the event as the title and provide a solution in the
                  message box.
@@ -417,10 +417,10 @@
                  Use descriptive, but short mode names. They have to fit in the
                  \uicontrol {Mode selector}.
         \row
-            \li  Output pane
-            \li  A pane displayed in the task pane that displays output from Qt Creator.
-                 \image qtcreator-output-pane.png "Output pane"
-            \li  Use descriptive names for output panes.
+            \li  Output
+            \li  Views to display output from Qt Creator.
+                 \image qtcreator-output-pane.png "Output"
+            \li  Use descriptive names for output views.
         \row
             \li  Sidebar
             \li  A view available in the \uicontrol Edit and \uicontrol Debug modes that