diff --git a/pages/home.rst b/pages/home.rst index 8450df86..ce42e47f 100644 --- a/pages/home.rst +++ b/pages/home.rst @@ -32,7 +32,7 @@ Main Features - Shares contacts through CardDAV, WebDAV and HTTP - Supports events, todos, journal entries and business cards - Works out-of-the-box, no installation nor configuration required -- Warns users on concurrent edition +- Warns users on concurrent editing - Limits access by authentication - Secures connections diff --git a/pages/project_description.rst b/pages/project_description.rst index ffddb034..64796f5c 100644 --- a/pages/project_description.rst +++ b/pages/project_description.rst @@ -29,10 +29,10 @@ Calendar and Contact Server --------------------------- The Radicale Project is mainly a calendar and contact server, giving local and -distant accessess for reading, creating, modifying and deleting multiple +distant access for reading, creating, modifying and deleting multiple calendars through simplified CalDAV and CardDAV protocols. -Data can be encrypted by SSL, and their access can be restricted thanks to +Data can be encrypted by SSL, and their access can be restricted using different authentication methods. @@ -50,14 +50,14 @@ the server, as it is a really (really really) much more difficult task [#]_. Original Calendar or Contact Access Protocol -------------------------------------------- -CalDAV and CardDAV are not perfect protocols. We think that its main problem is +CalDAV and CardDAV are not perfect protocols. We think that their main problem is their complexity [#]_, that is why we decided not to implement the whole standard but just enough to understand some of its client-side implementations [#]_. -CalDAV and CardDAV are not perfect protocols, but they are the best open -standards available and are quite widely used by both clients and servers -[#]_. We decided to use it, and we will not use another one. +CalDAV and CardDAV are the best open standards available and they are quite widely +used by both clients and servers[#]_. We decided to use it, and we will not use +another one. .. [#] Try to read :RFC:`4791`. Then try to understand it. Then try to implement it. Then try to read it again. diff --git a/pages/technical_choices.rst b/pages/technical_choices.rst index d7f1c4a7..80957e83 100644 --- a/pages/technical_choices.rst +++ b/pages/technical_choices.rst @@ -146,7 +146,7 @@ calendar through network: | | Calendar/Contact | CalDAV/CardDAV Server | | | Server | | +-----------+---------------------+--------------------------+ -| Transfert | Network | CalDAV/CardDAV | +| Transfer | Network | CalDAV/CardDAV | | | | (HTTP + TLS) | +-----------+---------------------+--------------------------+ | Client | Calendar/Contact | CalDAV/CardDAV Client | diff --git a/pages/user_documentation.rst b/pages/user_documentation.rst index fc6b5539..d8477bf5 100644 --- a/pages/user_documentation.rst +++ b/pages/user_documentation.rst @@ -18,7 +18,7 @@ Installation Dependencies ------------ -Radicale is written in pure Python and does not depend on any librabry. It is +Radicale is written in pure Python and does not depend on any library. It is known to work on Python 2.6, 2.7, 3.1, 3.2 and PyPy > 1.7. The dependencies are optional, as they are only needed for various authentication methods [#]_. @@ -39,7 +39,7 @@ folder of your choice. CalDAV Clients -------------- -At this time Radicale has been tested and works fine with the latests version +At this time Radicale has been tested and works fine with the latest version of: - `Mozilla Lightning `_ @@ -52,7 +52,7 @@ of: More clients will be supported in the future. However, it may work with any calendar or contact client which implements CalDAV or CardDAV specifications -too (luck is highly recommanded). +too (luck is highly recommended). Simple Usage @@ -308,7 +308,7 @@ configuration file, with the main parameters: # CalDAV server hostnames separated by a comma # IPv4 syntax: address:port # IPv6 syntax: [address]:port - # IPv6 adresses are configured to only allow IPv6 connections + # IPv6 addresses are configured to only allow IPv6 connections hosts = 0.0.0.0:5232 # Daemon flag daemon = False