From bff13ab382d6d829a0a9621b52505c5fb14291f5 Mon Sep 17 00:00:00 2001
From: Marvin Albert <marvin.albert@gmail.com>
Date: Thu, 9 Jan 2025 22:11:48 +0100
Subject: [PATCH] Updated installation instructions

---
 book/install_python.md    | 48 +++++++++++++++++++--------------------
 book/setup_environment.md | 12 ++++------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/book/install_python.md b/book/install_python.md
index 8f909dd..7457f2c 100644
--- a/book/install_python.md
+++ b/book/install_python.md
@@ -6,53 +6,51 @@ This how-to teaches how to install Python on your computer using `conda`, which
 - environment manager and a
 - package manager.
 
-### `conda` and `mamba`
+If you already have conda, anaconda, miniconda, mambaforge, or miniforge installed, those will work as well and you can skip to the next section.
 
-There is one problem with conda: Its default package manager is very slow. Instead, using `conda` in combination with the package manager [`mamba`](https://mamba.readthedocs.io/en/latest/index.html) saves a lot of time when installing new packages. The version of `conda` which includes this package manager is called `mambaforge`.
+In this section, we will install `miniforge`, a minimal installer for conda.
 
 **Prerequisites**
 - You have a computer with linux, MacOS, or Windows installed
 
-**Related reading**
-
-- [mamba documentation](https://mamba.readthedocs.io/en/latest/index.html)
-
 ## Instructions
 
 Select the installation instructions for your operating system and processor from the tabs below.
 
 ````{tab-set}
 ```{tab-item} Linux
-1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
-2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-Linux-x86_64`.
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#miniforge).
+2. Scroll down to the "Miniforge3" header of the "Downloads" section. Click the link to download link for `Miniforge3-Linux-x86_64`.
 3. Open your terminal application
 4. Navigate to the folder you downloaded the installer to (usually this is in your Downloads folder). If the file was downloaded to your Downloads folder, you would enter:
 
     ```bash
     cd ~/Downloads
-    ```   
-
+    ```
 5. Execute the installer with the command below. You can use your arrow keys to scroll up and down to read the license agreement and enter "yes" if you agree.
 
     ```bash
-    bash Mambaforge-Linux-x86_64.sh
+    bash Miniforge-Linux-x86_64.sh
     ```
-6. After installation, you will be asked if you would like to initialize your terminal with "conda init". Enter "yes" to initalize your terminal.
+
+6. After installation, you will be asked if you would like to initialize your terminal with "conda init". For a local installation, you enter "yes" here and the conda command will be available every time you open a terminal. In this course, we work on virtual BAND computers, and in this case we enter "no".
+
 7. To verify your installation worked, close your Terminal window and open a new one. You should see `(base)` to the left of your prompt.
 
-    ```{admonition} Don't see (base)?
-    You can manually initialize conda by entering the command below and re-opening your terminal application.
+
+    ```{admonition} You were already seeing (base)?
+    If you said "no" in the previous point, activate the conda command in your terminal by entering the following in the terminal:
+
 
     ```bash
-    conda init
-    
+    source ~/miniforge3/bin/activate
     ```
 
 ```
 
 ```{tab-item} Mac OS (Intel)
-1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
-2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-MacOSX-x86_64`.
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#miniforge).
+2. Scroll down to the "Miniforge" header of the "Downloads" section. Click the link to download link for `Miniforge-MacOSX-x86_64`.
 3. Open your Terminal (you can search for it in spotlight - `cmd` + `space`)
 4. Navigate to the folder you downloaded the installer to (usually this is in your Downloads folder). If the file was downloaded to your Downloads folder, you would enter:
 
@@ -63,7 +61,7 @@ Select the installation instructions for your operating system and processor fro
 5. Execute the installer with the command below.  You can use your arrow keys to scroll up and down to read the license agreement and enter "yes" if you agree.
 
     ```bash
-    bash Mambaforge-MacOSX-x86_64.sh
+    bash Miniforge-MacOSX-x86_64.sh
     ```
 
 6. After installation, you will be asked if you would like to initialize your terminal with "conda init". Enter "yes" to initalize your terminal.   
@@ -79,8 +77,8 @@ Select the installation instructions for your operating system and processor fro
 ```
 
 ```{tab-item} Mac OS (M1/M2)
-1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
-2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-MacOSX-arm64`.
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#miniforge).
+2. Scroll down to the "Miniforge" header of the "Downloads" section. Click the link to download link for `Miniforge-MacOSX-arm64`.
 3. Open your Terminal (you can search for it in spotlight - `cmd` + `space`)
 4. Navigate to the folder you downloaded the installer to (usually this is in your Downloads folder). If the file was downloaded to your Downloads folder, you would enter:
 
@@ -91,7 +89,7 @@ Select the installation instructions for your operating system and processor fro
 5. Execute the installer with the command below. You can use your arrow keys to scroll up and down to read it/agree to it.
 
     ```bash
-    bash Mambaforge-MacOSX-arm64.sh
+    bash Miniforge-MacOSX-arm64.sh
     ```
     
 6. After installation, you will be asked if you would like to initialize your terminal with "conda init". Enter "yes" to initalize your terminal. 
@@ -107,9 +105,9 @@ Select the installation instructions for your operating system and processor fro
 ```
 
 ```{tab-item} Windows
-1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
-2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-Windows-x86_64`.
-3. Find the file you downloaded (Mambaforge-Windows-x86_64.exe) and double click to execute it. Follow the instructions to complete the installation.
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#miniforge).
+2. Scroll down to the "Miniforge" header of the "Downloads" section. Click the link to download link for `Miniforge-Windows-x86_64`.
+3. Find the file you downloaded (Miniforge-Windows-x86_64.exe) and double click to execute it. Follow the instructions to complete the installation.
 4. Once the installation has completed, you can verify it was correctly installed by searching for the "miniforge prompt" in your Start menu.
 ```
 ````
\ No newline at end of file
diff --git a/book/setup_environment.md b/book/setup_environment.md
index b40863a..5e254ac 100644
--- a/book/setup_environment.md
+++ b/book/setup_environment.md
@@ -34,17 +34,15 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Setting up your python environment
 
-## Installing python via mambaforge
+## Installing conda to manage your python environment
 
-In this tutorial, we will install python via mambaforge, a distribution of anaconda python. However, if you already have anaconda, miniconda, mambaforge, or miniforge installed, those will work as well and you can skip to the next section.
-
-To install python via mambaforge, follow the instructions [here](install_python.md).
+In this tutorial, we will use `conda` to manage our python environment. If you haven't installed conda yet, follow the instructions [here](install_python.md).
 
 
 ## Setting up your environment
 
-```{admonition} Using conda instead of mamba?
-The following assumes that you have installed python using Mambaforge as [described above](install_python.md). If you are using a pre-existing installation of python via anaconda, miniconda, or miniforge, consider installing `mamba` into your existing installation using the command `conda install -c conda-forge mamba`. Alternatively, you can simply replace the `mamba` commands below with `conda`.
+```{admonition} Using conda together with mamba?
+There is one problem with older versions of conda: It is very slow. Alternatively, you can use `mamba`, a drop-in replacement for conda that is much faster. If you have installed `mamba` into your conda environment (`conda install -c conda-forge mamba`), you can replace `conda` with `mamba` in the following instructions.
 
 ```
 
@@ -64,7 +62,7 @@ The following assumes that you have installed python using Mambaforge as [descri
 3. The file `environment.yml` contains the dependencies needed to run the notebooks, and it specifies a `conda` environment named `pyimagecourse`. Create this environment from the file by entering the following command.
 
 	```bash
-	mamba env create --file environment.yml
+	conda env create --file environment.yml
 	```
 
 4. Once the environment setup has finished, activate the environment. If you successfully activated the environment, you should now see `(pyimagecourse)` to the left of your command prompt.
-- 
GitLab