Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fe9660a

Browse files
betatimlesteve
andauthored
Backport docs updates (conda-forge link, canonical URL) to 1.6.x (#30727)
Co-authored-by: Loïc Estève <[email protected]>
1 parent 99bf3d8 commit fe9660a

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

doc/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@
207207
# Sphinx are currently 'default' and 'sphinxdoc'.
208208
html_theme = "pydata_sphinx_theme"
209209

210+
# This config option is used to generate the canonical links in the header
211+
# of every page. The canonical link is needed to prevent search engines from
212+
# returning results pointing to old scikit-learn versions.
213+
html_baseurl = "https://scikit-learn.org/stable/"
214+
210215
# Theme options are theme-specific and customize the look and feel of a theme
211216
# further. For a list of options available for each theme, see the
212217
# documentation.

doc/developers/advanced_installation.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ feature, code or documentation improvement).
5959
instead.
6060

6161
#. Install a recent version of Python (3.9 or later at the time of writing) for
62-
instance using Miniforge3_. Miniforge provides a conda-based distribution of
62+
instance using Condaforge_. Conda-forge provides a conda-based distribution of
6363
Python and the most popular scientific libraries.
6464

6565
If you installed Python with conda, we recommend to create a dedicated
@@ -258,8 +258,8 @@ to enable OpenMP support:
258258

259259
For Apple Silicon M1 hardware, only the conda-forge method below is known to
260260
work at the time of writing (January 2021). You can install the `macos/arm64`
261-
distribution of conda using the `miniforge installer
262-
<https://github.com/conda-forge/miniforge#miniforge>`_
261+
distribution of conda using the `conda-forge installer
262+
<https://conda-forge.org/download/>`_
263263

264264
macOS compilers from conda-forge
265265
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -482,4 +482,4 @@ the base system and these steps will not be necessary.
482482
.. _Homebrew: https://brew.sh
483483
.. _virtualenv: https://docs.python.org/3/tutorial/venv.html
484484
.. _conda environment: https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html
485-
.. _Miniforge3: https://github.com/conda-forge/miniforge#miniforge3
485+
.. _Condaforge: https://conda-forge.org/download/

doc/install_instructions_conda.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Install conda using the
2-
`miniforge installers <https://github.com/conda-forge/miniforge#miniforge>`__ (no
2+
`conda-forge installers <https://conda-forge.org/download/>`__ (no
33
administrator permission required). Then run:
44

55
.. prompt:: bash

0 commit comments

Comments
 (0)