Merge pull request #759 from jeromekelleher/fix-docs-doxygen-1.8.17

mergify[bot] · web-flow · commit 244734825fee · 2020-08-10T12:50:39.000Z
Fixes for newer doxygen versions.
diff --git a/c/tskit/tables.h b/c/tskit/tables.h
@@ -2805,7 +2805,7 @@ int tsk_table_sorter_run(struct _tsk_table_sorter_t *self, tsk_bookmark_t *start
 */
 int tsk_table_sorter_free(struct _tsk_table_sorter_t *self);
 
-/* @} */
+/** @} */
 
 int tsk_squash_edges(
     tsk_edge_t *edges, tsk_size_t num_edges, tsk_size_t *num_output_edges);
diff --git a/docs/Makefile b/docs/Makefile
@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -W
+SPHINXOPTS    = -W --keep-going
 SPHINXBUILD   = python3 -m sphinx
 SOURCEDIR     = .
 BUILDDIR      = _build
diff --git a/docs/conf.py b/docs/conf.py
@@ -300,6 +300,9 @@ def handle_item(fieldarg, content):
 
 nitpicky = True
 nitpick_ignore = [
+    ("c:identifier", "int32_t"),
+    ("c:identifier", "uint32_t"),
+    ("c:identifier", "FILE"),
     ("c:type", "int32_t"),
     ("c:type", "uint32_t"),
     ("c:type", "bool"),

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`
`4`	`4`	`# You can set these variables from the command line.`
`5`		`-SPHINXOPTS = -W`
	`5`	`+SPHINXOPTS = -W --keep-going`
`6`	`6`	`SPHINXBUILD = python3 -m sphinx`
`7`	`7`	`SOURCEDIR = .`
`8`	`8`	`BUILDDIR = _build`