diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-08 13:36:52 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-08 13:36:52 (GMT) |
commit | cfd73d5c4d1a66c620a3b7c08b72a3f3c3f94255 (patch) | |
tree | ed6cfed60d2438db244a7cddec6d4f0cf5fa93f6 /doc | |
parent | d08242a230b07db9f8a3eb5cbef2a9a0631f9452 (diff) | |
parent | b42ad09c6cd4d20306f239be5424c78d31394e84 (diff) | |
download | Doxygen-cfd73d5c4d1a66c620a3b7c08b72a3f3c3f94255.zip Doxygen-cfd73d5c4d1a66c620a3b7c08b72a3f3c3f94255.tar.gz Doxygen-cfd73d5c4d1a66c620a3b7c08b72a3f3c3f94255.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygenRelease_1_8_16
Diffstat (limited to 'doc')
-rw-r--r-- | doc/extsearch.doc | 2 | ||||
-rw-r--r-- | doc/searching.doc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/extsearch.doc b/doc/extsearch.doc index 36116ff..ead7ea8 100644 --- a/doc/extsearch.doc +++ b/doc/extsearch.doc @@ -187,7 +187,7 @@ The next subsections describe these interfaces in more detail. \subsection extsearch_api_index Indexer input format The search data produced by doxygen follows the -<a href="https://wiki.apache.org/solr/UpdateXmlMessages">Solr XML index message</a> +<a href="https://cwiki.apache.org/confluence/display/solr/UpdateXmlMessages">Solr XML index message</a> format. The input for the indexer is an XML file, which consists of one `<add>` tag containing diff --git a/doc/searching.doc b/doc/searching.doc index 9bc518a..1716729 100644 --- a/doc/searching.doc +++ b/doc/searching.doc @@ -139,7 +139,7 @@ has its own advantages and disadvantages: <h2>6. Qt Compressed Help</h2> If you develop for or want to install the Qt application framework, you will get an application - called <a href="http://doc.qt.io/archives/qt-4.8/assistant-manual.html">Qt assistant</a>. + called <a href="https://doc.qt.io/archives/qt-4.8/assistant-manual.html">Qt assistant</a>. This is a help viewer for Qt Compressed Help files (<code>.qch</code>). To enable this feature set \ref cfg_generate_qhp "GENERATE_QHP" to \c YES. @@ -147,7 +147,7 @@ has its own advantages and disadvantages: \ref cfg_qhp_namespace "QHP_NAMESPACE", \ref cfg_qhg_location "QHG_LOCATION", \ref cfg_qhp_virtual_folder "QHP_VIRTUAL_FOLDER". - See <a href="http://doc.qt.io/archives/qq/qq28-qthelp.html#htmlfilesandhelpprojects">this article</a> + See <a href="https://doc.qt.io/archives/qq/qq28-qthelp.html#htmlfilesandhelpprojects">this article</a> for more info. Feature wise the Qt compressed help feature is comparable with the CHM |