diff options
author | Jeff Fearn <jfearn@redhat.com> | 2017-05-25 15:22:46 +0200 |
---|---|---|
committer | Gervase Markham <gerv@mozilla.org> | 2017-05-25 15:22:46 +0200 |
commit | bae90f4d945b628971b5d54435791c56afc3b770 (patch) | |
tree | 331e4687fae449e7b83e3d98e0e61a6cf6d81cce /docs/en | |
parent | 8dae231543259281f944bf5a8997b1a64420ede5 (diff) | |
download | bugzilla-bae90f4d945b628971b5d54435791c56afc3b770.tar.gz bugzilla-bae90f4d945b628971b5d54435791c56afc3b770.tar.xz |
Bug 1314854: Integrate POD in to REST docs.
Diffstat (limited to 'docs/en')
-rw-r--r-- | docs/en/rst/conf.py | 16 | ||||
-rw-r--r-- | docs/en/rst/integrating/index.rst | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py index d2d50f6d2..cfbca34a2 100644 --- a/docs/en/rst/conf.py +++ b/docs/en/rst/conf.py @@ -381,9 +381,9 @@ todo_include_todos = True on_rtd = os.environ.get('READTHEDOCS', None) == 'True' if on_rtd: - base_api_url = 'https://www.bugzilla.org/docs/tip/en/html/integrating/api/' + base_api_url = 'https://www.bugzilla.org/docs/tip/en/html/integrating/internals/' else: - base_api_url = '../integrating/api/' + base_api_url = '../integrating/internals/' extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug '), 'api': (base_api_url + '%s', '')} @@ -399,13 +399,17 @@ ext_dir = "../../../extensions" # Still, check just in case, so if it ever changes, we know if (os.path.isdir(ext_dir)): - # Clear out old extensions docs + # Clear out removed extensions docs for dir in os.listdir("extensions"): # A .gitignore file is required as git doesn't like empty directories if dir == ".gitignore": continue - shutil.rmtree(os.path.join("extensions", dir)) + src = os.path.join(ext_dir, dir) + + # extension dir missing, assume uninstalled + if not os.path.isdir(src): + shutil.rmtree(os.path.join("extensions", dir)) # Copy in new copies for ext_name in os.listdir(ext_dir): @@ -426,6 +430,10 @@ if (os.path.isdir(ext_dir)): dst = os.path.join("extensions", ext_name) + # remove old docs + if (os.path.isdir(dst)): + shutil.rmtree(dst) + shutil.copytree(src, dst) else: print "Warning: Bugzilla extension directory not found: " + ext_dir diff --git a/docs/en/rst/integrating/index.rst b/docs/en/rst/integrating/index.rst index 794bc0ad8..ea7d8a7f3 100644 --- a/docs/en/rst/integrating/index.rst +++ b/docs/en/rst/integrating/index.rst @@ -21,3 +21,4 @@ explains how to use the available mechanisms for integration and customization. extensions apis auth-delegation + internals/index |