feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: replace "Mac OS (X)" with "OS X"

Browse Source 
Change-Id: I77f1cbbfc17d759d1587caf2a25a53498848e2ca
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Leena Miettinen
2014-05-02 12:44:45 +02:00
parent 6eae258df2
commit d59d8b568d
28 changed files with 77 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/howto/creator-external-tools.qdoc
View File

@@ -70,7 +70,7 @@
\section1 Using External Text Editors
You can open files for editing in the default text editor for your system:
Notepad on Windows and vi on Linux and Mac OS.
Notepad on Windows and vi on Linux and OS X.
To open the file you are currently viewing in an external editor, select
\gui Tools > \gui External > \gui Text > \gui {Edit with Notepad} or
\gui {Edit with vi}, depending on your system.
@@ -143,7 +143,7 @@
The tool configurations that you add and modify are stored in XML format in
the user configuration folder. For example,
\c {~/config/QtProject/qtcreator/externaltools}
on Linux and Mac OS and
on Linux and OS X and
\c {C:\Users\username\AppData\Roaming\QtProject\qtcreator\externaltools}
in Windows. To share a configuration with other users, copy an XML
configuration file to the folder.

2
doc/src/howto/creator-help.qdoc
View File

@@ -160,7 +160,7 @@
If you cannot find words that you know are there, indexing might not have
been completed for some reason. Remove the \c {.helpcollection} folder and
open the \gui Search pane again to recreate the index. The folder is located
in \c { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and Mac OS X and
in \c { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and OS X and
in \c {\AppData\Roaming\QtProject\qtcreator\} on Windows.
Punctuation is not included in indexed terms. To find terms that contain

12
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -184,19 +184,19 @@
\li Ctrl+7
\row
\li Toggle \gui{Issues} pane
\li Alt+1 (Cmd+1 on Mac OS X)
\li Alt+1 (Cmd+1 on OS X)
\row
\li Toggle \gui{Search Results} pane
\li Alt+2 (Cmd+2 on Mac OS X)
\li Alt+2 (Cmd+2 on OS X)
\row
\li Toggle \gui{Application Output} pane
\li Alt+3 (Cmd+3 on Mac OS X)
\li Alt+3 (Cmd+3 on OS X)
\row
\li Toggle \gui{Compile Output} pane
\li Alt+4 (Cmd+4 on Mac OS X)
\li Alt+4 (Cmd+4 on OS X)
\row
\li Toggle other output panes
\li Alt+number (Cmd+number on Mac OS X)
\li Alt+number (Cmd+number on OS X)
Where the number is the number of the output pane.
\row
@@ -225,7 +225,7 @@
\li Ctrl+Shift+F11
\row
\li Toggle the sidebar
\li Alt+0 (Cmd+0 on Mac OS X)
\li Alt+0 (Cmd+0 on OS X)
\row
\li Undo
\li Ctrl+Z

16
doc/src/howto/creator-tips.qdoc
View File

@@ -55,8 +55,8 @@
\key Ctrl+Tab.
To move forward in the location history, press \key {Alt+Right}
(\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator
(\key {Cmd+Opt+Right} on OS X). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Left} on OS X). For example, if you use the \gui Locator
to jump to a symbol in the same file, you can jump back to your original
location in that file by pressing \key {Alt+Left}.
@@ -90,13 +90,13 @@
\list
\li \gui{Issues} pane Alt+1 (Cmd+1 on Mac OS X)
\li \gui{Issues} pane Alt+1 (Cmd+1 on OS X)
\li \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
\li \gui{Search Results} pane Alt+2 (Cmd+2 on OS X)
\li \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
\li \gui{Application Output} pane Alt+3 (Cmd+3 on OS X)
\li \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
\li \gui{Compile Output} pane Alt+4 (Cmd+4 on OS X)
\endlist
@@ -134,7 +134,7 @@
To toggle the sidebar in the \gui Edit and \gui Debug modes, click
\inlineimage qtcreator-togglebutton.png
or press \key Alt+0 (\key Cmd+0 on Mac OS X).
or press \key Alt+0 (\key Cmd+0 on OS X).
For more information on using the sidebar, see
\l {Browsing Project Contents}.
@@ -150,7 +150,7 @@
select the symbol in the list. For more information on using the locator,
see \l{Searching with the Locator}.
Press \key Ctrl (\key Cmd on Mac OS) and click a symbol to move directly to
Press \key Ctrl (\key Cmd on OS X) and click a symbol to move directly to
the definition or the declaration of the symbol. You can also move the
on the symbol and press \key {F2}. For more information, see
cursor \l{Moving to Symbol Definition or Declaration}.

2
doc/src/howto/creator-ui.qdoc
View File

@@ -144,7 +144,7 @@
\li To toggle the sidebar, click \inlineimage qtcreator-togglebutton.png
(\gui {Hide Sidebar/Show Sidebar}) or press \key Alt+0
(\key Cmd+0 on Mac OS X).
(\key Cmd+0 on OS X).
\li To split the sidebar, click \inlineimage qtcreator-splitbar.png
(\gui {Split}). Select new content to view in the split view.

2
doc/src/howto/creator-vcs.qdoc
View File

@@ -622,7 +622,7 @@
To start a graphical interface to Git, select \gui Tools > \gui Git >
\gui {Git Tools} > \gui {Git Gui}.
\note On Mac OS X, the default Git installation does not contain Git Gui. To
\note On OS X, the default Git installation does not contain Git Gui. To
use Git Gui, install it separately. To start Git Gui from \QC, select
\gui Preferences > \gui {Version Control} > \gui Git, and set the path to
the environment that contains Git Gui in the \gui {Prepend to PATH} field.

10
doc/src/howto/qtcreator-faq.qdoc
View File

@@ -57,7 +57,7 @@
The location depends on the platform. On Linux and other Unix platforms, the files
are located in \c {~/.config/QtProject} and \c {~/.local/share/data/QtProject/qtcreator}.
On Mac OS, the files are located in \c {~/.config/QtProject} and
On OS X, the files are located in \c {~/.config/QtProject} and
\c {~/Library/Application Support/QtProject/Qt Creator}.
On Windows XP, the files are located in
@@ -80,7 +80,7 @@
for the application. Many plugins specify either the path to the tool they
need or the environment they run in.
This is especially relevant for the Mac OS where \c {/usr/local/bin} might
This is especially relevant for the OS X where \c {/usr/local/bin} might
not be in the path when \QC is started.
\b {How do I change the interface language for \QC?}
@@ -121,7 +121,7 @@
\b {If I have a choice of GDB versions, which should I use?}
On Linux and Windows, use the Python-enabled GDB versions that are
installed when you install \QC and \QSDK. On Mac OS X, GDB is no longer
installed when you install \QC and \QSDK. On OS X, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
@@ -146,7 +146,7 @@
\b {How can I make use of my multi-core CPU with \QC?}
On Linux and Mac OS X, go to \gui Project mode, select your configuration
On Linux and OS X, go to \gui Project mode, select your configuration
in the \gui {Build Settings}, locate the \gui {Build Steps}, and add the
following value, where \c{<num>} is the amount of cores in your CPU:
\c{-j <num>}
@@ -187,7 +187,7 @@
\b {Where is application output shown in \QC?}
\b {On Unix (Linux and Mac OS):} \c qDebug() and related functions use
\b {On Unix (Linux and OS X):} \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 \gui{Application Output} pane.