summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlicia Cozine <879121+acozine@users.noreply.github.com>2021-04-16 16:04:44 -0500
committerGitHub <noreply@github.com>2021-04-16 16:04:44 -0500
commitc2f2041be15d51db872c7de686cd537dc720b12e (patch)
treef3349d511e0c734ce0f4acd2cc4ef9afb3fe8f77
parent621d1a94ab821e45a4eb03697ee6ec8db697c6c8 (diff)
downloadansible-c2f2041be15d51db872c7de686cd537dc720b12e.tar.gz
Backport/2.10/docs config (#74278)
* update intersphinx links for Ansible 3 (cherry picked from commit 481c036632f829b52d494451ff918f67c66a7eb6) * updates list of available versions for Ansible 3 (#74265) (cherry picked from commit 126e9244c2bbe12234d0cbd98c0802444ab103f5) Co-authored-by: Sandra McCann <samccann@redhat.com>
-rw-r--r--docs/docsite/ansible_2_10.invbin218830 -> 238312 bytes
-rw-r--r--docs/docsite/ansible_2_8.invbin198670 -> 198635 bytes
-rw-r--r--docs/docsite/ansible_2_9.invbin242519 -> 242331 bytes
-rw-r--r--docs/docsite/ansible_3.invbin0 -> 270615 bytes
-rw-r--r--docs/docsite/python3.invbin107011 -> 109561 bytes
-rw-r--r--docs/docsite/sphinx_conf/ansible_conf.py3
-rw-r--r--docs/docsite/sphinx_conf/core_conf.py1
7 files changed, 3 insertions, 1 deletions
diff --git a/docs/docsite/ansible_2_10.inv b/docs/docsite/ansible_2_10.inv
index 900df6e1b2..716035a401 100644
--- a/docs/docsite/ansible_2_10.inv
+++ b/docs/docsite/ansible_2_10.inv
Binary files differ
diff --git a/docs/docsite/ansible_2_8.inv b/docs/docsite/ansible_2_8.inv
index 1d8fcd07eb..923d15f4a8 100644
--- a/docs/docsite/ansible_2_8.inv
+++ b/docs/docsite/ansible_2_8.inv
Binary files differ
diff --git a/docs/docsite/ansible_2_9.inv b/docs/docsite/ansible_2_9.inv
index 83badf6744..0f72671132 100644
--- a/docs/docsite/ansible_2_9.inv
+++ b/docs/docsite/ansible_2_9.inv
Binary files differ
diff --git a/docs/docsite/ansible_3.inv b/docs/docsite/ansible_3.inv
new file mode 100644
index 0000000000..8385568201
--- /dev/null
+++ b/docs/docsite/ansible_3.inv
Binary files differ
diff --git a/docs/docsite/python3.inv b/docs/docsite/python3.inv
index 192167887e..1a4fb5ff36 100644
--- a/docs/docsite/python3.inv
+++ b/docs/docsite/python3.inv
Binary files differ
diff --git a/docs/docsite/sphinx_conf/ansible_conf.py b/docs/docsite/sphinx_conf/ansible_conf.py
index 44af3496c0..42bf1a3ed0 100644
--- a/docs/docsite/sphinx_conf/ansible_conf.py
+++ b/docs/docsite/sphinx_conf/ansible_conf.py
@@ -160,7 +160,7 @@ html_context = {
'current_version': version,
'latest_version': '3',
# list specifically out of order to make latest work
- 'available_versions': ('latest', '2.10', '2.9', '2.9_ja', '2.8', 'devel'),
+ 'available_versions': ('latest', '2.9', 'devel'),
'css_files': ('_static/ansible.css', # overrides to the standard theme
),
}
@@ -290,6 +290,7 @@ autoclass_content = 'both'
intersphinx_mapping = {'python': ('https://docs.python.org/2/', (None, '../python2.inv')),
'python3': ('https://docs.python.org/3/', (None, '../python3.inv')),
'jinja2': ('http://jinja.palletsprojects.com/', (None, '../jinja2.inv')),
+ 'ansible_3': ('https://docs.ansible.com/ansible/3/', (None, '../ansible_3.inv')),
'ansible_2_10': ('https://docs.ansible.com/ansible/2.10/', (None, '../ansible_2_10.inv')),
'ansible_2_9': ('https://docs.ansible.com/ansible/2.9/', (None, '../ansible_2_9.inv')),
'ansible_2_8': ('https://docs.ansible.com/ansible/2.8/', (None, '../ansible_2_8.inv')),
diff --git a/docs/docsite/sphinx_conf/core_conf.py b/docs/docsite/sphinx_conf/core_conf.py
index c10fe028a5..f9b7033056 100644
--- a/docs/docsite/sphinx_conf/core_conf.py
+++ b/docs/docsite/sphinx_conf/core_conf.py
@@ -298,6 +298,7 @@ autoclass_content = 'both'
intersphinx_mapping = {'python': ('https://docs.python.org/2/', (None, '../python2.inv')),
'python3': ('https://docs.python.org/3/', (None, '../python3.inv')),
'jinja2': ('http://jinja.palletsprojects.com/', (None, '../jinja2.inv')),
+ 'ansible_3': ('https://docs.ansible.com/ansible/3/', (None, '../ansible_3.inv')),
'ansible_2_10': ('https://docs.ansible.com/ansible/2.10/', (None, '../ansible_2_10.inv')),
'ansible_2_9': ('https://docs.ansible.com/ansible/2.9/', (None, '../ansible_2_9.inv')),
'ansible_2_8': ('https://docs.ansible.com/ansible/2.8/', (None, '../ansible_2_8.inv')),