From 851daafced02df6a652fc037c405e80e8dcc2771 Mon Sep 17 00:00:00 2001
From: Kushan Joshi <0o3ko0@gmail.com>
Date: Mon, 5 Sep 2016 18:11:24 +0530
Subject: [PATCH 1/3] Add preset man_made=pumping_station

---
 data/presets.yaml                                  |  4 ++++
 data/presets/presets.json                          | 10 ++++++++++
 data/presets/presets/man_made/pumping_station.json | 10 ++++++++++
 data/taginfo.json                                  |  4 ++++
 dist/locales/en.json                               |  4 ++++
 5 files changed, 32 insertions(+)
 create mode 100644 data/presets/presets/man_made/pumping_station.json

diff --git a/data/presets.yaml b/data/presets.yaml
index b5180ed2c..4ddb0a98b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2829,6 +2829,10 @@ en:
         # man_made=pipeline
         name: Pipeline
         terms: '<translate with synonyms or related terms for ''Pipeline'', separated by commas>'
+      man_made/pumping_station:
+        # man_made=pumping_station
+        name: Pumping Station
+        terms: '<translate with synonyms or related terms for ''Pumping Station'', separated by commas>'
       man_made/silo:
         # man_made=silo
         name: Silo
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 923f44e41..085de1fc7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6597,6 +6597,16 @@
         },
         "name": "Pipeline"
     },
+    "man_made/pumping_station": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "pumping_station"
+        },
+        "name": "Pumping Station"
+    },
     "man_made/silo": {
         "fields": [
             "building_area",
diff --git a/data/presets/presets/man_made/pumping_station.json b/data/presets/presets/man_made/pumping_station.json
new file mode 100644
index 000000000..b7903e281
--- /dev/null
+++ b/data/presets/presets/man_made/pumping_station.json
@@ -0,0 +1,10 @@
+{
+   "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "pumping_station"
+    },
+    "name": "Pumping Station"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 85f0b3531..7ef5db429 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1510,6 +1510,10 @@
             "key": "man_made",
             "value": "pipeline"
         },
+        {
+            "key": "man_made",
+            "value": "pumping_station"
+        },
         {
             "key": "man_made",
             "value": "silo"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2345ba686..18a838cfb 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3128,6 +3128,10 @@
                 "name": "Pipeline",
                 "terms": ""
             },
+            "man_made/pumping_station": {
+                "name": "Pumping Station",
+                "terms": ""
+            },
             "man_made/silo": {
                 "name": "Silo",
                 "terms": "grain,corn,wheat"

From 466cab9dc79ff810d82e047af64a5bf3b4b29e6b Mon Sep 17 00:00:00 2001
From: greenkeeperio-bot <support@greenkeeper.io>
Date: Fri, 9 Sep 2016 16:34:21 -0400
Subject: [PATCH 2/3] chore(package): update eslint to version 3.5.0

https://greenkeeper.io/
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1db01d796..c578d5d9c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "brfs": "1.4.3",
     "d3": "3.5.5",
     "editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages",
-    "eslint": "~3.4.0",
+    "eslint": "~3.5.0",
     "glob": "~7.0.5",
     "happen": "~0.3.1",
     "http-server": "0.9.0",

From f4b02d1c25895ba39afb98005e257f5295e32bde Mon Sep 17 00:00:00 2001
From: Jason Harrison <jasonharrison@users.noreply.github.com>
Date: Sat, 24 Sep 2016 01:51:15 -0400
Subject: [PATCH 3/3] though -> thought

---
 FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index e6ab3f430..61a57c3b3 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -42,7 +42,7 @@ main things iD uses the network for:
 * Downloading tiles -- ditto
 * Uploading changes
 
-We've though a little about [caching tiles](https://github.com/openstreetmap/iD/issues/127)
+We've thought a little about [caching tiles](https://github.com/openstreetmap/iD/issues/127)
 and downloaded data, but haven't actively worked on it, nor on the data download/upload
 question.