summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2012-03-17 20:32:54 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2012-03-17 20:32:54 (GMT)
commit6cbcbc787daeae62ce59c04bbc35597986bcca7d (patch)
tree5c9d2280ca0cb07840bfa26ca4dbed5b3225d21f /doc
parentc3a03d5cb1f856d2b3a7bff8ddf74416a1281f66 (diff)
downloadDoxygen-6cbcbc787daeae62ce59c04bbc35597986bcca7d.zip
Doxygen-6cbcbc787daeae62ce59c04bbc35597986bcca7d.tar.gz
Doxygen-6cbcbc787daeae62ce59c04bbc35597986bcca7d.tar.bz2
Release-1.8.0
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown.doc8
-rw-r--r--doc/xmlcmds.doc3
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/markdown.doc b/doc/markdown.doc
index e057b53..d571eef 100644
--- a/doc/markdown.doc
+++ b/doc/markdown.doc
@@ -22,13 +22,13 @@
was introduced in doxygen version 1.8.0. It is a plain text formatting
syntax written by John Gruber, with the following underlying design goal:
-> The design goal for Markdown’s formatting syntax is to
+> The design goal for Markdown's formatting syntax is to
> make it as readable as possible. The idea is that a Markdown-formatted
> document should be publishable as-is, as plain text, without
-> looking like it’s been marked up with tags or formatting instructions.
-> While Markdown’s syntax has been influenced by several existing
+> looking like it's been marked up with tags or formatting instructions.
+> While Markdown's syntax has been influenced by several existing
> text-to-HTML filters, the single biggest source of inspiration
-> for Markdown’s syntax is the format of plain text email.
+> for Markdown's syntax is the format of plain text email.
In the \ref markdown_std "next section" the standard Markdown features
are briefly discussed. The reader is referred to the [Markdown site][markdown]
diff --git a/doc/xmlcmds.doc b/doc/xmlcmds.doc
index 526fce7..2d6cbab 100644
--- a/doc/xmlcmds.doc
+++ b/doc/xmlcmds.doc
@@ -37,6 +37,9 @@ Here is the list of tags supported by doxygen:
method can throw.
<li><tt>\<include\></tt> Can be used to import a piece of XML from an external
file. Ignored by doxygen at the moment.
+<li><tt>\<inheritdoc\></tt> Can be used to insert the documentation of a
+ member of a base class into the documentation of a
+ member of a derived class that reimplements it.
<li><tt>\<item\></tt> List item. Can only be used inside a <tt>\<list\></tt> context.
<li><tt>\<list type="type"\></tt> Starts a list, supported types are <tt>bullet</tt>
or <tt>number</tt> and <tt>table</tt>.