Merge branch 'testing' into new-requirement

doc/DISCLAIMER.md

@@ -0,0 +1,4 @@
+## Configuration
+
+You can configure HedgeDoc by editing this file `/var/www/hedgedoc/config.json` using the [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md)  
+When you finished editing the configuration, for your changes to take effect, you will have to run: `sudo systemctl restart hedgedoc`.

doc/DISCLAIMER_fr.md

@@ -0,0 +1,4 @@
+## Configuration
+
+Vous pouvez configurer HedgeDoc en modifiant le fichier `/var/www/hedgedoc/config.json` et en vous aidant de la [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md)  
+Lorsque vous avez terminé de modifier la configuration, pour que vos modifications prennent effet, vous devrez exécuter : `sudo systemctl restart hedgedoc`.

manifest.json

@@ -6,8 +6,16 @@
         "en": "Collaborative editor to work on notes written in Markdown",
         "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown"
     },
-    "version": "1.8.2~ynh2",
-    "url": "https://github.com/hedgedoc/hedgedoc",
+    "version": "1.8.2~ynh1",
+    "url": "https://hedgedoc.org",
+    "upstream": {
+        "license": "free",
+        "website": "https://hedgedoc.org",
+        "demo": "https://demo.hedgedoc.org/",
+        "admindoc": "https://docs.hedgedoc.org/",
+        "userdoc": "https://yunohost.org/en/app_hedgedoc",
+        "code": "https://github.com/hedgedoc/hedgedoc"
+    },
     "license": "AGPL-3.0-only",
     "maintainer": {
         "name": "eric_G"