Merge branch 'master' of ssh://github.com/YunoHost/doc

pages/02.administer/55.providers/15.vpn/vpn.md

@@ -27,7 +27,7 @@ Below, you can find a list of providers compatible for self-hosting and especial
 
 | VPN provider | [VPNClient](https://github.com/labriqueinternet/vpnclient_ynh) compatibility | IPv6 | rDNS IPv4 | rDNS IPv6 | Price | Membership | Net Neutrality |
 | ------------ | ----------------------- | ---- | --------- | --------- | ----- | -------------- |
-| [Neutrinet](https://neutrinet.be/en/vpn)    | ✔ (.cube + [internetcube](https://internetcu.be))               | ✔    | ✔         | ?         | ~8 €¹ / month | included | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
+| [Neutrinet](https://neutrinet.be/en/vpn)    | ✔ (.cube + [internetcube](https://internetcu.be))               | ✔    | ✔         | ✔         | ~10 €¹ / month | 10€ or 30€ / year | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
 ¹ [Pay what you want](https://en.wikipedia.org/wiki/Pay_what_you_want)
 
 !!! If you try an other VPN provider that include **public dedicated ipv4 and port forwarding**, feel free to contribute to this documentation. We need people to test specific offers of those commercial providers:
@@ -52,7 +52,7 @@ Below, you can find a list of providers compatible for self-hosting and especial
 | [ILOTH](https://iloth.net/vpn/)    | ✔ (.cube)               | ✘   | ✔         | ✘        | 80€ / an | 5 à 100€ / an | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
 | [Milkywan](https://milkywan.fr/prices#popupTunnel)    | ✔ (manuelle)               | ✔    | ✔         |  ✔        | 5 € / mois | incluse | <span class="label label-success label-as-badge">Non Profit</span> |
 | [Mycélium](https://mycelium-fai.org/wiki/documentation/services/vpn)    | ✔ (manuelle)               | ✘    | ✘         | ✘         | Prix libre | incluse<br>Réservé aux nordistes(FR 59) | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
-| [Neutrinet](https://neutrinet.be/en/vpn)    | ✔ (.cube + [internetcube](https://internetcu.be))               | ✔    | ✔         | ?         | ~8 €¹ / mois | incluse | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
+| [Neutrinet](https://neutrinet.be/en/vpn)    | ✔ (.cube + [internetcube](https://internetcu.be))               | ✔    | ✔         | ✔         | ~10 €¹ / mois | 10 € ou 30 € / an | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
 | [Rézine](https://www.rezine.org/acces_internet/tunnels_chiffr%C3%A9s/)    | ✔ (manuelle)               | ✔   | ✔         | ✔        | 5 à 10€ / mois | Prix libre | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
 | [Swiss Neutral Network](https://www.swissneutral.net/?page_id=31)    | ✔ (.cube)               | ✔    |  ✔        | ✔         | 30.- CHF/mois | 50.- CHF / an<br>Réservé aux suisses | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |
 | [Tetaneutral](https://tetaneutral.net/adherer/)    | ✘ (wireguard)               | ?    | ?         | ?         | 5€¹ / mois | 5 à 100€¹ / an | <span class="ffdn">FFDN</span> <span class="label label-success label-as-badge">Non Profit</span> |

pages/02.administer/60.extend/20.helpers/helpers.md

@@ -1,5 +1,5 @@
 ---
 title: App helpers
 template: docs
-redirect: '/packaging_apps_helpers'
+redirect: '/packaging_apps_scripts_helpers'
 ---

pages/06.contribute/10.packaging_apps/10.manifest/10.appresources/packaging_app_manifest_resources.md

@@ -1,5 +1,5 @@
 ---
-title: App resources
+title: App manifest resources
 template: docs
 taxonomy:
     category: docs
@@ -342,4 +342,3 @@ Provision a system user to be used by the app. The username is exactly equal to
 
 ### Deprovision
 - deletes the user and group
-

pages/06.contribute/10.packaging_apps/20.scripts/10.helpers/packaging_app_scripts_helpers.md

@@ -1,10 +1,12 @@
 ---
-title: App helpers
+title: App scripts helpers
 template: docs
 taxonomy:
     category: docs
 routes:
-  default: '/packaging_apps_helpers'
+  default: '/packaging_apps_scripts_helpers'
+  aliases:
+    - '/packaging_apps_helpers'
 ---
 
 Doc auto-generated by [this script](https://github.com/YunoHost/yunohost/blob/7d0d82ae016ae3e7cdb06423b67678d7f7a5d9ca/doc/generate_helper_doc.py) on 11/04/2024 (YunoHost version 11.2.11.2)
@@ -2680,6 +2682,3 @@ Requires YunoHost version 3.8.0 or higher.
 
 [Dude, show me the code!](https://github.com/YunoHost/yunohost/blob/7d0d82ae016ae3e7cdb06423b67678d7f7a5d9ca/helpers/utils#L1027)
 [/details]
-
----
-

pages/06.contribute/10.packaging_apps/20.scripts/scripts.md

@@ -85,7 +85,7 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 
 ## Helper system
 
-We call helpers a set of custom bash function created by the YunoHost project to standardize common operations accross all apps. They are all prefixed with `ynh_`. The full list and documentation of these helpers is available on [this page](/packaging_apps_helpers). Some of these helpers are now partially obsolete as they are now handled by the core via app resources.
+We call helpers a set of custom bash function created by the YunoHost project to standardize common operations accross all apps. They are all prefixed with `ynh_`. The full list and documentation of these helpers is available on [this page](/packaging_apps_scripts_helpers). Some of these helpers are now partially obsolete as they are now handled by the core via app resources.
 
 Here is the list of the major ones:
 

pages/06.contribute/10.packaging_apps/packaging_apps.fr.md

@@ -1,12 +1,12 @@
 ---
-title: Introduction au packaging
+title: Packaging d'applications
 template: docs
 taxonomy:
     category: docs
 routes:
-  default: '/packaging_apps_intro'
+  default: '/packaging_apps'
   aliases:
-    - '/packaging_apps'
+    - '/packaging_apps_intro'
 ---
 
 Cette documentation a pour but de fournir tous les concepts de base et le vocabulaire nécessaire pour comprendre le packaging d'applications.

pages/06.contribute/10.packaging_apps/packaging_apps.md

@@ -1,12 +1,12 @@
 ---
-title: Introduction to packaging
+title: Packaging applications
 template: docs
 taxonomy:
     category: docs
 routes:
-  default: '/packaging_apps_intro'
+  default: '/packaging_apps'
   aliases:
-    - '/packaging_apps'
+    - '/packaging_apps_intro'
 ---
 
 This documentation is here to provide all the basic concepts and vocabulary needed to understand app packaging.