From b958d8eea1c98c8d130fd2c23617f0eae3bc1af1 Mon Sep 17 00:00:00 2001
From: controlcde <controlcde@users.noreply.github.com>
Date: Mon, 5 Jan 2015 14:54:39 +0100
Subject: [PATCH 1/3] Update postfix_autoreply.rst

fix typo
---
 doc/plugins/postfix_autoreply.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/plugins/postfix_autoreply.rst b/doc/plugins/postfix_autoreply.rst
index 1c1b6a4a2..0e87414b0 100644
--- a/doc/plugins/postfix_autoreply.rst
+++ b/doc/plugins/postfix_autoreply.rst
@@ -1,7 +1,7 @@
 .. _postfix_ar:
 
 ###########################
-Postifx auto-reply messages
+Postfix auto-reply messages
 ###########################
 
 This plugin let users define an auto-reply message (*vacation*). It is

From 42afe4d904f3f1918ebd303540eccd08c5e993d9 Mon Sep 17 00:00:00 2001
From: Alexandre Anriot <alexandre+github@atlantilde.com>
Date: Mon, 5 Jan 2015 16:52:02 +0100
Subject: [PATCH 2/3] Add a warning for sitestatic

---
 doc/getting_started/upgrade.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst
index e0c47730f..19819dc30 100644
--- a/doc/getting_started/upgrade.rst
+++ b/doc/getting_started/upgrade.rst
@@ -44,6 +44,13 @@ version you're installing.
 To finish, restart the web server process according to the environment
 you did choose. See :ref:`webservers` for more details.
 
+.. warning::
+
+    You also have to note that the :file:`sitestatic` directory has moved from
+    ``<path to your site's dir>`` to ``<modoboa's root url>`` (it's probably
+    the parent directory). You have to adapt your web server configuration
+    to reflect this change.
+
 .. _specific_upgrade_instructions:
 
 *****************************

From 995567b08db2dda19d75a79bc483cfc5e21942ef Mon Sep 17 00:00:00 2001
From: Alexandre Anriot <alexandre+github@atlantilde.com>
Date: Mon, 5 Jan 2015 17:04:39 +0100
Subject: [PATCH 3/3] Move the warning to 1.2.0 instructions

---
 doc/getting_started/upgrade.rst | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst
index 19819dc30..3cbb49fa0 100644
--- a/doc/getting_started/upgrade.rst
+++ b/doc/getting_started/upgrade.rst
@@ -44,13 +44,6 @@ version you're installing.
 To finish, restart the web server process according to the environment
 you did choose. See :ref:`webservers` for more details.
 
-.. warning::
-
-    You also have to note that the :file:`sitestatic` directory has moved from
-    ``<path to your site's dir>`` to ``<modoboa's root url>`` (it's probably
-    the parent directory). You have to adapt your web server configuration
-    to reflect this change.
-
 .. _specific_upgrade_instructions:
 
 *****************************
@@ -99,6 +92,12 @@ If you plan to use the Radicale extension:
      $ cd <modoboa_instance_dir>
      $ python manage.py syncdb
 
+.. warning::
+
+    You also have to note that the :file:`sitestatic` directory has moved from
+    ``<path to your site's dir>`` to ``<modoboa's root url>`` (it's probably
+    the parent directory). You have to adapt your web server configuration
+    to reflect this change.
      
 1.1.7: manual learning for SpamAssassin
 =======================================