Skip to content

Commit 80e74f6

Browse files
layout corrections
1 parent d5ca0de commit 80e74f6

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

doc/getting-started/install.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ These instructions will install the most recent stable version of CLIMADA withou
145145
Simple Instructions with Pixi (Alternative)
146146
-------------------
147147

148-
As an alternative to mamba `Pixi <https://pixi.sh/>` can be used to install climada from conda-forge.
149-
`Pixi`_ is a modern package manager that is based on `Conda`_ and offers much faster dependency resolution.
148+
As an alternative to mamba `Pixi`_ can be used to install climada from conda-forge.
149+
Pixi is a modern package manager, based on Conda, that offers much faster dependency resolution.
150150

151-
.. important::
151+
.. attention::
152152

153-
On Windows, installing ``climada-petals`` with `Conda`_ / `Mamba`_ may be prohibited as it takes forever to resolve the dependency tree.
153+
On Windows, installing ``climada-petals`` with Conda/Mamba may be prohibited as it takes forever to resolve the dependency tree.
154154
In these cases, `Pixi`_ is often the only reliable fallback.
155155

156156
#. Open the command line and create a new folder for your Pixi project:
@@ -758,6 +758,9 @@ Terminal, Command Line
758758
`Mamba`_
759759
The faster reimplementation of the ``conda`` package manager.
760760

761+
`Pixi`_
762+
The much faster modern package manager based on ``conda``.
763+
761764
Environment (Programming)
762765
A setup where only a specific set of modules and programs can interact.
763766
This is especially useful if you want to install programs with mutually incompatible requirements.
@@ -785,4 +788,5 @@ IDE
785788
.. _Conda: https://docs.conda.io/en/latest/
786789
.. _Mamba: https://mamba.readthedocs.io/en/latest/installation/mamba-installation.html
787790
.. _Miniforge: https://github.com/conda-forge/miniforge
791+
.. _Pixi: https://pixi.sh/
788792
.. _CLIMADA Petals: https://climada-petals.readthedocs.io/en/latest/

0 commit comments

Comments
 (0)