Merge branch 'master' into patch-1

This commit is contained in:
Alexandre Aubin 2021-04-19 19:51:31 +02:00 committed by GitHub
commit 107ee7ab49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions

View file

@ -120,7 +120,7 @@ mv /path/to/<archivename> /home/yunohost.backup/archives/
yunohost backup restore <archivename>
```
## To go futher
## To go further
### Storing backups on a different drive

View file

@ -37,9 +37,9 @@ routes:
| Framasphère | Diaspora | [[fa=git /]](https://github.com/aymhce/diaspora_ynh) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://dash.yunohost.org/integration/diaspora.svg) |
| Framatalk | Jitsi Meet | [[fa=git /]](https://github.com/YunoHost-Apps/jitsi_ynh) ![](https://ci-apps.yunohost.org/ci/badges/jitsi.status.svg) ![](https://dash.yunohost.org/integration/jitsi.svg) |
| Framateam | Mattermost | [[fa=git /]](https://github.com/YunoHost-Apps/mattermost_ynh) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![](https://dash.yunohost.org/integration/mattermost.svg) |
| Framatrad | Weblate | [[fa=git /]](https://github.com/YunoHost-Apps/weblate_ynh |
| Framatrad | Weblate | [[fa=git /]](https://github.com/YunoHost-Apps/weblate_ynh) ![](https://ci-apps.yunohost.org/ci/badges/weblate.status.svg) ![](https://dash.yunohost.org/integration/weblate.svg) |
| Framatube | Peertube | [[fa=git /]](https://github.com/YunoHost-Apps/peertube_ynh) ![](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![](https://dash.yunohost.org/integration/peertube.svg) |
| Framavectoriel | SVG-Edit | [[fa=git /]](https://github.com/YunoHost-Apps/svgedit_ynh) ![](https://ci-apps.yunohost.org/ci/badges/svgedit.status.svg) ![](https://dash.yunohost.org/integration/svgedit.svg) |
| Framavectoriel | SVG-Edit | [[fa=git /]](https://github.com/YunoHost-Apps/svgedit_ynh) ![](https://ci-apps.yunohost.org/ci/badges/svgedit.status.svg) ![](https://dash.yunohost.org/integration/svgedit.svg) |
| Framavox | Loomio | Non packagé |
| Framemo | Scrumblr | [[fa=git /]](https://github.com/YunoHost-Apps/scrumblr_ynh) ![](https://ci-apps.yunohost.org/ci/badges/scrumblr.status.svg) ![](https://dash.yunohost.org/integration/scrumblr.svg) |
| Framindmap | Wisemapping | [[fa=git /]](https://github.com/YunoHost-Apps/wisemapping_ynh) ![](https://ci-apps.yunohost.org/ci/badges/wisemapping.status.svg) ![](https://dash.yunohost.org/integration/wisemapping.svg) |

View file

@ -135,6 +135,7 @@ You can [contribute to this list by adding something you'd like to be packaged](
| [LessPass](https://www.lesspass.com/) | | [Upstream](https://github.com/lesspass/lesspass) | |
| [Lessy](https://lessy.io) | | [Upstream](https://github.com/lessy-community/lessy) | |
| LibreSpeed | Self-hosted Speedtest | [Upstream](https://github.com/librespeed/speedtest) | |
| [LibreTranslate](https://libretranslate.com/) | Translation API | [Upstream](https://github.com/uav4geo/LibreTranslate) | |
| [Lingva Translate](https://lingva.ml/) | Alternative front-end for Google Translate | [Upstream](https://github.com/TheDavidDelta/lingva-translate) | |
| linuxdash | Low-overhead monitoring web dashboard | [Upstream](https://github.com/afaqurk/linux-dash) | [Package Draft](https://github.com/YunoHost-Apps/linuxdash_ynh) |
| [LiquidSoap](https://www.liquidsoap.info/) | Audio and video streaming language | [Upstream](https://github.com/savonet/liquidsoap) | |
@ -220,8 +221,8 @@ You can [contribute to this list by adding something you'd like to be packaged](
| pydio | File sharing platform | | [Package Draft](https://github.com/YunoHost-Apps/pydio_ynh) |
| [Pydio Cells](https://pydio.com/) | | [Upstream](https://github.com/pydio/cells) | |
| [pyload](https://pyload.net/) | | [Upstream](https://github.com/pyload/pyload) | [Package Draft](https://github.com/YunoHost-Apps/pyload_ynh) |
| qBittorrent | | [Upstream](https://github.com/qbittorrent/qBittorrent) | |
| [Questions2answer](https://www.question2answer.org/) | | | |
| [qBit MatUI](https://qbit-material-webui-demo.herokuapp.com/) | A WebUI for qBittorrent | [Upstream](https://github.com/bill-ahmed/qbit-matUI) | |
| [qBittorrent](https://www.qbittorrent.org/) | | [Upstream](https://github.com/qbittorrent/qBittorrent) | |
| [racktables](https://racktables.org) | | [Upstream](https://github.com/RackTables/racktables) | |
| Radarr | | [Upstream](https://github.com/Radarr/Radarr) | |
| Race for the galaxy | | [Upstream](https://github.com/bnordli/rftg) | |

View file

@ -11,9 +11,9 @@ routes:
La documentation de YunoHost est gérée sur un [dépôt Git](https://github.com/YunoHost/doc).
Si vous n'êtes pas familier avec GitHub, il y a un bouton "Éditer" en haut de chaque page qui vous redirigera vers l'éditeur en ligne de GitHub et qui vous aidera à proposer vos modifications (appelées *Pull Requests*).
Si vous n'êtes pas familier avec GitHub, il y a un bouton "Éditer" en haut de chaque page qui vous redirigera vers l'éditeur en ligne de GitHub et qui vous aidera à proposer vos modifications (appelées *Pull Requests*, PR).
Directement sur GitHub, vous pouvez faire un *fork* du dépôt, y faire vos modifications, et envoyer vos *pull requests*.
Cependant, si vous êtes lancé sur une série de contributions, vous devriez faire un *fork* du dépôt sur GitHub. Vous pouvez ensuite faire toutes les modifications (*commits*) que vous voulez sur votre dépôt, et les soumettre tous ensemble dans la même PR. L'étiquette sur GitHub vous encouragerait à rassembler dans une même PR tous les *commits* d'une même thématique.
Puisque l'éditeur en ligne ne permet pas d'ajouter des fichiers, utiliser Git par la ligne de commande est la méthode recommandée si vous voulez ajouter des médias (comme des images).

View file

@ -12,9 +12,9 @@ routes:
The YunoHost documentation is managed through a [Git repository](https://github.com/YunoHost/doc).
If you are not familiar with GitHub, there is an "Edit" button at the top of each page that will redirect you to the GitHub online editor that will help you make change proposals (Pull Requests).
If you are not familiar with GitHub, there is an "Edit" button at the top of each page that will redirect you to the GitHub online editor that will help you make change proposals (Pull Requests, PR).
Directly on GitHub, you can fork the repository, make your changes, and send pull requests.
However, if you are on an editing spree, you should fork the repository. You can then make all the commits (changes) you want on your forked repository, and submit them all at once in the same pull requests. GitHub's etiquette would advise you to gather in the same PR all related commits.
Because the online editor doesn't support uploading files, using Git is the prefered way if you need to upload media (e.g. images).