diff --git a/pages/02.administer/55.providers/15.vpn/vpn.md b/pages/02.administer/55.providers/15.vpn/vpn.md
index e453896c..5ca83c1b 100644
--- a/pages/02.administer/55.providers/15.vpn/vpn.md
+++ b/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 | FFDN Non Profit |
+| [Neutrinet](https://neutrinet.be/en/vpn) | ✔ (.cube + [internetcube](https://internetcu.be)) | ✔ | ✔ | ✔ | ~10 €¹ / month | 10€ or 30€ / year | FFDN Non Profit |
¹ [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 | FFDN Non Profit |
| [Milkywan](https://milkywan.fr/prices#popupTunnel) | ✔ (manuelle) | ✔ | ✔ | ✔ | 5 € / mois | incluse | Non Profit |
| [Mycélium](https://mycelium-fai.org/wiki/documentation/services/vpn) | ✔ (manuelle) | ✘ | ✘ | ✘ | Prix libre | incluse
Réservé aux nordistes(FR 59) | FFDN Non Profit |
-| [Neutrinet](https://neutrinet.be/en/vpn) | ✔ (.cube + [internetcube](https://internetcu.be)) | ✔ | ✔ | ? | ~8 €¹ / mois | incluse | FFDN Non Profit |
+| [Neutrinet](https://neutrinet.be/en/vpn) | ✔ (.cube + [internetcube](https://internetcu.be)) | ✔ | ✔ | ✔ | ~10 €¹ / mois | 10 € ou 30 € / an | FFDN Non Profit |
| [Rézine](https://www.rezine.org/acces_internet/tunnels_chiffr%C3%A9s/) | ✔ (manuelle) | ✔ | ✔ | ✔ | 5 à 10€ / mois | Prix libre | FFDN Non Profit |
| [Swiss Neutral Network](https://www.swissneutral.net/?page_id=31) | ✔ (.cube) | ✔ | ✔ | ✔ | 30.- CHF/mois | 50.- CHF / an
Réservé aux suisses | FFDN Non Profit |
| [Tetaneutral](https://tetaneutral.net/adherer/) | ✘ (wireguard) | ? | ? | ? | 5€¹ / mois | 5 à 100€¹ / an | FFDN Non Profit |
diff --git a/pages/02.administer/60.extend/20.helpers/helpers.md b/pages/02.administer/60.extend/20.helpers/helpers.md
index a7cb0340..9869ed97 100644
--- a/pages/02.administer/60.extend/20.helpers/helpers.md
+++ b/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'
---
diff --git a/pages/06.contribute/10.packaging_apps/80.resources/15.appresources/packaging_apps_resources.md b/pages/06.contribute/10.packaging_apps/10.manifest/10.appresources/packaging_app_manifest_resources.md
similarity index 99%
rename from pages/06.contribute/10.packaging_apps/80.resources/15.appresources/packaging_apps_resources.md
rename to pages/06.contribute/10.packaging_apps/10.manifest/10.appresources/packaging_app_manifest_resources.md
index c78275be..4adfd90c 100644
--- a/pages/06.contribute/10.packaging_apps/80.resources/15.appresources/packaging_apps_resources.md
+++ b/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
-
diff --git a/pages/06.contribute/10.packaging_apps/80.resources/11.helpers/packaging_apps_helpers.md b/pages/06.contribute/10.packaging_apps/20.scripts/10.helpers/packaging_app_scripts_helpers.md
similarity index 99%
rename from pages/06.contribute/10.packaging_apps/80.resources/11.helpers/packaging_apps_helpers.md
rename to pages/06.contribute/10.packaging_apps/20.scripts/10.helpers/packaging_app_scripts_helpers.md
index 04c790da..5420003d 100644
--- a/pages/06.contribute/10.packaging_apps/80.resources/11.helpers/packaging_apps_helpers.md
+++ b/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]
-
----
-
diff --git a/pages/06.contribute/10.packaging_apps/80.resources/20.bash_tips/shell_variables_scope.fr.md b/pages/06.contribute/10.packaging_apps/20.scripts/20.bash_tips/shell_variables_scope.fr.md
similarity index 100%
rename from pages/06.contribute/10.packaging_apps/80.resources/20.bash_tips/shell_variables_scope.fr.md
rename to pages/06.contribute/10.packaging_apps/20.scripts/20.bash_tips/shell_variables_scope.fr.md
diff --git a/pages/06.contribute/10.packaging_apps/80.resources/20.bash_tips/shell_variables_scope.md b/pages/06.contribute/10.packaging_apps/20.scripts/20.bash_tips/shell_variables_scope.md
similarity index 100%
rename from pages/06.contribute/10.packaging_apps/80.resources/20.bash_tips/shell_variables_scope.md
rename to pages/06.contribute/10.packaging_apps/20.scripts/20.bash_tips/shell_variables_scope.md
diff --git a/pages/06.contribute/10.packaging_apps/20.scripts/scripts.md b/pages/06.contribute/10.packaging_apps/20.scripts/scripts.md
index 69910348..705a03ec 100644
--- a/pages/06.contribute/10.packaging_apps/20.scripts/scripts.md
+++ b/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:
diff --git a/pages/06.contribute/10.packaging_apps/packaging_apps_intro.fr.md b/pages/06.contribute/10.packaging_apps/packaging_apps.fr.md
similarity index 97%
rename from pages/06.contribute/10.packaging_apps/packaging_apps_intro.fr.md
rename to pages/06.contribute/10.packaging_apps/packaging_apps.fr.md
index cd3591ee..6c4d69ea 100644
--- a/pages/06.contribute/10.packaging_apps/packaging_apps_intro.fr.md
+++ b/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.
diff --git a/pages/06.contribute/10.packaging_apps/packaging_apps_intro.md b/pages/06.contribute/10.packaging_apps/packaging_apps.md
similarity index 98%
rename from pages/06.contribute/10.packaging_apps/packaging_apps_intro.md
rename to pages/06.contribute/10.packaging_apps/packaging_apps.md
index 4175018e..770973b9 100644
--- a/pages/06.contribute/10.packaging_apps/packaging_apps_intro.md
+++ b/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.