Skip to content

Commit c942669

Browse files
authored
Merge pull request doxygen#8501 from albert-github/feature/bug_docu_improv
Some documentation improvements
2 parents 44d5581 + 21e1979 commit c942669

File tree

3 files changed

+56
-13
lines changed

3 files changed

+56
-13
lines changed

doc/commands.doc

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,13 @@ Commands for displaying examples
25022502
Files or directories that doxygen should look for can be specified using the
25032503
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25042504

2505-
\sa section \ref cmdhtmlonly "\\htmlonly".
2505+
\sa section \ref cmdhtmlonly "\\htmlonly",
2506+
\ref cmdlatexinclude "\\latexinclude",
2507+
\ref cmdrtfinclude "\\rtfinclude",
2508+
\ref cmdmaninclude "\\maninclude",
2509+
\ref cmddocbookinclude "\\docbookinclude" and
2510+
\ref cmdxmlinclude "\\xmlinclude".
2511+
25062512
<hr>
25072513

25082514
\section cmdlatexinclude \\latexinclude <file-name>
@@ -2517,7 +2523,13 @@ Commands for displaying examples
25172523
Files or directories that doxygen should look for can be specified using the
25182524
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25192525

2520-
\sa section \ref cmdlatexonly "\\latexonly".
2526+
\sa section \ref cmdlatexonly "\\latexonly",
2527+
\ref cmdhtmlinclude "\\htmlinclude",
2528+
\ref cmdrtfinclude "\\rtfinclude",
2529+
\ref cmdmaninclude "\\maninclude",
2530+
\ref cmddocbookinclude "\\docbookinclude" and
2531+
\ref cmdxmlinclude "\\xmlinclude".
2532+
25212533
<hr>
25222534

25232535
\section cmdrtfinclude \\rtfinclude <file-name>
@@ -2532,7 +2544,13 @@ Commands for displaying examples
25322544
Files or directories that doxygen should look for can be specified using the
25332545
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25342546

2535-
\sa section \ref cmdrtfonly "\\rtfonly".
2547+
\sa section \ref cmdrtfonly "\\rtfonly",
2548+
\ref cmdhtmlinclude "\\htmlinclude",
2549+
\ref cmdlatexinclude "\\latexinclude",
2550+
\ref cmdmaninclude "\\maninclude",
2551+
\ref cmddocbookinclude "\\docbookinclude" and
2552+
\ref cmdxmlinclude "\\xmlinclude".
2553+
25362554
<hr>
25372555

25382556
\section cmdmaninclude \\maninclude <file-name>
@@ -2547,7 +2565,13 @@ Commands for displaying examples
25472565
Files or directories that doxygen should look for can be specified using the
25482566
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25492567

2550-
\sa section \ref cmdmanonly "\\manonly".
2568+
\sa section \ref cmdmanonly "\\manonly",
2569+
\ref cmdhtmlinclude "\\htmlinclude",
2570+
\ref cmdlatexinclude "\\latexinclude",
2571+
\ref cmdrtfinclude "\\rtfinclude",
2572+
\ref cmddocbookinclude "\\docbookinclude" and
2573+
\ref cmdxmlinclude "\\xmlinclude".
2574+
25512575
<hr>
25522576

25532577
\section cmddocbookinclude \\docbookinclude <file-name>
@@ -2562,7 +2586,13 @@ Commands for displaying examples
25622586
Files or directories that doxygen should look for can be specified using the
25632587
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25642588

2565-
\sa section \ref cmddocbookonly "\\docbookonly".
2589+
\sa section \ref cmddocbookonly "\\docbookonly",
2590+
\ref cmdhtmlinclude "\\htmlinclude",
2591+
\ref cmdlatexinclude "\\latexinclude",
2592+
\ref cmdrtfinclude "\\rtfinclude",
2593+
\ref cmdmaninclude "\\maninclude" and
2594+
\ref cmdxmlinclude "\\xmlinclude".
2595+
25662596
<hr>
25672597

25682598
\section cmdxmlinclude \\xmlinclude <file-name>
@@ -2576,7 +2606,13 @@ Commands for displaying examples
25762606
Files or directories that doxygen should look for can be specified using the
25772607
\ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
25782608

2579-
\sa section \ref cmdxmlonly "\\xmlonly".
2609+
\sa section \ref cmdxmlonly "\\xmlonly",
2610+
\ref cmdhtmlinclude "\\htmlinclude",
2611+
\ref cmdlatexinclude "\\latexinclude",
2612+
\ref cmdrtfinclude "\\rtfinclude",
2613+
\ref cmdmaninclude "\\maninclude" and
2614+
\ref cmddocbookinclude "\\docbookinclude".
2615+
25802616
<hr>
25812617

25822618
\htmlonly</p><center><p>\endhtmlonly
@@ -2784,8 +2820,9 @@ only copy the detailed documentation, not the brief description.
27842820
\sa section \ref cmdmanonly "\\manonly",
27852821
\ref cmdlatexonly "\\latexonly",
27862822
\ref cmdrtfonly "\\rtfonly",
2787-
\ref cmdxmlonly "\\xmlonly", and
2788-
\ref cmdhtmlonly "\\htmlonly".
2823+
\ref cmdxmlonly "\\xmlonly",
2824+
\ref cmdhtmlonly "\\htmlonly" and
2825+
\ref cmddocbookinclude "\\docbookinclude".
27892826

27902827
<hr>
27912828
\section cmddot \\dot ["caption"] [<sizeindication>=<size>]
@@ -3363,8 +3400,9 @@ class Receiver
33633400
\sa sections \ref cmdhtmlonly "\\htmlonly",
33643401
\ref cmdxmlonly "\\xmlonly",
33653402
\ref cmdrtfonly "\\rtfonly",
3366-
\ref cmdlatexonly "\\latexonly", and
3367-
\ref cmddocbookonly "\\docbookonly".
3403+
\ref cmdlatexonly "\\latexonly",
3404+
\ref cmddocbookonly "\\docbookonly" and
3405+
\ref cmdmaninclude "\\maninclude".
33683406

33693407
<hr>
33703408
\section cmdli \\li { item-description }
@@ -3442,8 +3480,9 @@ class Receiver
34423480
\sa sections \ref cmdmanonly "\\manonly",
34433481
\ref cmdxmlonly "\\xmlonly",
34443482
\ref cmdlatexonly "\\latexonly",
3445-
\ref cmdhtmlonly "\\htmlonly", and
3446-
\ref cmddocbookonly "\\docbookonly".
3483+
\ref cmdhtmlonly "\\htmlonly",
3484+
\ref cmddocbookonly "\\docbookonly" and
3485+
\ref cmdrtfinclude "\\rtfinclude".
34473486

34483487
<hr>
34493488
\section cmdverbatim \\verbatim

src/config.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ FILE_VERSION_FILTER = "cleartool desc -fmt \%Vn"
12491249
doxygen's defaults, run doxygen with the `-l` option. You can optionally specify a
12501250
file name after the option, if omitted \c DoxygenLayout.xml will be used as the name
12511251
of the layout file.
1252+
See also section \ref layout for information.
12521253
<br>Note that if you run doxygen from a directory containing
12531254
a file called \c DoxygenLayout.xml, doxygen will parse it automatically even if
12541255
the \c LAYOUT_FILE tag is left empty.
@@ -2379,7 +2380,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
23792380
Windows users are probably better off using the HTML help feature.
23802381
23812382
Via custom style sheets (see \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET")
2382-
one can further \ref doxygen_finetune "fine-tune" the look of the index.
2383+
one can further fine tune the look of the index (see \ref doxygen_finetune).
23832384
As an example, the default style sheet generated by doxygen has an
23842385
example that shows how to put an image at the root of the tree instead of
23852386
the \ref cfg_project_name "PROJECT_NAME".

src/configgen.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ def transformDocs(doc):
5656
doc = re.sub('\\\\ref +doxygen_usage', '"Doxygen usage"', doc)
5757
doc = re.sub('\\\\ref +extsearch', '"External Indexing and Searching"',
5858
doc)
59+
doc = re.sub('\\\\ref +layout', '"Changing the layout of pages"', doc)
5960
doc = re.sub('\\\\ref +external', '"Linking to external documentation"',
6061
doc)
62+
doc = re.sub('\\\\ref +doxygen_finetune', '"Fine-tuning the output"',
63+
doc)
6164
doc = re.sub('\\\\ref +formulas', '"Including formulas"', doc)
6265
# fallback for not handled
6366
doc = re.sub('\\\\ref', '', doc)

0 commit comments

Comments
 (0)