1 files changed, 31 insertions, 1 deletions
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 583960d41..61f55211c 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,26 @@
+## rails-3-develop
+
+## Highlighted Features
+
+## Upgrade Notes
+
+* The `SHARED_DIRECTORIES` setting now includes `tmp/pids`. The notes below for
+  updating the log directory should cover the update steps for `tmp/pids`.
+* Capistrano now creates `SHARED_PATH/tmp/pids` and links `APP_ROOT/tmp/pids`
+  here, as the alert tracks daemon writes its pids to the generally expected
+  location of `APP_ROOT/tmp/pids`.
+* rails-post-deploy no longer handles linking `APP_ROOT/log` to a log directory
+  outside the app. Capistrano users will find that `:symlink_configuration` now
+  links `APP_ROOT/log` to `SHARED_PATH/log`. Users who aleady use the
+  `SHARED_FILES` and `SHARED_DIRECTORIES` settings in `config/general.yml`
+  should add `log/` to the `SHARED_DIRECTORIES` setting. The existing mechanism
+  for shared directories (in `script/rails-deploy-before-down`) will create the
+  necessary link to `SHARED_FILES_PATH/log`. If your existing shared log
+  directory is not at `SHARED_FILES_PATH/log`, move the directory and re-run
+  `script/rails-post-deploy` to link up the new location. If you don't use
+  `SHARED_FILES` and `SHARED_DIRECTORIES`, alaveteli will now write it's
+  application logs to `APP_ROOT/log` rather than `APP_ROOT/../logs` by default.
+
 # Version 0.18
 
 ## Highlighted features
@@ -48,7 +71,14 @@ Example:
 * There are some new strings in this release for translation, so if your
   site isn't in English, make sure your translations are up to date
   before deploying to production
-
+* If your theme overrides the help/contact template, you should
+  add elements to the form to match those added to the main template:
+
+    <p style="display:none;">
+        <%= f.label :comment, 'Do not fill in this field' %>
+        <%= f.text_field :comment %>
+    </p>
+  This is the anti-spam honeypot.
 
 # Version 0.17