diff options
-rw-r--r-- | src/docs/Doxyfile | 1 | ||||
-rw-r--r-- | src/docs/file-formats.dox | 2 | ||||
-rw-r--r-- | src/docs/programming.dox | 2 | ||||
-rw-r--r-- | src/docs/schema.dox | 2 | ||||
-rw-r--r-- | src/docs/spell.ok | 1 | ||||
-rwxr-xr-x | src/docs/tools/doxfilter.py | 4 |
6 files changed, 5 insertions, 7 deletions
diff --git a/src/docs/Doxyfile b/src/docs/Doxyfile index 3fc4f41a36b..8e051aaff3b 100644 --- a/src/docs/Doxyfile +++ b/src/docs/Doxyfile @@ -210,6 +210,7 @@ ALIASES = "notyet{1}=Note: <b>"\1"</b> not yet supported in Wired "ebusy_errors=@returns zero on success, EBUSY if there are open cursors on the object and a non-zero error code on failure. See @ref error_returns \"Error Returns\" for details." \ "ex_ref{1}=@ref \1 \"\1\"" \ "ref_single=@ref" \ + "subpage_single=@subpage" \ "hrow{1}=<tr><th>\1</th></tr>" \ "hrow{2}=<tr><th>\1</th><th>\2</th></tr>" \ "hrow{3}=<tr><th>\1</th><th>\2</th><th>\3</th></tr>" \ diff --git a/src/docs/file-formats.dox b/src/docs/file-formats.dox index 4d339d9b13d..f50d95440bb 100644 --- a/src/docs/file-formats.dox +++ b/src/docs/file-formats.dox @@ -102,7 +102,7 @@ additional CPU and memory use when searching the in-memory tree (if keys are encoded), and additional CPU and memory use when returning values from the in-memory tree and when writing pages to disk. Note the additional CPU cost of Huffman encoding can be high, and should be -considered. (See @m_single_subpage huffman for details.) +considered. (See @subpage_single huffman for details.) Huffman encoding is disabled by default. diff --git a/src/docs/programming.dox b/src/docs/programming.dox index cdfb6d336e8..987ba46152d 100644 --- a/src/docs/programming.dox +++ b/src/docs/programming.dox @@ -42,7 +42,7 @@ each of which is ordered by one or more columns. - @subpage statistics - @subpage shared_cache - @subpage cursor_log -- @subpage upgrade +- @subpage_single upgrade @m_if{c} <h2>Extending WiredTiger</h2> diff --git a/src/docs/schema.dox b/src/docs/schema.dox index 6bdbc7d1a85..784a3bef86f 100644 --- a/src/docs/schema.dox +++ b/src/docs/schema.dox @@ -57,7 +57,7 @@ Key and value types may also be chosen from a list, or composed of multiple columns with any combination of types. Keys and values may be up to (<code>4GB - 512B</code>) bytes in size. -See @m_single_subpage keyvalue for more details on raw key / value items. +See @subpage_single keyvalue for more details on raw key / value items. @section schema_format_types Format types diff --git a/src/docs/spell.ok b/src/docs/spell.ok index 805a7e908f1..5f5cd566ac9 100644 --- a/src/docs/spell.ok +++ b/src/docs/spell.ok @@ -353,6 +353,7 @@ recnum recoverability recs rectype +relinking rerequests ret rf diff --git a/src/docs/tools/doxfilter.py b/src/docs/tools/doxfilter.py index 8e1c78ca5d0..9161602e1e0 100755 --- a/src/docs/tools/doxfilter.py +++ b/src/docs/tools/doxfilter.py @@ -97,8 +97,6 @@ def process_lang(lang, lines): section_rep = r'\1 \2' + lang_suffix subpage_pat = re.compile('@subpage\s+(\w*)') subpage_rep = r'@subpage \1' + lang_suffix - msinglesubpage_pat = re.compile('@m_single_subpage\s+(\w*)') - msinglesubpage_rep = r'\\subpage \1' exref_pat = re.compile('@ex_ref{ex_([^.]*)[.]c}') if lang == 'c': exref_rep = r'@ex_ref{ex_\1' + lang_ext + '}' @@ -120,8 +118,6 @@ def process_lang(lang, lines): line = re.sub(snip_pat, snip_rep, line) line = re.sub(mpage_pat, mpage_rep, line) line = re.sub(subpage_pat, subpage_rep, line) - # msinglesubpage must be performed after subpage - line = re.sub(msinglesubpage_pat, msinglesubpage_rep, line) if '@m_if' in line: m = re.search(mif_pat, line) if not m: |