Просмотр исходного кода

Doc git latest (#5148)

#fix https://github.com/FreshRSS/FreshRSS/issues/4949
Alexandre Alapetite 3 лет назад
Родитель
Сommit
4f957dfc4c
2 измененных файлов с 7 добавлено и 6 удалено
  1. 3 2
      README.fr.md
  2. 4 4
      docs/en/admins/07_LinuxUpdate.md

+ 3 - 2
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

+ 4 - 4
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