summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-07-20 10:33:28 (GMT)
committerGitHub <noreply@github.com>2019-07-20 10:33:28 (GMT)
commit128ea149c79c565f6c06ac7a6928629b75195744 (patch)
tree3ee078db56c56f3ac051995d1c122682b5c42447
parentb118de2f38cfcb91888db571b5d9fd1a85731cd5 (diff)
parentb636a0bf1d3cb0b0d3675ea047c41373ab44d40c (diff)
downloadDoxygen-128ea149c79c565f6c06ac7a6928629b75195744.zip
Doxygen-128ea149c79c565f6c06ac7a6928629b75195744.tar.gz
Doxygen-128ea149c79c565f6c06ac7a6928629b75195744.tar.bz2
Merge pull request #7112 from arm-in/master
Correct spelling "build in" vs. "built-in"
-rw-r--r--doc/install.doc2
-rw-r--r--doc/trouble.doc2
-rw-r--r--src/doxygen.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/install.doc b/doc/install.doc
index 18ea44e..b711cd4 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -201,7 +201,7 @@ tar zxvf doxygen-x.y.z.src.tar.gz
\endverbatim
to unpack the sources (you can obtain \c tar from e.g. http://gnuwin32.sourceforge.net/packages.html).
Alternatively you can use an unpack program, like 7-Zip (see https://www.7-zip.org/)
-or use the build in unpack feature of modern Windows systems).
+or use the built-in unpack feature of modern Windows systems).
Now your environment is setup to generate the required project files for \c doxygen.
diff --git a/doc/trouble.doc b/doc/trouble.doc
index c490ae1..cb50399 100644
--- a/doc/trouble.doc
+++ b/doc/trouble.doc
@@ -20,7 +20,7 @@
<ul>
<li>Doxygen is <em>not</em> a real compiler, it is only a lexical scanner.
This means that it can and will not detect errors in your source code.
-<li>Doxygen has a build in preprocessor, but this works slightly different than
+<li>Doxygen has a built-in preprocessor, but this works slightly different than
the C preprocessor. Doxygen assumes a header file is properly guarded against
multiple inclusion, and that each include file is standalone (i.e. it could be placed
at the top of a source file without causing compiler errors). As long as this is
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index c7fce01..85ed747 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10146,7 +10146,7 @@ static void usage(const char *name)
msg(" RTF: %s -e rtf extensionsFile\n\n",name);
msg("7) Use doxygen to compare the used configuration file with the template configuration file\n");
msg(" %s -x [configFile]\n\n",name);
- msg("8) Use doxygen to show a list of build in emoji.\n");
+ msg("8) Use doxygen to show a list of built-in emojis.\n");
msg(" %s -f emoji outputFileName\n\n",name);
msg(" If - is used for outputFileName doxygen will write to standard output.\n\n");
msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n");