aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-30 11:37:14 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-30 11:37:14 +0100
commit4c12459577764432159190e02909510a560823e2 (patch)
tree40b893beb2e7cf53452b30de4079317f7f92b757
parentbd91f7470c9ed3091c79634420f1433f62ec0215 (diff)
Add note about config/httpd.conf
-rw-r--r--config/httpd.conf-example2
-rw-r--r--doc/CHANGES.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/config/httpd.conf-example b/config/httpd.conf-example
index 0115ad8d9..7d49661ca 100644
--- a/config/httpd.conf-example
+++ b/config/httpd.conf-example
@@ -1,4 +1,4 @@
-# Apache configuracreated_attion for FOI site.
+# Apache configuration for FOI site.
#
# For development ignore this, you can just run ./scripts/server as for any
# Ruby on Rails application.
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 6df2af653..156c4d0dc 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -5,6 +5,7 @@
## Upgrade notes
* Manually remove vendor/rails-locales
* Themes created for 0.9 and below should be updated to work with Rails 3. See `THEMES-UPGRADE.md` for notes on upgrading your theme. You will need to manually remove your old theme directory before running `rails-post-deploy`.
+* The `config/httpd.conf` has moved to `config/httpd.conf`, as it may need customization before deploying. It also has a new line setting RackEnv to production - copy this to your config/httpd.conf file.
# Version 0.9
## Highlighted features