From 854ce9ba0cde0fece438a30b203dc7fad882ab95 Mon Sep 17 00:00:00 2001 From: Nathan Fallet Date: Thu, 6 May 2021 09:33:36 +0200 Subject: [PATCH 1/4] All-in-one alternative for macOS for beginners --- site/docs/install.fr.md | 4 ++++ site/docs/install.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/site/docs/install.fr.md b/site/docs/install.fr.md index e07459b6d..da74efc52 100644 --- a/site/docs/install.fr.md +++ b/site/docs/install.fr.md @@ -128,6 +128,10 @@ Les paquets d'Arch Linux pour OCaml sont Sur macOS OCaml et/ou OPAM peuvent êtres installés grâce aux systèmes de gestion de paquets tiers. +### Pack tout-en-un (OCaml + éditeur) + +Si vous êtes un débutant et que vous recherchez une installation simple, vous pouvez télécharger [ce pack tout-en-un sur l'App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). Il contient un éditeur côte à côté avec une console interactive, gratuit et [open source](https://github.com/GroupeMINASTE/OCaml-iOS). + ### [Homebrew](http://brew.sh/) [![Homebrew](https://repology.org/badge/version-only-for-repo/homebrew/ocaml.svg)](https://repology.org/metapackage/ocaml) ```bash diff --git a/site/docs/install.md b/site/docs/install.md index b1168fd8f..3b1decf1e 100644 --- a/site/docs/install.md +++ b/site/docs/install.md @@ -141,6 +141,10 @@ Other Arch Linux packages related to OCaml are On macOS OCaml and/or OPAM can be installed via the existing third-party package systems. +### All-in-one package (OCaml + editor) + +If you are a beginner and want an easy installation, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). + ### [Homebrew](http://brew.sh/) [![Homebrew](https://repology.org/badge/version-only-for-repo/homebrew/ocaml.svg)](https://repology.org/metapackage/ocaml) From 4951a1814f05dadf14848037edf741dcfcbb50dd Mon Sep 17 00:00:00 2001 From: Nathan Fallet Date: Thu, 6 May 2021 09:42:28 +0200 Subject: [PATCH 2/4] Also adding it in `up_and_running.md` --- site/learn/tutorials/up_and_running.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/learn/tutorials/up_and_running.md b/site/learn/tutorials/up_and_running.md index 65e2d26ce..323421764 100644 --- a/site/learn/tutorials/up_and_running.md +++ b/site/learn/tutorials/up_and_running.md @@ -27,7 +27,11 @@ brew install opam port install opam ``` -**For Linux** the preferred way is to use your system's package manager on +If you are a beginner and want an easy installation, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). + +**For Linux** + +The preferred way is to use your system's package manager on Linux (e.g `apt-get install opam` or similar). [Details of all installation methods.](https://opam.ocaml.org/doc/Install.html) From 2f5b1336380d36c13fd2fea699135362a7ad7b6f Mon Sep 17 00:00:00 2001 From: Nathan Fallet Date: Sat, 8 May 2021 20:29:46 +0200 Subject: [PATCH 3/4] Adding it only in 'A first hour with ocaml' --- site/docs/install.fr.md | 4 ---- site/docs/install.md | 4 ---- site/learn/tutorials/a_first_hour_with_ocaml.md | 2 ++ site/learn/tutorials/up_and_running.md | 6 +----- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/site/docs/install.fr.md b/site/docs/install.fr.md index da74efc52..e07459b6d 100644 --- a/site/docs/install.fr.md +++ b/site/docs/install.fr.md @@ -128,10 +128,6 @@ Les paquets d'Arch Linux pour OCaml sont Sur macOS OCaml et/ou OPAM peuvent êtres installés grâce aux systèmes de gestion de paquets tiers. -### Pack tout-en-un (OCaml + éditeur) - -Si vous êtes un débutant et que vous recherchez une installation simple, vous pouvez télécharger [ce pack tout-en-un sur l'App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). Il contient un éditeur côte à côté avec une console interactive, gratuit et [open source](https://github.com/GroupeMINASTE/OCaml-iOS). - ### [Homebrew](http://brew.sh/) [![Homebrew](https://repology.org/badge/version-only-for-repo/homebrew/ocaml.svg)](https://repology.org/metapackage/ocaml) ```bash diff --git a/site/docs/install.md b/site/docs/install.md index 3b1decf1e..b1168fd8f 100644 --- a/site/docs/install.md +++ b/site/docs/install.md @@ -141,10 +141,6 @@ Other Arch Linux packages related to OCaml are On macOS OCaml and/or OPAM can be installed via the existing third-party package systems. -### All-in-one package (OCaml + editor) - -If you are a beginner and want an easy installation, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). - ### [Homebrew](http://brew.sh/) [![Homebrew](https://repology.org/badge/version-only-for-repo/homebrew/ocaml.svg)](https://repology.org/metapackage/ocaml) diff --git a/site/learn/tutorials/a_first_hour_with_ocaml.md b/site/learn/tutorials/a_first_hour_with_ocaml.md index f3da874be..6ced401c5 100644 --- a/site/learn/tutorials/a_first_hour_with_ocaml.md +++ b/site/learn/tutorials/a_first_hour_with_ocaml.md @@ -10,6 +10,8 @@ as described in [Up and Running](up_and_running.html). Alternatively, you may follow almost all of it by running OCaml in your browser using [TryOCaml](http://try.ocamlpro.com), with no installation required. +On macOS/iOS/iPadOS, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). + ## Running OCaml programs To try small OCaml expressions, you can use an interactive top level, or REPL diff --git a/site/learn/tutorials/up_and_running.md b/site/learn/tutorials/up_and_running.md index 323421764..65e2d26ce 100644 --- a/site/learn/tutorials/up_and_running.md +++ b/site/learn/tutorials/up_and_running.md @@ -27,11 +27,7 @@ brew install opam port install opam ``` -If you are a beginner and want an easy installation, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). - -**For Linux** - -The preferred way is to use your system's package manager on +**For Linux** the preferred way is to use your system's package manager on Linux (e.g `apt-get install opam` or similar). [Details of all installation methods.](https://opam.ocaml.org/doc/Install.html) From fdc107414169403bb4f0e8f14993a16cce78608b Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Thu, 17 Jun 2021 10:41:45 +0100 Subject: [PATCH 4/4] Update site/learn/tutorials/a_first_hour_with_ocaml.md --- site/learn/tutorials/a_first_hour_with_ocaml.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/learn/tutorials/a_first_hour_with_ocaml.md b/site/learn/tutorials/a_first_hour_with_ocaml.md index 6ced401c5..89544aa81 100644 --- a/site/learn/tutorials/a_first_hour_with_ocaml.md +++ b/site/learn/tutorials/a_first_hour_with_ocaml.md @@ -10,7 +10,7 @@ as described in [Up and Running](up_and_running.html). Alternatively, you may follow almost all of it by running OCaml in your browser using [TryOCaml](http://try.ocamlpro.com), with no installation required. -On macOS/iOS/iPadOS, you can download [this All-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side by side with an interactive top level, is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). +On macOS/iOS/iPadOS, you can download this [all-in-one package on the App Store](https://apps.apple.com/app/ocaml-learn-code/id1547506826). It contains an editor side-by-side with an interactive top level, and is free and [open source](https://github.com/GroupeMINASTE/OCaml-iOS). ## Running OCaml programs