Merge remote-tracking branch 'openstreetmap/pull/1117'
authorTom Hughes <tom@compton.nu>
Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)
INSTALL.md
config/locales/en.yml

index fa9b27a2c860c8107533edf23d6734979818eccf..61dcbd7f2cbcf7211f182f683a0653a3c799082f 100644 (file)
@@ -32,7 +32,7 @@ sudo apt-get install ruby2.0 libruby2.0 ruby2.0-dev \
                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
                      apache2 apache2-threaded-dev build-essential git-core \
                      postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-                     libsasl2-dev
+                     libsasl2-dev imagemagick
 sudo gem2.0 install bundler
 ```
 
@@ -47,7 +47,7 @@ sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \
                  libxml2-devel js \
                  gcc gcc-c++ git \
                  postgresql postgresql-server postgresql-contrib postgresql-devel \
-                 perl-podlators
+                 perl-podlators ImageMagick
 ```
 
 If you didn't already have Postgres installed then create a Postgres instance and start the server:
index 9027252f7e2f571030a949a46fe7bec79c858efd..ae8294e95ae3d4aacc41abc26bdb0cdff0436455 100644 (file)
@@ -1083,7 +1083,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
-        OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
+        OpenStreetMap and the magnifying glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
   welcome_page:
     title: Welcome!
     introduction_html: |