diff --git a/pages/01.overview/10.what_is_yunohost/what_is_yunohost.fr.md b/pages/01.overview/10.what_is_yunohost/what_is_yunohost.fr.md index c140cb52..829547cf 100644 --- a/pages/01.overview/10.what_is_yunohost/what_is_yunohost.fr.md +++ b/pages/01.overview/10.what_is_yunohost/what_is_yunohost.fr.md @@ -45,7 +45,7 @@ Même si YunoHost est multi-domaine et multi-utilisateur, il reste **inappropri Premièrement parce que le logiciel est trop jeune, donc non-testé et non-optimisé pour être mis en production pour des centaines d’utilisateurs en même temps. Et quand bien même, ce n’est pas le chemin que l’on souhaite faire suivre à YunoHost. La virtualisation se démocratise, et c’est une façon bien plus étanche et sécurisée de faire de la mutualisation. -Vous pouvez héberger vos amis, votre famille ou votre entreprise sans problème, mais vous devez **avoir confiance** en vos utilisateurs, et ils doivent de la même façon avoir confiance en vous. Si vous souhaitez tout de même fournir des services YunoHost à des inconnus, **un VPS entier par utilisateur** sera la meilleure solution. +Vous pouvez héberger vos amis, votre famille, votre association ou votre entreprise sans problème, mais vous devez **avoir confiance** en vos utilisateurs, et ils doivent de la même façon avoir confiance en vous. Si vous souhaitez tout de même fournir des services YunoHost à des inconnus, **un VPS entier par utilisateur** sera la meilleure solution. ## Logo diff --git a/pages/02.administer/10.install/install.md b/pages/02.administer/10.install/install.md index 981e410f..3ef9c797 100644 --- a/pages/02.administer/10.install/install.md +++ b/pages/02.administer/10.install/install.md @@ -541,7 +541,7 @@ You should see a screen like this: [/figure] [ui-tabs position="top-left" active="0" theme="lite"] -[ui-tab title="Installation classique sur un disque entier"] +[ui-tab title="Classic installation on a whole disk"] !! N.B.: Once you have validated the keyboard layout, the installation will be launched and will completely erase the data on your hard disk! diff --git a/pages/03.user_guide/05.emailclients/email_configure_client.fr.md b/pages/03.user_guide/05.emailclients/email_configure_client.fr.md index 90fffb43..3f5b33d0 100644 --- a/pages/03.user_guide/05.emailclients/email_configure_client.fr.md +++ b/pages/03.user_guide/05.emailclients/email_configure_client.fr.md @@ -34,6 +34,7 @@ Pour configurer manuellement un nouveau compte dans Thunderbird commencez par re * [Gérer les alias mails](https://support.mozilla.org/en-US/kb/configuring-email-aliases) [/ui-tab] + [ui-tab title="K-9 Mail"] ##### ![](image://k9mail.png?resize=50&classes=inline) Configurer K-9 Mail (sur Android) @@ -45,6 +46,7 @@ Suivez les instructions suivantes (comme pour Thunderbird, il vous faudra peut- ![](image://k9mail_config_4.png?resize=280&classes=inline) [/ui-tab] + [ui-tab title="Dekko"] ##### ![](image://dekko-app.png?resize=50&classes=inline) Configurer Dekko (sur Ubuntu Touch) diff --git a/pages/04.applications/10.docs/baikal/app_baikal.md b/pages/04.applications/10.docs/baikal/app_baikal.md index cfeb299e..9e38b9d9 100644 --- a/pages/04.applications/10.docs/baikal/app_baikal.md +++ b/pages/04.applications/10.docs/baikal/app_baikal.md @@ -11,9 +11,9 @@ routes: [![Install Baïkal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=baikal) [![Integration level](https://dash.yunohost.org/integration/baikal.svg)](https://dash.yunohost.org/appci/app/baikal) -Baïkal is a server for calendars and address books, which uses the CalDav and CardDav protocol. Baïkal can be synced with a lot of clients, like Thunderbird + Lightning. +Baïkal is a server for calendars and address books, which uses the CalDAV and CardDAV protocol. Baïkal can be synced with a lot of clients, like Thunderbird + Lightning. -**WARNING**: Baïkal will not work if you have installed a **Nextcloud** (the Nextcloud CardDav/CalDav functions conflict). +**WARNING**: Baïkal will not work if you have installed a **Nextcloud** (the Nextcloud CardDAV/CalDAV functions conflict). ## Configuration @@ -28,25 +28,31 @@ By default, Baïkal is configured to look for users in YunoHost's LDAP directory. YunoHost's users will appear under `User and ressources` menu after their first authentication. +### CalDAV/CardDAV access + +To be able to connect CalDAV or CardDAV clients to Baïkal, you must allow access to the app for visitors during installation. +Clients will still need to to authenticate with username and password of an YNH user. +Also note that the admin interface of Baïkal is always available only to logged-in YNH admin users. + ## CalDAV connection ### Connecting Thunderbird with Lightning -Add a new agenda with type "Network" and "CalDAV" - -The new URL to add is: - -https://domain.org/baikal/cal.php/calendars/username/default - -Be careful to replace "domain.org" with your own domain and the "username" with your username. +- Open the Calendar view, select "New Calendar...". +- Choose "On the Network", click "Next". +- Type in your YNH username in the "Username" input field and your server's "https://domain.tld" in the "Location" input field. +- (You only need to enter the domain, Baïkal configures the webserver to forward CalDAV and CardDAV requests to Baïkal.) +- Click "Find Calendars" and enter your YNH user's password. +- If this is the first time your YNH user logs in to Baïkal, a "Default Calendar" is automatically created for you. +- Select the calendar you want to add to Thunderbird and click "Subscribe". ### Connecting to AgenDAV -AgenDAV is a web client for using your calendars. It's packaged for YunoHost and you can used it after installing Baïkal. +AgenDAV is a web client for using your calendars. It's packaged for YunoHost and you can use it after installing Baïkal. -AgenDAV is already connected to Baïkal, any other configuration is necessary. If you create a new entry in Thunderbird + Lightning calendar, refresh your AgenDAV page is enough to see your modifications. +AgenDAV is already connected to Baïkal, no other configuration is necessary. If you create a new entry in Thunderbird + Lightning calendar, refreshing your AgenDAV page is enough to see your modifications. -AgenDAV also allows you to create a new calendars very easily. +AgenDAV also allows you to create new calendars very easily. ## CardDAV Connection