diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
| commit | f465e32109d6600887f1c5765b44347a4cfaa3d7 (patch) | |
| tree | 3855e96d1d69683b388d82c27bad3f9e339f2792 /notes | |
| parent | 1b15ca0aea334d20fb0f19fed36bc948668e2a14 (diff) | |
| parent | c9681f6bbc04659b9d6ed5eaa46b8c2edd704f9e (diff) | |
Merge branch 'redesign'
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'notes')
| -rw-r--r-- | notes/INSTALL.pod | 4 | ||||
| -rw-r--r-- | notes/no-update-server | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod index 03ad72d25..b795a0043 100644 --- a/notes/INSTALL.pod +++ b/notes/INSTALL.pod @@ -193,9 +193,9 @@ The email address to be used on the site for the contact us form. If this is 1 then all email ( alerts and reports ) will be sent to the contact email address. Use this for development sites. -=item UPLOAD_CACHE +=item UPLOAD_DIR -This is the location where imaged will be stored as they are being uploaded. +This is the location where images will be stored when they are uploaded. It should be accessible by and writeable by the FixMyStreet process. =item GEO_CACHE diff --git a/notes/no-update-server b/notes/no-update-server index ad1ce26e2..1f59c0116 100644 --- a/notes/no-update-server +++ b/notes/no-update-server @@ -323,7 +323,7 @@ TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FiksGataMi' STAGING_SITE: 1 -UPLOAD_CACHE: '/var/lib/fixmystreet/upload/' +UPLOAD_DIR: '/var/lib/fixmystreet/upload/' GEO_CACHE: '/var/lib/fixmystreet/cache/' GOOGLE_MAPS_API_KEY: '' |