Skip to content

Commit 3279ff7

Browse files
committed
📝 Update conda term
1 parent 1686160 commit 3279ff7

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Added
3030
Changed
3131
~~~~~~~
3232

33+
* 📝 Update conda term
3334
* 📝 Update GitLab package registry
3435
* 📝 Expand the pytest plugins section
3536
* 📝 Rearrange functions section

docs/libs/glossary.rst

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,28 @@ Glossary
3030
:term:`multibuild`
3131

3232
conda
33-
Package management tool for the `Anaconda
34-
<https://docs.anaconda.com/anaconda/index.html>`_ distribution from
35-
`Continuum Analytics <https://www.anaconda.com/>`_. It’s specifically
33+
Package management tool for the `Anaconda distribution
34+
<https://docs.anaconda.com/anaconda/index.html>`_. It’s specifically
3635
aimed at the scientific community, particularly Windows, where installing
3736
binary extensions is often difficult.
3837

3938
Conda does not install packages from PyPI and can only install from the
4039
official Continuum repositories or from `anaconda.org
4140
<https://anaconda.org/>`_ or local ( e.g. intranet) package servers.
42-
Note, however, that Pip can be installed in conda and can work side by
43-
side to manage distributions of PyPI.
41+
42+
.. note::
43+
Pip can be installed in conda and can work side by side to manage
44+
distributions of PyPI.
4445

4546
.. seealso::
4647
* `Conda: Myths and Misconceptions
4748
<https://jakevdp.github.io/blog/2016/08/25/conda-myths-and-misconceptions/>`_
4849
* `Conda build variants
4950
<https://docs.conda.io/projects/conda-build/en/latest/resources/variants.html>`_
5051

52+
`Docs <https://docs.conda.io/en/latest/>`__ |
53+
`GitHub <https://github.com/conda/conda>`__
54+
5155
devpi
5256
`devpi <https://www.devpi.net>`_ is a powerful :term:`PyPI` compatible
5357
server and PyPI proxy cache with a command line tool to enable packaging,

0 commit comments

Comments
 (0)