summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-12-16 22:06:17 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-12-16 22:06:17 +0100
commit8973b17bad1437f2530cc6928a9da228d98f57b7 (patch)
tree34b59eb3a0f7342d0926f8e2b75d7d6972dc88b3
parent03fd730e5f6662be4efbee1a18d56bb459214f63 (diff)
Readme more minor changes
-rw-r--r--README.fr.md12
-rw-r--r--README.md12
2 files changed, 14 insertions, 10 deletions
diff --git a/README.fr.md b/README.fr.md
index 0e17ad8e5..a5d881386 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -47,14 +47,16 @@ FreshRSS n’est fourni avec aucune garantie.
* Recommandés : [JSON](https://secure.php.net/json), [GMP](https://secure.php.net/gmp) (pour accès API sur plateformes < 64 bits), [IDN](https://secure.php.net/intl.idn) (pour les noms de domaines internationalisés), [mbstring](https://secure.php.net/mbstring) (pour le texte Unicode), [iconv](https://secure.php.net/iconv) (pour conversion d’encodages), [ZIP](https://secure.php.net/zip) (pour import/export), [zlib](https://secure.php.net/zlib) (pour les flux compressés)
* MySQL 5.5.3+ (recommandé), ou SQLite 3.7.4+, ou PostgreSQL 9.2+
-# [Installation](https://freshrss.github.io/FreshRSS/fr/users/01_Installation.html)
-## Téléchargement
+# Téléchargement
Voir la [liste des versions](../../releases).
-### À propos des branches
-* Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité.
-* Pour ceux qui veulent bien aider à tester ou développer les dernières fonctionnalités, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras !
+## À propos des branches
+* Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous souhaitez des versions moins fréquentes et stables.
+* Utilisez [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) si vous vouler une publication continue (rolling release) avec les dernières nouveautés, ou bien aider à tester ou développer la future version stable.
+
+
+# [Installation](https://freshrss.github.io/FreshRSS/fr/users/01_Installation.html)
## Installation automatisée
* [![Docker](https://www.docker.com/sites/default/files/horizontal.png)](./Docker/)
diff --git a/README.md b/README.md
index 499dc1df5..f1474ddeb 100644
--- a/README.md
+++ b/README.md
@@ -47,14 +47,16 @@ FreshRSS comes with absolutely no warranty.
* Recommended extensions: [JSON](https://secure.php.net/json), [GMP](https://secure.php.net/gmp) (for API access on 32-bit platforms), [IDN](https://secure.php.net/intl.idn) (for Internationalized Domain Names), [mbstring](https://secure.php.net/mbstring) (for Unicode strings), [iconv](https://secure.php.net/iconv) (for charset conversion), [ZIP](https://secure.php.net/zip) (for import/export), [zlib](https://secure.php.net/zlib) (for compressed feeds)
* MySQL 5.5.3+ (recommended), or SQLite 3.7.4+, or PostgreSQL 9.2+
-# [Installation](https://freshrss.github.io/FreshRSS/en/admins/02_Installation.html)
-## Releases
+# Releases
See the [list of releases](../../releases).
-### About branches
-* Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need stable versions.
-* Use [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) if you want a rolling release with the latest features, and help testing or developing the next stable version.
+## About branches
+* Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need less frequent stable versions.
+* Use [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) if you want a rolling release with the newest features, or help testing or developing the next stable version.
+
+
+# [Installation](https://freshrss.github.io/FreshRSS/en/admins/02_Installation.html)
## Automated install
* [![Docker](https://www.docker.com/sites/default/files/horizontal.png)](./Docker/)