disable nominatim in apache when importing

[chef.git] / README.md

diff --git a/README.md b/README.md
index 99a7de1d5740f6a17f1e82fd0cda9adb46e4025b..50b3a7acf0f4f3638684b8ca4997d49886b3449b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,13 +14,13 @@ We make extensive use of roles to configure the servers. In general we have:
 ## Server-specific roles (e.g. [katla.rb](roles/katla.rb))
 
 These deal with particular setup or quirks of a server, such as its IP address. They also include roles representing the service they are performing, and the location they are in and any particular hardware they have that needs configuration.
-All our servers are [named after dragons](http://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
+All our servers are [named after dragons](https://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
 
 ## Hardware-specific roles (e.g. [tyan-s7010.rb](roles/tyan-s7010.rb))
 
 Covers anything specific to a certain piece of hardware, like a motherboard, that could apply to multiple machines.
 
-## Location-specific roles (e.g. [ic.rb](roles/ic.rb))
+## Location-specific roles (e.g. [ams.rb](roles/ams.rb))
 
 These form a hierarchy of datacentres, organisations, and countries where our servers are located.
 
@@ -30,8 +30,13 @@ These cover the services that the server is running, and will include the recipe
 
 # Cookbooks
 
-We use the 'Organization Repository' approach, where we have all our cookbooks in this repository (as opposed to one repository per cookbook). Additionally we don't make use of external cookbooks so every cookbook required is in this repository
+We use the 'Organization Repository' approach, where we have all our cookbooks in this repository (as opposed to one repository per cookbook). Additionally we don't make use of external cookbooks so every cookbook required is in this repository.
 
 # Contributing
 
 Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
+
+# Contact Us
+
+* Twitter: [@OSM_Tech](https://twitter.com/OSM_Tech)
+* IRC: [#OSM-Dev on irc.oftc.net](https://irc.openstreetmap.org/)