summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/changelog.doc4
-rw-r--r--doc/faq.doc2
-rw-r--r--doc/features.doc2
-rw-r--r--doc/searching.doc2
-rw-r--r--doc/starting.doc2
-rw-r--r--src/config.xml10
-rw-r--r--src/docsets.cpp2
-rw-r--r--src/doxygen.cpp4
-rw-r--r--src/doxygen.md2
-rw-r--r--src/htmlgen.cpp2
-rw-r--r--src/searchindex.cpp4
-rw-r--r--src/searchindex.h4
-rw-r--r--src/util.cpp2
-rw-r--r--templates/xml/compound.xsd2
14 files changed, 22 insertions, 22 deletions
diff --git a/doc/changelog.doc b/doc/changelog.doc
index dbc75c1..db3b6dd 100644
--- a/doc/changelog.doc
+++ b/doc/changelog.doc
@@ -763,7 +763,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6128">6128</a> - Usage of underscore&#39;s in parameter names [<a href="https://github.com/doxygen/doxygen/commit/c10af45c61a1f9b25c514f397ace16c94cc7c8df">view</a>]</li>
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6135">6135</a> - [1.8.13 Regression] Segfault building the breathe docs [<a href="https://github.com/doxygen/doxygen/commit/0f02761a158a5e9ddbd5801682482af8986dbc35">view</a>]</li>
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6137">6137</a> - XML Parsing Error for operator&lt;&lt; methods when outputting to XHTML [<a href="https://github.com/doxygen/doxygen/commit/0e8530e42b69c909ef2c26468b24dfb88cc0997f">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6139">6139</a> - Menu does not work without Javascript [<a href="https://github.com/doxygen/doxygen/commit/1be97720b7820361e85242d08d4cac3e46570bfe">view</a>]</li>
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6139">6139</a> - Menu does not work without JavaScript [<a href="https://github.com/doxygen/doxygen/commit/1be97720b7820361e85242d08d4cac3e46570bfe">view</a>]</li>
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6141">6141</a> - Too greedy behavior of @ref const matching [<a href="https://github.com/doxygen/doxygen/commit/04001c8926fb0f37dfcf284b3637b182125bba75">view</a>]</li>
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6169">6169</a> - doxygen build fails [<a href="https://github.com/doxygen/doxygen/commit/bb5c8dd29782ecbb05a4ef9788f2507e9a156848">view</a>]</li>
<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6170">6170</a> - Add &quot;\~&quot; command to internationalization article [<a href="https://github.com/doxygen/doxygen/commit/e204b982eebd54bd15148a520da6608935e33e50">view</a>]</li>
@@ -3993,7 +3993,7 @@ make sure you add the following:
<h3>Changes</h3>
<ul>
<li> id <a href="https://github.com/doxygen/doxygen/issues/3372">3372</a>, <a href="https://github.com/doxygen/doxygen/issues/3012">3012</a>: Replaced the PHP based search engine by a
- Javascript/DHTML based one.
+ JavaScript/DHTML based one.
As a result the search feature no longer requires a HTTP server
with PHP enabled to be usable. Searching is limited to symbols
though, but it is now possible to filter on symbol type.</li>
diff --git a/doc/faq.doc b/doc/faq.doc
index 0ba9450..8a3aee8 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -216,7 +216,7 @@ If you don't mind spending some time on it, there are several options:
- If the grammar of X is somewhat different than you can write an input
filter that translates X into something similar enough to C/C++ for
doxygen to understand (this approach is taken for VB, Object Pascal, and
- Javascript, see http://www.doxygen.org/download.html#helpers).
+ JavaScript, see http://www.doxygen.org/download.html#helpers).
- If the grammar is completely different one could write a parser for X and
write a backend that produces a similar syntax tree as is done by
\c src/scanner.l (and also by \c src/tagreader.cpp while reading tag files).
diff --git a/doc/features.doc b/doc/features.doc
index 8b19898..65fc343 100644
--- a/doc/features.doc
+++ b/doc/features.doc
@@ -69,7 +69,7 @@
generated automatically.
<li>Includes a fast, rank based search engine to search for strings or words
in the class and member documentation (PHP based).
-<li>Includes an Javascript based live search feature to search for symbols
+<li>Includes an JavaScript based live search feature to search for symbols
as you type (for small to medium sized projects).
<li>You can type normal HTML tags in your documentation. Doxygen will convert
them to their equivalent \LaTeX, RTF, and man-page
diff --git a/doc/searching.doc b/doc/searching.doc
index 1716729..880c3f4 100644
--- a/doc/searching.doc
+++ b/doc/searching.doc
@@ -30,7 +30,7 @@ has its own advantages and disadvantages:
<h2>1. Client side searching</h2>
The easiest way to enable searching is to enable the built-in client
- side search engine. This engine is implemented using Javascript and DHTML
+ side search engine. This engine is implemented using JavaScript and DHTML
only and runs entirely on the clients browser. So no additional tooling is
required to make it work.
diff --git a/doc/starting.doc b/doc/starting.doc
index 154cc03..045f66c 100644
--- a/doc/starting.doc
+++ b/doc/starting.doc
@@ -187,7 +187,7 @@ IE8, IE9, and Opera to test the generated output).
Some of the features the HTML section (such as
\ref cfg_generate_treeview "GENERATE_TREEVIEW" or the search engine)
-require a browser that supports Dynamic HTML and Javascript enabled.
+require a browser that supports Dynamic HTML and JavaScript enabled.
\subsection latex_out LaTeX output
\addindex LaTeX
diff --git a/src/config.xml b/src/config.xml
index d206203..2bd1769 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -648,7 +648,7 @@ Go to the <a href="commands.html">next</a> section or return to the
With this tag you can assign which parser to use for a given extension.
Doxygen has a built-in mapping, but you can override or extend it using this tag.
The format is <code>ext=language</code>, where \c ext is a file extension, and language is one of
- the parsers supported by doxygen: IDL, Java, Javascript, Csharp (C#), C, C++, D, PHP,
+ the parsers supported by doxygen: IDL, Java, JavaScript, Csharp (C#), C, C++, D, PHP,
md (Markdown), Objective-C, Python, Slice, Fortran (fixed format Fortran: FortranFixed,
free formatted Fortran: FortranFree, unknown formatted Fortran: Fortran. In
the later case the parser tries to guess whether the code is fixed or free
@@ -2034,9 +2034,9 @@ hr.footer {
<![CDATA[
If the \c HTML_DYNAMIC_MENUS tag is set to \c YES then the generated HTML
documentation will contain a main index with vertical navigation menus that
- are dynamically created via Javascript. If disabled, the navigation index will consists of
+ are dynamically created via JavaScript. If disabled, the navigation index will consists of
multiple levels of tabs that are statically embedded in every HTML page.
- Disable this option to support browsers that do not have Javascript, like
+ Disable this option to support browsers that do not have JavaScript, like
the Qt help browser.
]]>
</docs>
@@ -2383,7 +2383,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
<docs>
<![CDATA[
Enable the \c USE_MATHJAX option to render \f$\mbox{\LaTeX}\f$ formulas using MathJax
- (see https://www.mathjax.org) which uses client side Javascript for the
+ (see https://www.mathjax.org) which uses client side JavaScript for the
rendering instead of using pre-rendered bitmaps. Use this if you do not
have \f$\mbox{\LaTeX}\f$ installed or if you want to formulas look prettier in the HTML
output. When enabled you may also need to install MathJax separately and
@@ -2493,7 +2493,7 @@ MATHJAX_CODEFILE = disableRenderer.js
<docs>
<![CDATA[
When the \c SERVER_BASED_SEARCH tag is enabled the search engine will be
-implemented using a web server instead of a web client using Javascript.
+implemented using a web server instead of a web client using JavaScript.
There are two flavors of web server based searching depending on the
\ref cfg_external_search "EXTERNAL_SEARCH" setting. When disabled,
diff --git a/src/docsets.cpp b/src/docsets.cpp
index 055532a..7024b34 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -326,7 +326,7 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md,
case SrcLangExt_PHP: lang="php"; break; // PHP4/5
case SrcLangExt_D: lang="d"; break; // D
case SrcLangExt_Java: lang="java"; break; // Java
- case SrcLangExt_JS: lang="javascript"; break; // Javascript
+ case SrcLangExt_JS: lang="javascript"; break; // JavaScript
case SrcLangExt_Python: lang="python"; break; // Python
case SrcLangExt_Fortran: lang="fortran"; break; // Fortran
case SrcLangExt_VHDL: lang="vhdl"; break; // VHDL
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 89a6e3a..bd6152f 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11649,7 +11649,7 @@ void generateOutput()
g_s.begin("Generating search indices...\n");
if (searchEngine && !serverBasedSearch && (generateHtml || g_useOutputTemplate))
{
- createJavascriptSearchIndex();
+ createJavaScriptSearchIndex();
}
// generate search indices (need to do this before writing other HTML
@@ -11668,7 +11668,7 @@ void generateOutput()
HtmlGenerator::writeSearchData(searchDirName);
if (!serverBasedSearch) // client side search index
{
- writeJavascriptSearchIndex();
+ writeJavaScriptSearchIndex();
}
}
g_s.end();
diff --git a/src/doxygen.md b/src/doxygen.md
index 7680a94..c124e09 100644
--- a/src/doxygen.md
+++ b/src/doxygen.md
@@ -188,7 +188,7 @@ Topics TODO
- Qt Help (qhp)
- Eclipse Help
- Search index
- - Javascript based
+ - JavaScript based
- Server based
- External
- Citations
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 29601f8..c43fd20 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -229,7 +229,7 @@ static QCString substituteHtmlKeywords(const QCString &s,
const QCString &relPath,
const QCString &navPath=QCString())
{
- // Build CSS/Javascript tags depending on treeview, search engine settings
+ // Build CSS/JavaScript tags depending on treeview, search engine settings
QCString cssFile;
QStrList extraCssFile;
QCString generatedBy;
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 06c5c75..849dd1d 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -731,7 +731,7 @@ static QCString searchId(const QCString &s)
return result;
}
-void createJavascriptSearchIndex()
+void createJavaScriptSearchIndex()
{
bool sliceOpt = Config_getBool(OPTIMIZE_OUTPUT_SLICE);
@@ -953,7 +953,7 @@ void createJavascriptSearchIndex()
}
}
-void writeJavascriptSearchIndex()
+void writeJavaScriptSearchIndex()
{
int i;
int cnt = 0;
diff --git a/src/searchindex.h b/src/searchindex.h
index 8cbe352..923973c 100644
--- a/src/searchindex.h
+++ b/src/searchindex.h
@@ -165,8 +165,8 @@ struct SearchIndexInfo
QCString text;
};
-void createJavascriptSearchIndex();
-void writeJavascriptSearchIndex();
+void createJavaScriptSearchIndex();
+void writeJavaScriptSearchIndex();
const SearchIndexInfo *getSearchIndices();
#endif
diff --git a/src/util.cpp b/src/util.cpp
index 0fc70e8..5042edc 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8384,7 +8384,7 @@ QCString langToString(SrcLangExt lang)
case SrcLangExt_PHP: return "PHP";
case SrcLangExt_ObjC: return "Objective-C";
case SrcLangExt_Cpp: return "C++";
- case SrcLangExt_JS: return "Javascript";
+ case SrcLangExt_JS: return "JavaScript";
case SrcLangExt_Python: return "Python";
case SrcLangExt_Fortran: return "Fortran";
case SrcLangExt_VHDL: return "VHDL";
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 7769c70..93ff9d7 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -764,7 +764,7 @@
<xsd:enumeration value="PHP" />
<xsd:enumeration value="Objective-C" />
<xsd:enumeration value="C++" />
- <xsd:enumeration value="Javascript" />
+ <xsd:enumeration value="JavaScript" />
<xsd:enumeration value="Python" />
<xsd:enumeration value="Fortran" />
<xsd:enumeration value="VHDL" />