diff --git a/README.md b/README.md
index 7f95c9d..2ae066d 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,48 @@
+
+
# Anarchism for YunoHost
-[](https://dash.yunohost.org/appci/app/anarchism)  
-[](https://install-app.yunohost.org/?app=anarchism)
+[](https://dash.yunohost.org/appci/app/anarchism)  
+[](https://install-app.yunohost.org/?app=anarchism)
*[Lire ce readme en français.](./README_fr.md)*
-> *This package allow you to install Anarchism quickly and simply on a YunoHost server.
-If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
+> *This package allows you to install Anarchism quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## Overview
+
This is an anarchist FAQ. Its aim is to present what anarchism really stands for and indicate why you should become an anarchist.
-**Shipped version:** 15.3-3
+**Shipped version:** 15.3-3~ynh3
+
+**Demo:** http://anarchism.pageabode.com/afaq/index.html
## Screenshots
-
+
-## Demo
+## Documentation and resources
-* [Official demo](http://anarchism.pageabode.com/afaq/index.html)
+* Official app website:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
-## Documentation
+## Developer info
- * Official documentation: https://salsa.debian.org/debian/anarchism
-
-## YunoHost specific features
-
-#### Multi-users support
-
- * Are LDAP and HTTP auth supported? **No**
- * Can the app be used by multiple users? **Yes**
-
-#### Supported architectures
-
-* x86-64b - [](https://ci-apps.yunohost.org/ci/apps/anarchism/)
-* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/anarchism/)
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/anarchism_ynh/issues
- * Upstream app repository: https://salsa.debian.org/debian/anarchism/
- * YunoHost website: https://yunohost.org/
-
----
-
-## Developers info
-
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug
or
sudo yunohost app upgrade anarchism -u https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug
```
+
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 96061cf..a862e96 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,57 +1,48 @@
+
+
# Anarchism pour YunoHost
-[](https://dash.yunohost.org/appci/app/anarchism)  
+[](https://dash.yunohost.org/appci/app/anarchism)  
[](https://install-app.yunohost.org/?app=anarchism)
-*[Read this readme in english.](./README.md)*
+*[Read this readme in english.](./README.md)*
-> *Ce package vous permet d'installer Anarchism rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.*
+> *Ce package vous permet d'installer Anarchism rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble
+
Ceci est une FAQ anarchiste. Son objectif est de présenter ce que représente vraiment l'anarchisme et d'indiquer pourquoi vous devriez devenir anarchiste.
-**Version incluse :** 15.3-3
+**Version incluse :** 15.3-3~ynh3
+
+**Démo :** http://anarchism.pageabode.com/afaq/index.html
## Captures d'écran
-
+
-## Démo
+## Documentations et ressources
-* [Démo officielle](http://anarchism.pageabode.com/afaq/index.html)
+* Site officiel de l'app :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
-## Documentation
-
- * Documentation officielle : https://salsa.debian.org/debian/anarchism
-
-## Caractéristiques spécifiques YunoHost
-
-#### Support multi-utilisateur
-
-* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
-* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui**
-
-#### Architectures supportées
-
-* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/anarchism/)
-* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/anarchism/)
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/anarchism_ynh/issues
- * Dépôt de l'application principale : https://salsa.debian.org/debian/anarchism/
- * Site web YunoHost : https://yunohost.org/
-
----
-
-## Developers info
+## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug
ou
sudo yunohost app upgrade anarchism -u https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug
```
+
+**Plus d'infos sur le packaging d'applications :**
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 95c0833..af39f1a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
# Path to source
alias __FINALPATH__/html/ ;
- # Force usage of https
- if ($scheme = http) {
- rewrite ^ https://$server_name$request_uri? permanent;
- }
-
index index.html;
# Include SSOWAT user panel.
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
new file mode 100644
index 0000000..e69de29
diff --git a/manifest.json b/manifest.json
index 4e9ce03..8c73067 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,6 +8,13 @@
},
"version": "15.3-3~ynh3",
"url": "https://salsa.debian.org/debian/anarchism/",
+ "upstream": {
+ "license": "GPL-2.0-or-later",
+ "website": "https://salsa.debian.org/debian/anarchism/",
+ "demo": "http://anarchism.pageabode.com/afaq/index.html",
+ "admindoc": "https://salsa.debian.org/debian/anarchism",
+ "code": "https://salsa.debian.org/debian/anarchism/"
+ },
"license": "GPL-2.0-or-later",
"maintainer": {
"name": "kay0u",