Merge branch 'version-2' into src

README.md

@@ -17,10 +17,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
-
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.
 
-**Shipped version:** 2023.05~ynh1
+**Shipped version:** 2023.05~ynh2
 
 **Demo:** https://dir.friendica.social/servers
 

README_fr.md

@@ -17,10 +17,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 ## Vue d’ensemble
 
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
-
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.
 
-**Version incluse :** 2023.05~ynh1
+**Version incluse :** 2023.05~ynh2
 
 **Démo :** https://dir.friendica.social/servers
 

conf/nginx.conf

@@ -44,6 +44,7 @@ location __PATH__/  {
   location ~ /\. {
     deny all;
   }
-    #Include SSOWAT user panel.
+
-    include conf.d/yunohost_panel.conf.inc;
+  #Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }

doc/ADMIN.md

@@ -1,6 +1,4 @@
-## Installation
+## User with LDAP admin rights
-
-### User with LDAP admin rights
 
 **For admin rights**: When installation is complete, you will need to visit your domain page and login with the **admin account username and password** which was entered at the time of installation process. You can then create your profile and access the admin panel.
 

doc/ADMIN_fr.md

@@ -1,6 +1,4 @@
-## Installation
+## Utilisateur avec des droits d'administrateur LDAP
-
-### Utilisateur avec des droits d'administrateur LDAP
 
 **Pour les droits d'administrateur** : une fois l'installation terminée, vous devrez visiter la page de votre domaine et vous connecter avec le **nom d'utilisateur et le mot de passe du compte administrateur** qui ont été saisis au moment du processus d'installation. Vous pouvez ensuite créer votre profil et accéder au panneau d'administration.
 

doc/DESCRIPTION.md

@@ -1,3 +1,2 @@
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
-
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.

doc/DESCRIPTION_fr.md

@@ -1,3 +1,2 @@
 Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services.
-
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted.

manifest.toml

@@ -5,7 +5,7 @@ name = "Friendica"
 description.en = "Social Communication Server"
 description.fr = "Serveur de Communication Social"
 
-version = "2023.05~ynh1"
+version = "2023.05~ynh2"
 
 maintainers = []