From 5130eb14f775f79d6652bf471a309f4bf26bc290 Mon Sep 17 00:00:00 2001
From: milancurcic <caomaco@gmail.com>
Date: Wed, 17 Mar 2021 10:53:55 -0400
Subject: add Sebastian's Conda instructions

---
 README.md | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index be96b4f..e4dca52 100644
--- a/README.md
+++ b/README.md
@@ -17,14 +17,35 @@ To report a bug report or suggest a feature, please read our
 
 ## Getting started
 
-### Binary download
+### Setting up fpm
+
+#### Binary download
 `x86-64` binaries are available [to download](https://github.com/fortran-lang/fpm/releases) for Windows, MacOS and Linux.
 
 __Note:__ On Linux and MacOS, you will need to enable executable permission before you can use the binary.
 
 _e.g._ `$ chmod u+x fpm-v0.1.0-linux-x86_64`
 
-__Github actions:__ to setup *fpm* within Github actions for automated testing, you can use the [fortran-lang/setup-fpm](https://github.com/marketplace/actions/setup-fpm) action.
+#### Conda
+
+If you haven't yet, first enable the conda-forge channel:
+
+```
+conda config --add channels conda-forge
+```
+
+Fpm can be installed with:
+
+```
+conda create -n fpm fpm
+conda activate fpm
+```
+
+#### Github Actions
+
+To setup *fpm* within Github actions for automated testing, you can use the [fortran-lang/setup-fpm](https://github.com/marketplace/actions/setup-fpm) action.
+
+#### Bootstraping on other platforms
 
 For other platforms and architectures have a look at the [bootstrapping instructions](#bootstrapping-instructions).
 
-- 
cgit v1.2.3


From 333025da9660c7260f74e8f8ffc34f2b2ffb1e75 Mon Sep 17 00:00:00 2001
From: milancurcic <caomaco@gmail.com>
Date: Wed, 17 Mar 2021 11:28:32 -0400
Subject: add a note on where to get Conda

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'README.md')

diff --git a/README.md b/README.md
index e4dca52..ffbda20 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,9 @@ conda create -n fpm fpm
 conda activate fpm
 ```
 
+Conda can be installed from [miniconda](https://docs.conda.io/en/latest/miniconda.html)
+or from [miniforge](https://github.com/conda-forge/miniforge/releases).
+
 #### Github Actions
 
 To setup *fpm* within Github actions for automated testing, you can use the [fortran-lang/setup-fpm](https://github.com/marketplace/actions/setup-fpm) action.
-- 
cgit v1.2.3


From fc9fea90256f9dc9221fbfaed4dc9ecc03832bab Mon Sep 17 00:00:00 2001
From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com>
Date: Wed, 17 Mar 2021 17:48:42 +0100
Subject: Update conda installation instructions

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index ffbda20..4dff513 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ _e.g._ `$ chmod u+x fpm-v0.1.0-linux-x86_64`
 
 #### Conda
 
-If you haven't yet, first enable the conda-forge channel:
+Fpm is available on conda-forge, to add conda-forge to your channels use:
 
 ```
 conda config --add channels conda-forge
@@ -41,8 +41,8 @@ conda create -n fpm fpm
 conda activate fpm
 ```
 
-Conda can be installed from [miniconda](https://docs.conda.io/en/latest/miniconda.html)
-or from [miniforge](https://github.com/conda-forge/miniforge/releases).
+The conda package manager can be installed from [miniforge](https://github.com/conda-forge/miniforge/releases)
+or from [miniconda](https://docs.conda.io/en/latest/miniconda.html).
 
 #### Github Actions
 
@@ -118,4 +118,3 @@ with itself and run the tests with:
 $ cd fpm
 $ fpm test
 ```
-
-- 
cgit v1.2.3