diff --git a/1to2.md b/1to2.md index 9bd7be85..5c8989dd 100644 --- a/1to2.md +++ b/1to2.md @@ -1,12 +1,12 @@ --- layout: page -title: Migration from 1.x.x to 2.0.x +title: Migration from 1.x.x to 2.x.x permalink: /1to2/ --- ## Why a Migration? -Radicale 2.0.x is different from 1.x.x, here's everything you need to know about +Radicale 2.x.x is different from 1.x.x, here's everything you need to know about this! **Please read this page carefully if you want to update Radicale.** You'll also find extra information @@ -14,7 +14,7 @@ in [issue #372](https://github.com/Kozea/Radicale/issues/372). ### Python 3 Only -Radicale 2.0.x works with Python >= 3.3, and **doesn't work anymore with +Radicale 2.x.x works with Python >= 3.3, and **doesn't work anymore with Python 2**. (No, Python 3.3 is not new, it's been released more than 4 years ago. @@ -29,8 +29,8 @@ files". That's the price to pay to correctly read crazy iCalendar files and ### Storage -Calendars and address books are stored in a different way between 1.x.x and 2.0.x -versions. **Launching 2.0.x without migrating your collections first will not +Calendars and address books are stored in a different way between 1.x.x and 2.x.x +versions. **Launching 2.x.x without migrating your collections first will not work, Radicale won't be able to read your previous data.** There's now only one way to store data in Radicale: collections are stored as @@ -39,22 +39,22 @@ the `multifilesystem`, but **it's now thread-safe, with atomic writes and file locks**. Other storage types can be used by creating [plugins]({{ site.baseurl }}/plugins/). -To migrate data to Radicale 2.0.x the command line argument +To migrate data to Radicale 2.x.x the command line argument ``--export-storage`` was added to Radicale 1.1.3. Start Radicale 1.x.x as you would normally do, but add the argument ``--export-storage path/to/empty/folder``. Radicale will export the storage into the specified folder. This folder can be directly used with the -default storage backend of Radicale 2.0.x. +default storage backend of Radicale 2.x.x. ### Authentication -**Radicale 2.0.x only provides htpasswd authentication out-of-the-box.** Other +**Radicale 2.x.x only provides htpasswd authentication out-of-the-box.** Other authentication methods can be added by creating or using [plugins]({{ site.baseurl }}/plugins/). ### Rights -In Radicale 2.0.x, rights are managed using regex-based rules based on the +In Radicale 2.x.x, rights are managed using regex-based rules based on the login of the authenticated user and the URL of the resource. Default configurations are built in for common cases, you'll find more about this on the [Authentication & Rights]({{ site.baseurl }}/rights/) page. @@ -64,7 +64,7 @@ Other rights managers can be added by creating ### Versioning -Support for versioning with **git** was removed from Radicale 2.0.x. +Support for versioning with **git** was removed from Radicale 2.x.x. Instead, the configuration option ``hook`` in the ``storage`` section was added, the [Collection Versioning]({{ site.baseurl }}/versioning/) page explains its usage for version control. diff --git a/documentation.md b/documentation.md index 6064f3bb..93505640 100644 --- a/documentation.md +++ b/documentation.md @@ -4,8 +4,8 @@ title: Documentation permalink: /documentation/ --- -This documentation page is written for version 2.0.x. If you want to update -Radicale from 1.x.x to 2.0.x, please follow +This documentation page is written for version 2.x.x. If you want to update +Radicale from 1.x.x to 2.x.x, please follow our [migration guide]({{ site.baseurl }}/1to2/). You can find on GitHub the [documentation page for the 1.1.x versions](https://github.com/Kozea/Radicale/blob/website/pages/user_documentation.rst).