Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/.sphinx/_integration/add_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
# Add "integrated" to the list of custom tags
tags.add('integrated')
elif project == "MicroOVN":
html_baseurl = "https://canonical-microovn.readthedocs-hosted.com/en/latest/"
html_baseurl = "https://ubuntu.com/docs/microovn/latest/"
custom_tags.append('integrated')

4 changes: 2 additions & 2 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ integrate:
html: integrate install
mkdir -p $(current_dir)/_build
cd integration/lxd/doc/ && $(MAKE) html BUILDDIR=$(current_dir)/_build/lxd
cd integration/microceph/docs/ && $(MAKE) html BUILDDIR=$(current_dir)/_build/microceph
cd integration/microceph/docs/ && $(MAKE) html DOCS_BUILDDIR=$(current_dir)/_build/microceph
cd integration/microovn/docs/ && $(MAKE) html BUILDDIR=$(current_dir)/_build/microovn
. $(DOCS_VENV); $(SPHINX_BUILD) -W --keep-going -b dirhtml "$(DOCS_SOURCEDIR)" "$(current_dir)/_build" -w $(SPHINX_DIR)/warnings.txt $(SPHINX_OPTS)

# `html-rtd` builds the integrated docs, with the correct paths for Read the Docs.
# This target is used by the Read the Docs build.
html-rtd: install
PATH_PREFIX=$(PATH_PREFIX) $(MAKE) -C integration/lxd/doc/ html-rtd BUILDDIR=$(READTHEDOCS_OUTPUT)/html/lxd
PATH_PREFIX=$(PATH_PREFIX) $(MAKE) -C integration/microceph/docs/ html BUILDDIR=$(READTHEDOCS_OUTPUT)/html/microceph
PATH_PREFIX=$(PATH_PREFIX) $(MAKE) -C integration/microceph/docs/ html DOCS_BUILDDIR=$(READTHEDOCS_OUTPUT)/html/microceph
PATH_PREFIX=$(PATH_PREFIX) $(MAKE) -C integration/microovn/docs/ html BUILDDIR=$(READTHEDOCS_OUTPUT)/html/microovn
. $(DOCS_VENV); PATH_PREFIX=$(PATH_PREFIX) $(SPHINX_BUILD) -W --keep-going -b dirhtml "$(DOCS_SOURCEDIR)" "$(READTHEDOCS_OUTPUT)/html" -w $(SPHINX_DIR)/warnings.txt $(SPHINX_OPTS)

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
intersphinx_mapping = {
'lxd': ('https://canonical.com/lxd/docs/latest/', None),
'microceph': ('https://documentation.ubuntu.com/canonical-microceph/latest/', None),
'microovn': ('https://canonical-microovn.readthedocs-hosted.com/en/latest/', None),
'microovn': ('https://ubuntu.com/docs/microovn/latest/', None),
}
elif ('READTHEDOCS' in os.environ) and (os.environ['READTHEDOCS'] == 'True'):
intersphinx_mapping = {
Expand Down
Loading