diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-02-28 08:11:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-02-28 08:11:27 +0100 |
| commit | 4f957dfc4c38c418e5b46a2dc8d34a9bdabb31db (patch) | |
| tree | 48410fe7f9bd7806df11aafe678db53b93c4e6f8 | |
| parent | 21f342af2cd1df41373b70b51a8790548171e843 (diff) | |
Doc git latest (#5148)
#fix https://github.com/FreshRSS/FreshRSS/issues/4949
| -rw-r--r-- | README.fr.md | 5 | ||||
| -rw-r--r-- | docs/en/admins/07_LinuxUpdate.md | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/README.fr.md b/README.fr.md index 221385ab5..559a57745 100644 --- a/README.fr.md +++ b/README.fr.md @@ -109,8 +109,9 @@ sudo apt-get install git sudo git clone https://github.com/FreshRSS/FreshRSS.git cd FreshRSS -# Si vous souhaitez utiliser la dernière version stable de FreshRSS -sudo git checkout $(git describe --tags --abbrev=0) +# 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 +sudo git checkout latest # Mettre les droits d’accès pour le serveur Web sudo cli/access-permissions.sh diff --git a/docs/en/admins/07_LinuxUpdate.md b/docs/en/admins/07_LinuxUpdate.md index 27e8ef451..47b84e5ef 100644 --- a/docs/en/admins/07_LinuxUpdate.md +++ b/docs/en/admins/07_LinuxUpdate.md @@ -49,18 +49,18 @@ If your local user doesn’t have write access to the FreshRSS folder, use a sud 4. Update FreshRSS ```sh git checkout edge - git pull - git checkout $(git describe --tags --abbrev=0) + git pull --ff-only ``` - Note: If you want to use the rolling release, the last command is optional. + > ℹ️ Use `edge` for the rolling release or `latest` for the latest stable release. 5. (optional) Make sure you use the correct version ```sh git status ``` - The command should tell you the tag that you’re using. It must be the same as the one associated with [the latest release on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). If you use the rolling release, it should tell you that your `edge` branch is up to date with `origin`. + The command should tell you the branch that you’re using. It must be the same as the one associated with [the latest release on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). + If you use the rolling release, it should tell you that your `edge` branch is up to date with `origin`. 6. Re-set correct permissions so that your web server can access the files ```sh |