doc: pass graphviz options in conf.py

easier to maintain the options of sphinx extensions in a single place.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/admin/build-doc b/admin/build-doc
index 52e9086bff1881e7315f2d82579afdeab825a48f..979bba4b85e9bb6cb3035b3d17e30a2cf0532554 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -127,7 +127,6 @@ for target in $sphinx_targets; do
     case $target in
         html)
             builder=dirhtml
-            extra_opt="-D graphviz_output_format=svg"
             ;;
         man)
             extra_opt="-t man"

diff --git a/doc/conf.py b/doc/conf.py
index cc6dc8db02143bf726019db6649ce6ac99592f9f..74ee96562338210e327754ad75d3a01256326d1b 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -114,6 +114,9 @@ breathe_doxygen_config_options = {
 edit_on_github_project = 'ceph/ceph'
 edit_on_github_branch = 'master'
 
+# graphviz options
+graphviz_output_format = 'svg'
+
 def generate_state_diagram(input_paths, output_path):
     sys.path.append(os.path.join(top_level, 'doc', 'scripts'))
     from gen_state_diagram import do_filter, StateMachineRenderer