Reword explanations for edge/latest channels (#9270)

* Reword explanations for edge/latest channels
Highlight the fact that we do not backport bug fixes or security fixes to previous releases.
Simplify also a slightly obsolte MySQL doc to favour SQLite

* Merge i18n: az

* Update Polish translations to specify rolling/versioned releases

Co-authored-by: Inverle <inverle@proton.me>

* Update 05_Release_new_version.md

---------

Co-authored-by: Inverle <inverle@proton.me>

.github/skills/freshrss-git/SKILL.md

@@ -10,6 +10,7 @@ FreshRSS uses a rolling-release approach with a main branch called `:edge`.
 This is the branch to target for most pull requests.
 
 Releases are tracked in a branch called `:latest`.
+Bug fixes and security fixes are not backported to older releases.
 
 ## Check changes made in the current branch
 

Docker/README.md

@@ -36,14 +36,14 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss_data:/var/www/FreshRSS/data \
   -v freshrss_extensions:/var/www/FreshRSS/extensions \
   --name freshrss \
-  freshrss/freshrss
+  freshrss/freshrss:edge
 ```
 
 * Exposing on port 8080
 * With a [server timezone](https://www.php.net/timezones) (default is `UTC`)
 * With an automatic cron job to refresh feeds
 * Saving FreshRSS data in a Docker volume `freshrss_data` and optional extensions in `freshrss_extensions`
-* Using the default image, which is the latest stable release
+* Using the rolling release channel
 
 ### Complete installation
 
@@ -72,10 +72,10 @@ docker exec --user www-data freshrss cli/create-user.php --user freshrss --passw
 
 The [tags](https://hub.docker.com/r/freshrss/freshrss/tags) correspond to FreshRSS branches and versions:
 
-* `:latest` (default) is the [latest stable release](https://github.com/FreshRSS/FreshRSS/releases/latest)
+* `:latest` (default) is the [latest versioned release](https://github.com/FreshRSS/FreshRSS/releases/latest)
 * `:edge` is the rolling release, same than our [git `edge` branch](https://github.com/FreshRSS/FreshRSS/tree/edge)
 * `:x.y.z` tags correspond to [specific FreshRSS releases](https://github.com/FreshRSS/FreshRSS/releases), allowing you to target a precise version for deployment
-* `:x` tags track the latest release within a major version series. For instance, `:1` will update to include any `1.x` releases, but will exclude versions beyond `2.x`
+* `:x` tags track the latest release within a major version series. For instance, `:1` will update to include any `1.x` releases, but will exclude versions beyond `2.x`. Note that bug fixes and security fixes are not backported.
 * `*-alpine` use Linux Alpine as base-image instead of Debian
 * Our Docker images are designed with multi-architecture support, accommodating a variety of Linux platforms including `linux/arm/v7`, `linux/arm64`, and `linux/amd64`.
   * For other platforms, see the [custom build section](#build-custom-docker-image)
@@ -107,12 +107,12 @@ and with newer packages in general (Apache, PHP).
 
 ```sh
 # Rebuild an image (see build section below) or get a new online version:
-docker pull freshrss/freshrss
+docker pull freshrss/freshrss:edge
 # And then
 docker stop freshrss
 docker rename freshrss freshrss_old
 # See the run section above for the full command
-docker run ... --name freshrss freshrss/freshrss
+docker run ... --name freshrss freshrss/freshrss:edge
 # If everything is working, delete the old container
 docker rm freshrss_old
 ```
@@ -124,10 +124,10 @@ which is currently limited to `x64` (Intel, AMD), `arm32v7`, `arm64`.
 
 > ℹ️ If you try to run an image for the wrong platform, you might get an error message like *exec format error*.
 
-Pick `#latest` (stable release) or `#edge` (rolling release) or a specific release number such as `#1.21.0` like:
+Pick `#edge` (rolling release) or `#latest` (versioned release) or a specific release number such as `#1.21.0` like:
 
 ```sh
-docker build --pull --tag freshrss/freshrss:latest -f Docker/Dockerfile-Alpine https://github.com/FreshRSS/FreshRSS.git#latest
+docker build --pull --tag freshrss/freshrss:custom -f Docker/Dockerfile-Alpine https://github.com/FreshRSS/FreshRSS.git#latest
 ```
 
 > ℹ️ See an automated way to do that in our [Docker Compose](#docker-compose) section, leveraging a [git build context](https://docs.docker.com/build/building/context/#git-repositories).
@@ -244,7 +244,7 @@ docker run ...
   -v /your/.htaccess:/var/www/FreshRSS/p/i/.htaccess \
   -v /your/.htpasswd:/var/www/FreshRSS/data/.htpasswd \
   ...
-  --name freshrss freshrss/freshrss
+  --name freshrss freshrss/freshrss:edge
 ```
 
 Example of `/your/.htaccess` referring to `/your/.htpasswd`:
@@ -315,7 +315,7 @@ services:
     image: freshrss/freshrss:edge
     # Optional build section if you want to build the image locally:
     build:
-      # Pick #latest (stable release) or #edge (rolling release) or a specific release like #1.21.0
+      # Pick #edge (rolling release) or #latest (versioned release) or a specific release like #1.21.0
       context: https://github.com/FreshRSS/FreshRSS.git#edge
       dockerfile: Docker/Dockerfile-Alpine
     container_name: freshrss
@@ -615,7 +615,7 @@ Not passing the `CRON_MIN` environment variable – or setting it to empty strin
 ```sh
 docker run ... \
   -e CRON_MIN=13,43 \
-  --name freshrss freshrss/freshrss
+  --name freshrss freshrss/freshrss:edge
 ```
 
 ### Option 2) Cron on the host machine
@@ -644,7 +644,7 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss_extensions:/var/www/FreshRSS/extensions \
   -e CRON_MIN=17,47 \
   --net freshrss-network \
-  --name freshrss_cron freshrss/freshrss \
+  --name freshrss_cron freshrss/freshrss:edge \
   cron -f
 ```
 
@@ -658,7 +658,7 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss_extensions:/var/www/FreshRSS/extensions \
   -v ./freshrss_crontab:/etc/cron.d/freshrss \
   --net freshrss-network \
-  --name freshrss_cron freshrss/freshrss \
+  --name freshrss_cron freshrss/freshrss:edge \
   cron -f
 ```
 
@@ -670,7 +670,7 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss_extensions:/var/www/FreshRSS/extensions \
   -e CRON_MIN=27,57 \
   --net freshrss-network \
-  --name freshrss_cron freshrss/freshrss:alpine \
+  --name freshrss_cron freshrss/freshrss:edge-alpine \
   crond -f -d 6
 ```
 

Docker/freshrss/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     image: freshrss/freshrss:latest
     # # Optional build section if you want to build the image locally:
     # build:
-    #   # Pick #latest (slow releases) or #edge (rolling release) or a specific release like #1.27.1
+    #   # Pick #edge (rolling release) or #latest (versioned release) or a specific release like #1.27.1
     #   context: https://github.com/FreshRSS/FreshRSS.git#latest
     #   dockerfile: Docker/Dockerfile-Alpine
     container_name: freshrss

README.fr.md

@@ -71,9 +71,16 @@ FreshRSS n’est fourni avec aucune garantie.
 
 # [Installation](https://freshrss.github.io/FreshRSS/fr/users/01_Installation.html)
 
-Si vous préférez que votre FreshRSS soit stable, vous devriez télécharger la dernière version. De nouvelles versions sont publiées tous les 2 ou 3 mois. Voir la [liste des versions](https://github.com/FreshRSS/FreshRSS/releases).
+Si vous voulez une publication continue (*rolling release*) avec les dernières nouveautés et sécurité,
+ou bien aider à tester ou développer la future version,
+vous pouvez utiliser [la branche `edge`](https://github.com/FreshRSS/FreshRSS/tree/edge/).
 
-Si vous voulez une publication continue (rolling release) avec les dernières nouveautés, ou bien aider à tester ou développer la future version stable, vous pouvez utiliser [la branche edge](https://github.com/FreshRSS/FreshRSS/tree/edge/).
+Si vous préférez moins de mises à jour, vous pouvez utiliser [la branche `latest`](https://github.com/FreshRSS/FreshRSS/tree/latest/).
+Celle-ci est plus stable mais au prix de moins de sécurité et de plus de bugs connus
+car les corrections ne sont pas rétro-portées sur les anciennes versions.
+De nouvelles versions sont publiées quelques fois par an.
+Voir la [dernière version](https://github.com/FreshRSS/FreshRSS/releases/latest)
+et la [liste des versions](https://github.com/FreshRSS/FreshRSS/releases).
 
 ## Installation automatisée
 
@@ -122,7 +129,7 @@ sudo git clone https://github.com/FreshRSS/FreshRSS.git
 cd FreshRSS
 
 # La branche par défault “edge” est la celle de la publication continue,
-# mais vous pouvez changer de branche pour “latest” si vous préférez les versions stables de FreshRSS
+# mais vous pouvez changer de branche pour “latest” si vous préférez moins de mises à jour
 sudo git checkout latest
 
 # Mettre les droits d’accès pour le serveur Web

README.md

@@ -71,9 +71,16 @@ FreshRSS comes with absolutely no warranty.
 
 # [Installation](https://freshrss.github.io/FreshRSS/en/admins/03_Installation.html)
 
-The latest stable release can be found [on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). New versions are released every two to three months.
-
-If you want a rolling release with the newest features, or want to help testing or developing the next stable version, you can use [the `edge` branch](https://github.com/FreshRSS/FreshRSS/tree/edge/).
+If you want a rolling release with the newest features and security fixes,
+or want to help testing or developing the next release,
+you can use [the `edge` branch](https://github.com/FreshRSS/FreshRSS/tree/edge/).
+
+If you prefer fewer updates, you can use [the `latest` branch](https://github.com/FreshRSS/FreshRSS/tree/latest/).
+It is more stable but at the price of less security and more known bugs,
+as fixes are not backported to older versions.
+New versions are published a few times a year.
+See the [latest release](https://github.com/FreshRSS/FreshRSS/releases/latest)
+and the [list of releases](https://github.com/FreshRSS/FreshRSS/releases).
 
 ## Automated install
 

app/i18n/az/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Buraxılış kanalı',
 			'edge' => 'Davamlı buraxılış (“edge”)',
-			'latest' => 'Stabil buraxılış (“latest”)',
+			'latest' => 'Stabil buraxılış (“latest”)',	// DIRTY
 		),
 		'title' => 'FreshRSS-i yenilə',
 		'viaGit' => 'git və GitHub.com vasitəsilə yeniləmə başladı',

app/i18n/cs/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Kanál pro vydání',
 			'edge' => 'Vydání "Rolling" / Nepřetržitě aktualizované vydání (“edge”)',
-			'latest' => 'Stabilní vydání (“latest”)',
+			'latest' => 'Stabilní vydání (“latest”)',	// DIRTY
 		),
 		'title' => 'Aktualizovat systém',
 		'viaGit' => 'Aktualizace přes git a GitHub.com začala',

app/i18n/de/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Veröffentlichungskanal',
 			'edge' => 'Aktueller Entwicklungsstand (“edge”)',
-			'latest' => 'Stabile Version (“latest”)',
+			'latest' => 'Stabile Version (“latest”)',	// DIRTY
 		),
 		'title' => 'System aktualisieren',
 		'viaGit' => 'Update über git und GitHub.com gestartet',

app/i18n/el/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Κανάλι κυκλοφορίας',
 			'edge' => 'Rolling release («edge»)',
-			'latest' => 'Σταθερή κυκλοφορία («latest»)',
+			'latest' => 'Σταθερή κυκλοφορία («latest»)',	// DIRTY
 		),
 		'title' => 'Ενημέρωση συστήματος',
 		'viaGit' => 'Ξεκίνησε η ενημέρωση μέσω git και GitHub.com',

app/i18n/en-US/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release channel',	// IGNORE
 			'edge' => 'Rolling release (“edge”)',	// IGNORE
-			'latest' => 'Stable release (“latest”)',	// IGNORE
+			'latest' => 'Versioned release (“latest”)',	// IGNORE
 		),
 		'title' => 'Update system',	// IGNORE
 		'viaGit' => 'Update via git and GitHub.com started',	// IGNORE

app/i18n/en/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release channel',
 			'edge' => 'Rolling release (“edge”)',
-			'latest' => 'Stable release (“latest”)',
+			'latest' => 'Versioned release (“latest”)',
 		),
 		'title' => 'Update FreshRSS',
 		'viaGit' => 'Update via git and GitHub.com started',

app/i18n/es/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Canal de publicación',
 			'edge' => 'Versión de pruebas (“edge”)',
-			'latest' => 'Versión estable (“latest”)',
+			'latest' => 'Versión estable (“latest”)',	// DIRTY
 		),
 		'title' => 'Actualizar sistema',
 		'viaGit' => 'Actualización comenzada vía git y GitHub',

app/i18n/fa/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => ' کانال انتشار',
 			'edge' => 'انتشار پیوسته («edge»)',
-			'latest' => 'انتشار پایدار («latest»)',
+			'latest' => 'انتشار پایدار («latest»)',	// DIRTY
 		),
 		'title' => 'به‌روزرسانی FreshRSS',
 		'viaGit' => 'به‌روزرسانی از طریق git و GitHub.com شروع شد',

app/i18n/fi/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Julkaisukanava',
 			'edge' => 'Uusin versio (“edge”)',
-			'latest' => 'Vakaa versio (“latest”)',
+			'latest' => 'Vakaa versio (“latest”)',	// DIRTY
 		),
 		'title' => 'Päivitä FreshRSS',
 		'viaGit' => 'Päivitys gitin ja GitHub.comin avulla on aloitettu',

app/i18n/fr/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Canal de publication',
 			'edge' => 'Publication continue (“edge”)',
-			'latest' => 'Publication stable (“latest”)',
+			'latest' => 'Publication versionnée (“latest”)',
 		),
 		'title' => 'Système de mise à jour',
 		'viaGit' => 'Mise à jour via git et GitHub.com démarrée',

app/i18n/he/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release channel',	// TODO
 			'edge' => 'Rolling release (“edge”)',	// TODO
-			'latest' => 'Stable release (“latest”)',	// TODO
+			'latest' => 'Versioned release (“latest”)',	// TODO
 		),
 		'title' => 'מערכת העדכון',
 		'viaGit' => 'Update via git and GitHub.com started',	// TODO

app/i18n/hu/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release channel',	// IGNORE
 			'edge' => 'Rolling release (“edge”)',	// IGNORE
-			'latest' => 'Stable release (“latest”)',	// IGNORE
+			'latest' => 'Versioned release (“latest”)',	// TODO
 		),
 		'title' => 'FreshRSS frissítése',
 		'viaGit' => 'Frissítés a git és GitHub.com-on keresztül elindult',

app/i18n/id/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Kanal rilis',
 			'edge' => 'Rilis Baru (“edge”)',
-			'latest' => 'Rilis Stabil (“latest”)',
+			'latest' => 'Rilis Stabil (“latest”)',	// DIRTY
 		),
 		'title' => 'Pembaruan FreshRSS',
 		'viaGit' => 'Pembaruan lewat git dan Github.com dimulai',

app/i18n/it/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Canale di rilascio',
 			'edge' => 'Rilascio continuo (“edge”)',
-			'latest' => 'Stabile (“latest”)',
+			'latest' => 'Stabile (“latest”)',	// DIRTY
 		),
 		'title' => 'Aggiorna sistema',
 		'viaGit' => 'Aggiornamento tramite git e GitHub.com avviato',

app/i18n/ja/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'リリースチャンネル',
 			'edge' => 'ローリングリリース（edge）',
-			'latest' => '安定版リリース（latest）',
+			'latest' => '安定版リリース（latest）',	// DIRTY
 		),
 		'title' => 'アップデートシステム',
 		'viaGit' => 'gitおよびGitHub.com経由でアップデートを開始しました。',

app/i18n/ko/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => '릴리즈 채널',
 			'edge' => '롤링 릴리즈 (“edge”)',
-			'latest' => '안정 릴리즈 (“latest”)',
+			'latest' => '안정 릴리즈 (“latest”)',	// DIRTY
 		),
 		'title' => '업데이트',
 		'viaGit' => 'Git 및 GitHub.com을 통한 업데이트 시작 됨',

app/i18n/lt/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Leidimų kanalas',
 			'edge' => 'Nuolatinis leidimas („edge“)',
-			'latest' => 'Stabilus leidimas („latest“)',
+			'latest' => 'Stabilus leidimas („latest“)',	// DIRTY
 		),
 		'title' => 'Atnaujinti FreshRSS',
 		'viaGit' => 'Pradėtas atnaujinimas per „git“ ir „GitHub.com“',

app/i18n/lv/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Izlaiduma kanāls',
 			'edge' => 'Ritošā atbrīvošana (“edge”)',
-			'latest' => 'Stabila atbrīvošana (“latest”)',
+			'latest' => 'Stabila atbrīvošana (“latest”)',	// DIRTY
 		),
 		'title' => 'Atjaunināt sistēmu',
 		'viaGit' => 'Atjaunināt, izmantojot git un GitHub.com sākts',

app/i18n/nl/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release-kanaal',
 			'edge' => 'Rollende release (“edge”)',
-			'latest' => 'Stabiele release (“latest”)',
+			'latest' => 'Stabiele release (“latest”)',	// DIRTY
 		),
 		'title' => 'Vernieuw systeem',
 		'viaGit' => 'Update via git and GitHub.com gestart',

app/i18n/oc/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Release channel',	// TODO
 			'edge' => 'Rolling release (“edge”)',	// TODO
-			'latest' => 'Stable release (“latest”)',	// TODO
+			'latest' => 'Versioned release (“latest”)',	// TODO
 		),
 		'title' => 'Sistèma de mesa a jorn',
 		'viaGit' => 'Update via git and GitHub.com started',	// TODO

app/i18n/pl/admin.php

@@ -136,8 +136,8 @@ return array(
 		'none' => 'Brak nowych aktualizacji',
 		'releaseChannel' => array(
 			'_' => 'Kanał aktualizacji',
-			'edge' => 'Wersja rozwojowa (“edge”)',
-			'latest' => 'Wersja stabilna (“latest”)',
+			'edge' => 'Wydanie ciągłe (“edge”)',
+			'latest' => 'Wydanie wersjonowane (“latest”)',
 		),
 		'title' => 'Aktualizacja',
 		'viaGit' => 'Rozpoczęto aktualizację gitem do najnowszej wersji z GitHuba',

app/i18n/pt-BR/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Canal de Release',
 			'edge' => 'Release contínua (“edge”)',
-			'latest' => 'Release estável (“latest”)',
+			'latest' => 'Release estável (“latest”)',	// DIRTY
 		),
 		'title' => 'Sistema de atualização',
 		'viaGit' => 'Atualização via git e GitHub.com iniciada',

app/i18n/pt-PT/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Canal de Release',
 			'edge' => 'Release contínua (“edge”)',
-			'latest' => 'Release estável (“latest”)',
+			'latest' => 'Release estável (“latest”)',	// DIRTY
 		),
 		'title' => 'Sistema de atualização',
 		'viaGit' => 'Atualização via git e GitHub.com iniciada',

app/i18n/ru/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Релизный канал',
 			'edge' => 'Плавающий релиз (“edge”)',
-			'latest' => 'Стабильный релиз (“latest”)',
+			'latest' => 'Стабильный релиз (“latest”)',	// DIRTY
 		),
 		'title' => 'Обновить систему',
 		'viaGit' => 'Обновление с помощью git и GitHub.com запущено',

app/i18n/sk/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Kanál verzií',
 			'edge' => 'Vývojárska verzia (“edge”)',
-			'latest' => 'Stabilná verzia (“latest”)',
+			'latest' => 'Stabilná verzia (“latest”)',	// DIRTY
 		),
 		'title' => 'Aktualizácia systému',
 		'viaGit' => 'Začala sa aktualizácia prostredníctvom git a GitHub.com',

app/i18n/tr/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Yayın kanalı',
 			'edge' => 'Sürekli yayın (“edge”)',
-			'latest' => 'Kararlı yayın (“latest”)',
+			'latest' => 'Kararlı yayın (“latest”)',	// DIRTY
 		),
 		'title' => 'FreshRSS’yi Güncelle',
 		'viaGit' => 'Git ve GitHub.com üzerinden güncelleme başlatıldı',

app/i18n/uk/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => 'Канал випусків',
 			'edge' => 'Крайній випуск («edge»)',
-			'latest' => 'Стабільний випуск («latest»)',
+			'latest' => 'Стабільний випуск («latest»)',	// DIRTY
 		),
 		'title' => 'Оновити FreshRSS',
 		'viaGit' => 'Розпочато оновлення за допомогою git і GitHub.com',

app/i18n/zh-CN/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => '发布通道',
 			'edge' => '滚动发布 (“edge”)',
-			'latest' => '稳定版本 (“latest”)',
+			'latest' => '稳定版本 (“latest”)',	// DIRTY
 		),
 		'title' => '更新系统',
 		'viaGit' => '开始通过 git 和 GitHub.com 更新',

app/i18n/zh-TW/admin.php

@@ -137,7 +137,7 @@ return array(
 		'releaseChannel' => array(
 			'_' => '發行方式',
 			'edge' => '滾動發行 (“edge”)',
-			'latest' => '穩定發行 (“latest”)',
+			'latest' => '穩定發行 (“latest”)',	// DIRTY
 		),
 		'title' => '更新 FreshRSS',
 		'viaGit' => '透過 git 和 GitHub.com 開始更新',

docs/en/admins/01_Index.md

@@ -6,7 +6,7 @@ Learn how to install, update, and backup FreshRSS, as well as how to use the com
 
 1. [Prerequisites](02_Prerequisites.md): What you’ll need to run FreshRSS
 2. [General installation instructions](03_Installation.md) for FreshRSS
-3. [Update your installation](04_Updating.md) to the latest stable or development version
+3. [Update your installation](04_Updating.md) to the latest rolling release or versioned release
 4. [Logging and error messages](logs_and_errors.md) in case of any troubles
 
 ## Tutorials and Examples

docs/en/admins/02_Prerequisites.md

@@ -14,24 +14,27 @@ You need to verify that your server can run FreshRSS before installing it. If yo
 
 ## Getting the appropriate version of FreshRSS
 
-FreshRSS has two different releases. It is better if you spend some time to understand the purpose of each release.
+FreshRSS has two different release channels:
 
-## Stable release
+## Rolling release
 
-[Download](https://github.com/FreshRSS/FreshRSS/releases/latest)
+If you want a rolling release with the newest features and security fixes,
+or want to help testing or developing the next release,
+you can use [the `edge` branch](https://github.com/FreshRSS/FreshRSS/tree/edge/).
 
-This version is really stable, tested thoroughly, and you should not face any major bugs.
+In case of bug on this branch, they are quickly resolved, since this branch is actively used.
 
-Stable releases are not released on a set schedule. Rather, they are released whenever we consider that our goal for new features is reached, and the software is stable.
+Branch activity can be followed for instance via [the branch RSS feed](https://github.com/FreshRSS/FreshRSS/commits/edge.atom).
 
-It could happen that we make two releases in a short span of time if we have a really good coding pace. In reality, we are all working on the project in our spare time, so a new release usually occurs every few months.
+Docker releases are available for this branch ; and updating via git or ZIP is also available, both manually and through the Web interface.
 
-## Development version
+## Versioned release
 
-[Download](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/edge.zip)
+If you prefer fewer updates, you can use [the `latest` branch](https://github.com/FreshRSS/FreshRSS/tree/latest/).
+It is more stable but at the price of less security and more known bugs,
+as fixes are not backported to older versions.
+New versions are published a few times a year.
+See the [latest release](https://github.com/FreshRSS/FreshRSS/releases/latest)
+and the [list of releases](https://github.com/FreshRSS/FreshRSS/releases).
 
-As its name suggests, the development version is the working codebase, intended for developers. **This release may be unstable!**
-
-If you want to keep track of the most recent enhancements or help the developers with bug reports, this is the branch for you. If you use this version, please keep in mind that you need to follow the branch activity on GitHub (via [the branch RSS feed](https://github.com/FreshRSS/FreshRSS/commits/edge.atom), for instance), and manually pull new commits.
-
-Some say that the main developers use this branch on a daily basis without problem. They may know what they are doing…
+Versioned releases are not released on a set schedule. Rather, they are released whenever we consider that our goal for new features is reached.

docs/en/admins/04_Updating.md

@@ -19,7 +19,8 @@ See the [Backup page](05_Backup.md) for the full list and procedures.
 
 Web updates require group write permissions on the FreshRSS source folder.
 
-Log in as admin, open the Settings menu (top right), choose Administration, then Update, and press "Check for new updates". The page is also reachable at `http://<your_server>/i/?c=update`. This will check for and apply a new stable version, if available.
+Log in as admin, open the Settings menu (top right), choose Administration, then Update, and press “Check for new updates”.
+The page is also reachable at `http://<your_server>/i/?c=update`. This will check for and apply a new version, if available.
 
 ## Using git
 
@@ -31,7 +32,7 @@ Use git to update, change branches, or switch to a specific version. From your F
 git fetch --all
 git reset --hard          # discards local changes to tracked files
 git clean -f -d           # removes untracked files (custom themes, extensions, local edits)
-git checkout edge         # or `latest` for stable, or a tag like `1.27.1` for a specific version
+git checkout edge         # or `latest` for versioned releases, or a tag like `1.27.1` for a specific version
 git pull --ff-only        # skip for a tag checkout
 ```
 
@@ -43,7 +44,7 @@ See [Updating on Linux](07_LinuxUpdate.md#using-git) for the same flow with `sud
 
 Updating from a zip archive works for any source installation.
 
-1. Download the latest [stable (slow)](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/latest.zip) or [rolling](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/edge.zip) release and extract it (for a specific version, use the [releases page](https://github.com/FreshRSS/FreshRSS/releases)). The archive contains a top-level `FreshRSS-X.Y.Z/` folder.
+1. Download the latest [rolling release](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/edge.zip) or [versioned release (slow)](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/latest.zip) and extract it (for a specific version, use the [releases page](https://github.com/FreshRSS/FreshRSS/releases)). The archive contains a top-level `FreshRSS-X.Y.Z/` folder.
 2. Copy the extracted contents into your FreshRSS directory, overwriting existing files. Your user data, extensions, and custom themes are preserved.
 3. Re-apply file ownership and permissions.
 

docs/en/admins/06_LinuxInstall.md

@@ -1,10 +1,11 @@
 # Installation on Debian/Ubuntu
 
-This tutorial will give you step-by-step commands to install the latest stable release of FreshRSS with Apache and MySQL using git. It’s always recommended that you [backup your installation](05_Backup.md) before updating
+This tutorial will give you step-by-step commands to install FreshRSS with Apache using git.
+It’s always recommended that you [backup your installation](05_Backup.md) before updating
 
 Please note: Commands need to be run as an administrator; either perform the following from a sudo shell (`sudo -s`) or use an administrator account.
 
-## Part 1: Setting up and configuring the LAMP stack
+## Part 1: Setting up and configuring the Web server
 
 Begin by installing Apache, and enable Apache modules needed for FreshRSS
 
@@ -31,32 +32,11 @@ Install the PHP module for Apache
 apt install libapache2-mod-php
 ```
 
-Next, we’ll need to install and configure MySQL. Install MySQL components like so:
+This tutorial uses [SQLite](DatabaseConfig.md), which needs no database server:
+the `php-sqlite3` module installed above is all that is required.
+Each user’s data is stored in a single file, `data/users/_user_/db.sqlite`, created during the installation.
 
-```sh
-sudo apt install mysql-server mysql-client php-mysql
-```
-
-MySQL must now be started:
-
-```sh
-service mysql-server start
-```
-
-We’ll need to configure MySQL.
-**Note:** As you’ve just installed mysql, there will be no root password; simply hit enter on the first step
-
-```sh
-mysql_secure_installation
-```
-
-And restart it
-
-```sh
-service mysql-server restart
-```
-
-Finally, restart MySQL and the web server
+Finally, restart the web server
 
 ```sh
 service apache2 restart
@@ -100,32 +80,9 @@ Finally, symlink the public folder to your FreshRSS directory
 [ ! -e "/var/www/html/FreshRSS" ] && ln -s /var/www/FreshRSS/p /var/www/html/FreshRSS || echo "/var/www/html/FreshRSS already exists"
 ```
 
-## Part 3: Creating a Database for FreshRSS
-
-Start a MySQL session. running this command will ask you for the MySQL password you set earlier, and then put you into a prompt that should look like `MariaDB [(none)]>`
-
-```sh
-mysql -u root -p
-```
-
-From the MySQL prompt (`MariaDB [(none)]>`), run the following commands, substituting `<username>`, `<password>`, and `<database_name>` for real values.
-
-```sql
-CREATE USER '<username>'@'localhost' IDENTIFIED BY '<password>';
-CREATE DATABASE `databaseName`;
-GRANT ALL privileges ON `databaseName`.* TO 'userName'@localhost;
-FLUSH PRIVILEGES;
-QUIT;
-```
-
-A brief explanation of the previous command block:
-
-* You first create a database user for FreshRSS to use.
-* Then you create a database for FreshRSS to store data in.
-* You grant permissions for the user you created to read, write, and modify the database.
-* Flushing privileges reloads the permissions, which makes the previous command take effect.
+## Part 3: Finishing the Installation
 
-## Part 4: Finishing the Installation
+No database setup is needed with SQLite: it is created automatically during the installation.
 
 You can now finish the installation from a web browser by navigating to to `http://<your_server>/` and following the graphical prompts.
 Alternatively, you can finish the installation using [the cli](https://github.com/FreshRSS/FreshRSS/tree/edge/cli)

docs/en/admins/07_LinuxUpdate.md

@@ -52,7 +52,7 @@ If your local user doesn’t have write access to the FreshRSS folder, use a sud
 	git pull --ff-only
 	```
 
-	> ℹ️ Use `edge` for the rolling release or `latest` for the latest stable release.
+	> ℹ️ Use `edge` for the rolling release or `latest` for the latest versioned release.
 
 5. (optional) Make sure you use the correct version
 	```sh

docs/en/admins/08_FeedUpdates.md

@@ -19,7 +19,7 @@ Not passing the `CRON_MIN` environment variable – or setting it to empty strin
 ```sh
 docker run ... \
   -e CRON_MIN=13,43 \
-  --name freshrss freshrss/freshrss
+  --name freshrss freshrss/freshrss:edge
 ```
 
 ## Cron as a trigger

docs/en/admins/18_Pocket-ID.md

@@ -29,7 +29,7 @@ This is an example docker-compose file for FreshRSS with OIDC enabled.
 ```yaml
 services:
   freshrss:
-    image: freshrss/freshrss
+    image: freshrss/freshrss:edge
     container_name: freshrss
     ports:
       - 8080:80

docs/en/developers/05_Release_new_version.md

@@ -54,11 +54,11 @@ Here’s an example of a `versions.php` file:
 ```php
 <?php
 return [
-	// STABLE
+	// Versioned releases
 	'0.8.0' => '1.0.0',
 	'0.8.1' => '1.0.0',
 	'1.0.0' => '1.0.1',  // doesn’t exist (yet)
-	// DEV
+	// Rolling releases
 	'1.1.2-dev' => 'dev',
 	'1.1.3-dev' => 'dev',
 	'1.1.4-dev' => 'dev',
@@ -69,11 +69,11 @@ And here’s how this table works:
 
 * on the left you can find the N version, on the right the N+1 version;
 * the `x.y.z.z-dev` versions are **all** updated to `edge`;
-* stable versions are updated to stable versions;
+* versioned releases are updated to versioned releases;
 * it’s possible to skip several versions at once, provided that the update scripts support it;
 * it’s advisable to indicate the correspondence of the current version to its potential future version by specifying that this version does not yet exist. As long as the corresponding script does not exist, nothing will happen.
 
-It’s**very strongly** recommended to keep this file organized according to version numbers by separating stable and dev versions.
+It’s strongly recommended to keep this file organized according to version numbers by separating versioned and dev versions.
 
 ## Deployment
 
@@ -93,11 +93,9 @@ Two services need to be updated immediately after the update.
 When everything’s working, it’s time to announce the release to the world!
 
 * on GitHub by creating[a new release](https://github.com/FreshRSS/FreshRSS/releases/new)
-* on the freshrss.org blog, at least for stable versions (write the article on[FreshRSS/freshrss.org](https://github.com/FreshRSS/freshrss.org))
-* on Twitter ([@FreshRSS](https://twitter.com/FreshRSS) account)
-* and on <mailing@freshrss.org>
+* on <https://framapiaf.org/@freshrss>
 
-## Starting the next development version
+## Starting the next version
 
 ```console
 $ git checkout edge
@@ -108,4 +106,4 @@ $ vim CHANGELOG.md
 $ git add CHANGELOG.md && git commit && git push
 ```
 
-Also remember to update update.freshrss.org so that it takes the current development version into account.
+Also remember to update update.freshrss.org so that it takes the current rolling release into account.

docs/fr/developers/05_Release_new_version.md

@@ -84,11 +84,11 @@ Voici un exemple de fichier `versions.php` :
 ```php
 <?php
 return [
-	// STABLE
+	// Versioned releases
 	'0.8.0' => '1.0.0',
 	'0.8.1' => '1.0.0',
 	'1.0.0' => '1.0.1',  // doesn’t exist (yet)
-	// DEV
+	// Rolling releases
 	'1.1.2-dev' => 'dev',
 	'1.1.3-dev' => 'dev',
 	'1.1.4-dev' => 'dev',
@@ -99,7 +99,7 @@ Et voici comment fonctionne cette table :
 
 * à gauche se trouve la version N, à droite la version N+1 ;
 * les versions `x.y.z-dev` sont **toutes** mises à jour vers `edge` ;
-* les versions stables sont mises à jour vers des versions stables ;
+* les publications versionnées sont mises à jour vers des publications versionnées ;
 * il est possible de sauter plusieurs versions d’un coup à condition que les
 	scripts de mise à jour le prennent en charge ;
 * il est conseillé d’indiquer la correspondance de la version courante vers
@@ -107,8 +107,8 @@ Et voici comment fonctionne cette table :
 	encore. Tant que le script correspondant n’existera pas, rien ne se
 	passera.
 
-Il est **très fortement** indiqué de garder ce fichier rangé selon les
-numéros de versions en séparant les versions stables et de dev.
+Il est fortement indiqué de garder ce fichier rangé selon les
+numéros de versions en séparant les publications versionnées et celles de dev.
 
 ## Déploiement
 
@@ -135,13 +135,9 @@ Lorsque tout fonctionne, il est temps d’annoncer la sortie au monde entier !
 
 * sur GitHub en créant [une nouvelle
 	release](https://github.com/FreshRSS/FreshRSS/releases/new) ;
-* sur le blog de freshrss.org au minimum pour les versions stables (écrire
-	l’article sur
-	[FreshRSS/freshrss.org](https://github.com/FreshRSS/freshrss.org)).
-* sur Twitter (compte [@FreshRSS](https://twitter.com/FreshRSS)) ;
-* et sur <mailing@freshrss.org> ;
+* sur <https://framapiaf.org/@freshrss> ;
 
-## Lancer la prochaine version de développement
+## Lancer la prochaine version
 
 ```console
 $ git checkout edge

docs/fr/users/01_Installation.md

@@ -14,19 +14,22 @@ Il est toutefois de votre responsabilité de vérifier que votre hébergement pe
 
 ## Choisir la bonne version de FreshRSS
 
-FreshRSS possède deux versions différentes (nous parlons de branches) qui sortent à des fréquences plus ou moins rapides. Aussi prenez le temps de comprendre à quoi correspond chacune de ces versions.
+FreshRSS possède deux canaux de distributions (ou branches) qui sortent à des fréquences plus ou moins rapides:
 
-### La version stable
+### Canal de publication continue
 
-[Téléchargement](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/latest.zip)
+Si vous voulez une publication continue (*rolling release*) avec les dernières nouveautés et sécurité,
+ou bien aider à tester ou développer la future version,
+vous pouvez utiliser [la branche `edge`](https://github.com/FreshRSS/FreshRSS/tree/edge/).
 
-Cette version sort lorsqu’on considère qu’on a répondu à nos objectifs en terme de nouvelles fonctionnalités. Deux versions peuvent ainsi sortir de façon très rapprochée si les développeurs travaillent bien. En pratique, comme nous nous fixons de nombreux objectifs et que nous travaillons sur notre temps libre, les versions sont souvent assez espacées (plusieurs mois). Son avantage est que le code est particulièrement stable et vous ne devriez pas faire face à de méchants bugs.
+### Canal de publication versionnée
 
-### La version de développement
-
-[Téléchargement](https://github.com/FreshRSS/FreshRSS/archive/refs/heads/edge.zip)
-
-Comme son nom l’indique, il s’agit de la version sur laquelle les développeurs travaillent. **Elle est donc instable !** Si vous souhaitez recevoir les améliorations au jour le jour, vous pouvez l’utiliser, mais attention à bien suivre les évolutions sur GitHub (via [le flux RSS de la branche](https://github.com/FreshRSS/FreshRSS/commits/edge.atom) par exemple). On raconte que les développeurs principaux l’utilisent quotidiennement sans avoir de soucis. Sans doute savent-ils ce qu’ils font…
+Si vous préférez moins de mises à jour, vous pouvez utiliser [la branche `latest`](https://github.com/FreshRSS/FreshRSS/tree/latest/).
+Celle-ci est plus stable mais au prix de moins de sécurité et de plus de bugs connus
+car les corrections ne sont pas rétro-portées sur les anciennes versions.
+De nouvelles versions sont publiées quelques fois par an.
+Voir la [dernière version](https://github.com/FreshRSS/FreshRSS/releases/latest)
+et la [liste des versions](https://github.com/FreshRSS/FreshRSS/releases).
 
 ## Installation sur Apache
 

docs/i18n/freshrss.fr.po

@@ -2967,8 +2967,8 @@ msgstr "Voici un exemple de fichier `versions.php` :"
 #, no-wrap
 msgid ""
 "<?php\n"
-"return array(\n"
-"\t// STABLE\n"
+"return [\n"
+"\t// Releases\n"
 "\t'0.8.0' => '1.0.0',\n"
 "\t'0.8.1' => '1.0.0',\n"
 "\t'1.0.0' => '1.0.1',  // doesn’t exist (yet)\n"
@@ -2976,19 +2976,19 @@ msgid ""
 "\t'1.1.2-dev' => 'dev',\n"
 "\t'1.1.3-dev' => 'dev',\n"
 "\t'1.1.4-dev' => 'dev',\n"
-");\n"
+"];\n"
 msgstr ""
 "<?php\n"
-"return array(\n"
-"\t// STABLE\n"
+"return [\n"
+"\t// Releases\n"
 "\t'0.8.0' => '1.0.0',\n"
 "\t'0.8.1' => '1.0.0',\n"
-"\t'1.0.0' => '1.0.1',  // doesn’t exist (yet)\n"
+"\t'1.0.0' => '1.0.1',  // n’existe pas (encore)\n"
 "\t// DEV\n"
 "\t'1.1.2-dev' => 'dev',\n"
 "\t'1.1.3-dev' => 'dev',\n"
 "\t'1.1.4-dev' => 'dev',\n"
-");\n"
+"];\n"
 
 #. type: Plain text
 #: en/./developers/05_Release_new_version.md:69
@@ -3007,8 +3007,8 @@ msgstr "les versions `x.y.z-dev` sont **toutes** mises à jour vers `edge` ;"
 
 #. type: Bullet: '* '
 #: en/./developers/05_Release_new_version.md:75
-msgid "stable versions are updated to stable versions;"
-msgstr "les versions stables sont mises à jour vers des versions stables ;"
+msgid "versioned releases are updated to versioned releases;"
+msgstr "les publications versionnées sont mises à jour vers des publications versionnées ;"
 
 #. type: Bullet: '* '
 #: en/./developers/05_Release_new_version.md:75
@@ -3032,16 +3032,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/./developers/05_Release_new_version.md:77
-#, fuzzy
-#| msgid ""
-#| "It’s **very strongly** recommended to keep this file organized according "
-#| "to version numbers by separating stable and dev versions."
 msgid ""
 "It’s**very strongly** recommended to keep this file organized according to "
-"version numbers by separating stable and dev versions."
+"version numbers by separating versioned and dev versions."
 msgstr ""
 "Il est **très fortement** indiqué de garder ce fichier rangé selon les "
-"numéros de versions en séparant les versions stables et de dev."
+"numéros de versions en séparant les publications versionnées et celles de "
+"dev."
 
 #. type: Title ##
 #: en/./developers/05_Release_new_version.md:78
@@ -3119,29 +3116,14 @@ msgstr ""
 
 #. type: Bullet: '* '
 #: en/./developers/05_Release_new_version.md:99
-msgid ""
-"on the freshrss.org blog, at least for stable versions (write the article "
-"on[FreshRSS/freshrss.org](https://github.com/FreshRSS/freshrss.org))"
-msgstr ""
-"sur le blog de freshrss.org au minimum pour les versions stables (écrire "
-"l’article sur [FreshRSS/freshrss.org](https://github.com/FreshRSS/freshrss."
-"org))."
-
-#. type: Bullet: '* '
-#: en/./developers/05_Release_new_version.md:99
-msgid "on Twitter ([@FreshRSS](https://twitter.com/FreshRSS) account)"
-msgstr "sur Twitter (compte [@FreshRSS](https://twitter.com/FreshRSS)) ;"
-
-#. type: Bullet: '* '
-#: en/./developers/05_Release_new_version.md:99
-msgid "and on mailing@freshrss.org"
-msgstr "et sur mailing@freshrss.org ;"
+msgid "on <https://framapiaf.org/@freshrss>"
+msgstr "sur <https://framapiaf.org/@freshrss> ;"
 
 #. type: Title ##
 #: en/./developers/05_Release_new_version.md:100
 #, no-wrap
-msgid "Starting the next development version"
-msgstr "Lancer la prochaine version de développement"
+msgid "Starting the next version"
+msgstr "Lancer la prochaine version"
 
 #. type: Fenced code block (console)
 #: en/./developers/05_Release_new_version.md:102
@@ -3165,10 +3147,10 @@ msgstr ""
 #: en/./developers/05_Release_new_version.md:111
 msgid ""
 "Also remember to update update.freshrss.org so that it takes the current "
-"development version into account."
+"rolling release into account."
 msgstr ""
 "Pensez aussi à mettre à jour update.freshrss.org pour qu’il prenne en compte "
-"la version de développement actuelle."
+"la publication continue actuelle."
 
 #. type: Title #
 #: en/./developers/06_Fever_API.md:1

docs/i18n/templates/freshrss.pot

@@ -2882,8 +2882,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<?php\n"
-"return array(\n"
-"\t// STABLE\n"
+"return [\n"
+"\t// Releases\n"
 "\t'0.8.0' => '1.0.0',\n"
 "\t'0.8.1' => '1.0.0',\n"
 "\t'1.0.0' => '1.0.1',  // doesn’t exist (yet)\n"
@@ -2891,7 +2891,7 @@ msgid ""
 "\t'1.1.2-dev' => 'dev',\n"
 "\t'1.1.3-dev' => 'dev',\n"
 "\t'1.1.4-dev' => 'dev',\n"
-");\n"
+"];\n"
 msgstr ""
 
 #. type: Plain text
@@ -2915,7 +2915,7 @@ msgstr ""
 #. type: Bullet: '* '
 #: en/./developers/05_Release_new_version.md:75
 #, markdown-text
-msgid "stable versions are updated to stable versions;"
+msgid "versioned releases are updated to versioned releases;"
 msgstr ""
 
 #. type: Bullet: '* '
@@ -2941,7 +2941,7 @@ msgstr ""
 #, markdown-text
 msgid ""
 "It’s**very strongly** recommended to keep this file organized according to "
-"version numbers by separating stable and dev versions."
+"version numbers by separating versioned and dev versions."
 msgstr ""
 
 #. type: Title ##
@@ -3015,27 +3015,13 @@ msgstr ""
 #. type: Bullet: '* '
 #: en/./developers/05_Release_new_version.md:99
 #, markdown-text
-msgid ""
-"on the freshrss.org blog, at least for stable versions (write the article "
-"on[FreshRSS/freshrss.org](https://github.com/FreshRSS/freshrss.org))"
-msgstr ""
-
-#. type: Bullet: '* '
-#: en/./developers/05_Release_new_version.md:99
-#, markdown-text
-msgid "on Twitter ([@FreshRSS](https://twitter.com/FreshRSS) account)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: en/./developers/05_Release_new_version.md:99
-#, markdown-text
-msgid "and on mailing@freshrss.org"
+msgid "on <https://framapiaf.org/@freshrss>"
 msgstr ""
 
 #. type: Title ##
 #: en/./developers/05_Release_new_version.md:100
 #, markdown-text, no-wrap
-msgid "Starting the next development version"
+msgid "Starting the next version"
 msgstr ""
 
 #. type: Fenced code block (console)
@@ -3055,7 +3041,7 @@ msgstr ""
 #, markdown-text
 msgid ""
 "Also remember to update update.freshrss.org so that it takes the current "
-"development version into account."
+"rolling release into account."
 msgstr ""
 
 #. type: Title #