Documentation edits

data/doc.json

@@ -1,22 +1,22 @@
 [
     {
-        "html": "<p>This is an editor for <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a>, the\nfree and editable map of the world. You can use it to fix and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.</p>\n<p>Edits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you&#39;ll need a\n<a href=\"https://www.openstreetmap.org/user/new\">free OpenStreetMap account</a>.</p>\n<p><a href=\"http://ideditor.com/\">iD Editor</a> is a collaborative project with <a href=\"https://github.com/systemed/iD\">source\ncode available on GitHub</a>.</p>\n",
+        "html": "<p>This is an editor for <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a>, the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.</p>\n<p>Edits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you&#39;ll need a\n<a href=\"https://www.openstreetmap.org/user/new\">free OpenStreetMap account</a>.</p>\n<p>The <a href=\"http://ideditor.com/\">iD editor</a> is a collaborative project with <a href=\"https://github.com/systemed/iD\">source\ncode available on GitHub</a>.</p>\n",
         "title": "Help"
     },
     {
-        "html": "<p>This editor is designed to work primarily online, and you&#39;re accessing\nit through a website right now.</p>\n<h3>Selecting Features</h3>\n<p>To select a map feature, like a road or point of interest, simply single-click\non it on the map. This will highlight the selected feature, show a panel of\ndetails, and also show a menu of things you can do with the feature.</p>\n<p>Multiple features can be selected by holding the &#39;Shift&#39; key, clicking,\nand dragging on the map. This will select all features within the box\nthat&#39;s drawn, and you can do certain &#39;batch operations&#39; on all features.</p>\n<h3>Saving Edits</h3>\n<p>When you create changes, like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don&#39;t worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.</p>\n<p>Click &#39;Save&#39; to finish a group of edits - for instance, if you&#39;ve completed\nan area of town and would like to start on a new area. You&#39;ll have a chance\nto review what you&#39;ve done, and the editor supplies helpful suggestions\nand warnings if something doesn&#39;t seem right about the changes.</p>\n<p>Clicking &#39;Save&#39; again, on the new dialog, will post the changes\nto <a href=\"http://www.openstreetmap.org/\">OpenStreetMap.org</a>, where they are visible\nto all other users and available for others to build and improve upon.</p>\n<p>If you can&#39;t finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.</p>\n",
+        "html": "<p>This editor is designed to work primarily online, and you&#39;re accessing\nit through a website right now.</p>\n<h3>Selecting Features</h3>\n<p>To select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.</p>\n<p>Multiple features can be selected by holding the &#39;Shift&#39; key, clicking,\nand dragging on the map. This will select all features within the box\nthat&#39;s drawn, allowing you to do things with several features at once.</p>\n<h3>Saving Edits</h3>\n<p>When you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don&#39;t worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.</p>\n<p>Click &#39;Save&#39; to finish a group of edits - for instance, if you&#39;ve completed\nan area of town and would like to start on a new area. You&#39;ll have a chance\nto review what you&#39;ve done, and the editor supplies helpful suggestions\nand warnings if something doesn&#39;t seem right about the changes.</p>\n<p>If everything looks good, you can enter a short comment explaining the change\nyou made, and click &#39;Save&#39; again to post the changes\nto <a href=\"http://www.openstreetmap.org/\">OpenStreetMap.org</a>, where they are visible\nto all other users and available for others to build and improve upon.</p>\n<p>If you can&#39;t finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.</p>\n",
         "title": "Editing & Saving"
     },
     {
-        "html": "<p>You can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.</p>\n<h3>Selecting</h3>\n<p>Click on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.</p>\n<h3>Modifying</h3>\n<p>Often you&#39;ll see roads that aren&#39;t aligned to the imagery behind them\nor a GPS track.</p>\n<p>First click on the road you want to change. This will highlight it and show\n&#39;control points along it&#39; that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a point, and one will be added.</p>\n<p>If the road connects to another road, but doesn&#39;t properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.</p>\n<p>You can also click the &#39;Move&#39; tool or type <code>M</code> to move the entire road at\none time, and then click again to save that movement.</p>\n<h3>Deleting</h3>\n<p>If a road is entirely incorrect - you can see that it doesn&#39;t exist in satellite\nimagery and ideally have confirmed locally that it&#39;s not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.</p>\n<p>You can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the &#39;Delete&#39; key.</p>\n<h3>Creating</h3>\n<p>Found somewhere there should be a road but there isn&#39;t? Click the &#39;Line&#39;\nicon in the top-left of the editor or press the key &#39;2&#39; to start drawing\na line.</p>\n<p>Click on the start of the road on the map to start drawing. If the road\nconnects to another road, first, click on the place where they connect.</p>\n<p>Then click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. When you&#39;re done drawing the road, double-click\nor press &#39;Return&#39; or &#39;Enter&#39; on your keyboard.</p>\n",
+        "html": "<p>You can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.</p>\n<h3>Selecting</h3>\n<p>Click on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.</p>\n<h3>Modifying</h3>\n<p>Often you&#39;ll see roads that aren&#39;t aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.</p>\n<p>First click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a point, and one will be added.</p>\n<p>If the road connects to another road, but doesn&#39;t properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.</p>\n<p>You can also click the &#39;Move&#39; tool or press the <code>M</code> shortcut key to move the entire road at\none time, and then click again to save that movement.</p>\n<h3>Deleting</h3>\n<p>If a road is entirely incorrect - you can see that it doesn&#39;t exist in satellite\nimagery and ideally have confirmed locally that it&#39;s not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.</p>\n<p>You can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the &#39;Delete&#39; key.</p>\n<h3>Creating</h3>\n<p>Found somewhere there should be a road but there isn&#39;t? Click the &#39;Line&#39;\nicon in the top-left of the editor or press the shortcut key <code>2</code> to start drawing\na line.</p>\n<p>Click on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.</p>\n<p>Then click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you&#39;re done drawing, double-click\nor press &#39;Return&#39; or &#39;Enter&#39; on your keyboard.</p>\n",
         "title": "Roads"
     },
     {
-        "html": "<p>GPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - <code>.gpx</code> files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.</p>\n<p>For information on how to perform a GPS survey, read\n<a href=\"http://learnosm.org/en/beginner/using-gps/\">Surveying with a GPS</a>.</p>\n<p>To use a GPX track for mapping, drag and drop the GPX file onto the map map\neditor. If it&#39;s recognized, it will be added to the map as a bright green\nline. Click on the &#39;Background Settings&#39; menu on the left side to enable,\ndisable, or zoom to this new GPX-powered layer.</p>\n<p>The GPX track isn&#39;t directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add.</p>\n",
+        "html": "<p>GPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - <code>.gpx</code> files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.</p>\n<p>For information on how to perform a GPS survey, read\n<a href=\"http://learnosm.org/en/beginner/using-gps/\">Surveying with a GPS</a>.</p>\n<p>To use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it&#39;s recognized, it will be added to the map as a bright green\nline. Click on the &#39;Background Settings&#39; menu on the left side to enable,\ndisable, or zoom to this new GPX-powered layer.</p>\n<p>The GPX track isn&#39;t directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add.</p>\n",
         "title": "GPS"
     },
     {
-        "html": "<p>Aerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the &#39;Background Settings&#39; menu on the left.</p>\n<p>By default a <a href=\"http://www.bing.com/maps/\">Bing Maps</a> satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-resolution, high-quality imagery\navailable for smaller geographical coverages.</p>\n<p>Imagery is sometimes offset from the map data because of a mistake on the\nimagery provider&#39;s side - so if you see many roads shifted from the background,\ndon&#39;t immediately go to move them all. You can set an offset for imagery\nby clicking &#39;Fix alignment&#39; at the bottom of the bottom of the Background\nSettings UI.</p>\n",
+        "html": "<p>Aerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the &#39;Background Settings&#39; menu on the left.</p>\n<p>By default a <a href=\"http://www.bing.com/maps/\">Bing Maps</a> satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.</p>\n<p>Imagery is sometimes offset from the map data because of a mistake on the\nimagery provider&#39;s side. If you see a lot of roads shifted from the background,\ndon&#39;t immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking &#39;Fix alignment&#39; at\nthe bottom of the Background Settings UI.</p>\n",
         "title": "Imagery"
     },
     {
@@ -24,7 +24,7 @@
         "title": "Addresses"
     },
     {
-        "html": "<p>The inspector is the user interface element on the right-hand side of the\npage that appears when an element is selected and allows to edit its details.</p>\n<h3>Selecting a Preset</h3>\n<p>The inspector has two modes: the first allows you to pick a preset, or\npredetermined selection of forms and tags.</p>\n<p>Click the &#39;i&#39; in the bottom-right-hand corner of a preset option to learn\nmore about it. Click a preset to choose it.</p>\n<h3>Using Forms and Editing Tags</h3>\n<p>The second allows you to edit the\nattributes of a map element using those forms and tags.</p>\n<p>Below the forms you see, you can click icons to add more easy-to-use forms,\nlike <a href=\"http://www.wikipedia.org/\">Wikipedia</a> information, wheelchair\naccess, and more.</p>\n<p>At the bottom of the inspector, click &#39;Additional tags&#39; to add arbitrary\nother tags to the element. <a href=\"http://taginfo.openstreetmap.org/\">Taginfo</a> is a\ngreat resource for learn more about popular tag combinations.</p>\n<p>Changes you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the Undo button.</p>\n<h3>Closing the Inspector</h3>\n<p>You can close the inspector by either clicking the close button in the top-right,\npressing the &#39;Escape&#39; key, or clicking on the map.</p>\n",
+        "html": "<p>The inspector is the user interface element on the right-hand side of the\npage that appears when a feature is selected and allows you to edit its details.</p>\n<h3>Selecting a Feature Type</h3>\n<p>After you add a point, line, or area, you can choose what type of feature it\nis, like whether it&#39;s a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you&#39;re looking for in the search box.</p>\n<p>Click the &#39;i&#39; in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.</p>\n<h3>Using Forms and Editing Tags</h3>\n<p>After you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.</p>\n<p>Below the fields you see, you can click icons to add other details,\nlike <a href=\"http://www.wikipedia.org/\">Wikipedia</a> information, wheelchair\naccess, and more.</p>\n<p>At the bottom of the inspector, click &#39;Additional tags&#39; to add arbitrary\nother tags to the element. <a href=\"http://taginfo.openstreetmap.org/\">Taginfo</a> is a\ngreat resource for learn more about popular tag combinations.</p>\n<p>Changes you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the &#39;Undo&#39; button.</p>\n<h3>Closing the Inspector</h3>\n<p>You can close the inspector by clicking the close button in the top-right,\npressing the &#39;Escape&#39; key, or clicking on the map.</p>\n",
         "title": "Using the Inspector"
     },
     {

data/doc/00-help.md

@@ -1,7 +1,7 @@
 # Help
 
 This is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the
-free and editable map of the world. You can use it to fix and update
+free and editable map of the world. You can use it to add and update
 data in your area, making an open-source and open-data map of the world
 better for everyone.
 
@@ -9,5 +9,5 @@ Edits that you make on this map will be visible to everyone who uses
 OpenStreetMap. In order to make an edit, you'll need a
 [free OpenStreetMap account](https://www.openstreetmap.org/user/new).
 
-[iD Editor](http://ideditor.com/) is a collaborative project with [source
+The [iD editor](http://ideditor.com/) is a collaborative project with [source
 code available on GitHub](https://github.com/systemed/iD).

data/doc/01-editing-saving.md

@@ -5,17 +5,17 @@ it through a website right now.
 
 ### Selecting Features
 
-To select a map feature, like a road or point of interest, simply single-click
-on it on the map. This will highlight the selected feature, show a panel of
-details, and also show a menu of things you can do with the feature.
+To select a map feature, like a road or point of interest, click
+on it on the map. This will highlight the selected feature, open a panel with
+details about it, and show a menu of things you can do with the feature.
 
 Multiple features can be selected by holding the 'Shift' key, clicking,
 and dragging on the map. This will select all features within the box
-that's drawn, and you can do certain 'batch operations' on all features.
+that's drawn, allowing you to do things with several features at once.
 
 ### Saving Edits
 
-When you create changes, like editing roads, buildings, and places, these are
+When you make changes like editing roads, buildings, and places, these are
 stored locally until you save them to the server. Don't worry if you make
 a mistake - you can undo changes by clicking the undo button, and redo
 changes by clicking the redo button.
@@ -25,7 +25,8 @@ an area of town and would like to start on a new area. You'll have a chance
 to review what you've done, and the editor supplies helpful suggestions
 and warnings if something doesn't seem right about the changes.
 
-Clicking 'Save' again, on the new dialog, will post the changes
+If everything looks good, you can enter a short comment explaining the change
+you made, and click 'Save' again to post the changes
 to [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible
 to all other users and available for others to build and improve upon.
 

data/doc/03-road.md

@@ -13,10 +13,11 @@ about the road.
 ### Modifying
 
 Often you'll see roads that aren't aligned to the imagery behind them
-or a GPS track.
+or to a GPS track. You can adjust these roads so they are in the correct
+place.
 
 First click on the road you want to change. This will highlight it and show
-'control points along it' that you can drag to better locations. If
+control points along it that you can drag to better locations. If
 you want to add new control points for more detail, double-click a part
 of the road without a point, and one will be added.
 
@@ -25,7 +26,7 @@ the map, you can drag one of its control points onto the other road in
 order to join them. Having roads connect is important for the map
 and essential for providing driving directions.
 
-You can also click the 'Move' tool or type `M` to move the entire road at
+You can also click the 'Move' tool or press the `M` shortcut key to move the entire road at
 one time, and then click again to save that movement.
 
 ### Deleting
@@ -42,12 +43,13 @@ trash can icon or pressing the 'Delete' key.
 ### Creating
 
 Found somewhere there should be a road but there isn't? Click the 'Line'
-icon in the top-left of the editor or press the key '2' to start drawing
+icon in the top-left of the editor or press the shortcut key `2` to start drawing
 a line.
 
 Click on the start of the road on the map to start drawing. If the road
-connects to another road, first, click on the place where they connect.
+branches off from an existing road, start by clicking on the place where they connect.
 
 Then click on points along the road so that it follows the right path, according
-to satellite imagery or GPS. When you're done drawing the road, double-click
+to satellite imagery or GPS. If the road you are drawing crosses another road, connect
+it by clicking on the intersection point. When you're done drawing, double-click
 or press 'Return' or 'Enter' on your keyboard.

data/doc/04-gps.md

@@ -8,7 +8,7 @@ personal GPS hardware.
 For information on how to perform a GPS survey, read
 [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).
 
-To use a GPX track for mapping, drag and drop the GPX file onto the map map
+To use a GPX track for mapping, drag and drop the GPX file onto the map
 editor. If it's recognized, it will be added to the map as a bright green
 line. Click on the 'Background Settings' menu on the left side to enable,
 disable, or zoom to this new GPX-powered layer.

data/doc/05-imagery.md

@@ -7,11 +7,10 @@ in the editor under the 'Background Settings' menu on the left.
 By default a [Bing Maps](http://www.bing.com/maps/) satellite layer is
 presented in the editor, but as you pan and zoom the map to new geographical
 areas, new sources will become available. Some countries, like the United
-States, France, and Denmark have very high-resolution, high-quality imagery
-available for smaller geographical coverages.
+States, France, and Denmark have very high-quality imagery available for some areas.
 
 Imagery is sometimes offset from the map data because of a mistake on the
-imagery provider's side - so if you see many roads shifted from the background,
-don't immediately go to move them all. You can set an offset for imagery
-by clicking 'Fix alignment' at the bottom of the bottom of the Background
-Settings UI.
+imagery provider's side. If you see a lot of roads shifted from the background,
+don't immediately move them all to match the background. Instead you can adjust
+the imagery so that it matches the existing data by clicking 'Fix alignment' at
+the bottom of the Background Settings UI.

data/doc/07-inspector.md

@@ -1,22 +1,25 @@
 # Using the Inspector
 
 The inspector is the user interface element on the right-hand side of the
-page that appears when an element is selected and allows to edit its details.
+page that appears when a feature is selected and allows you to edit its details.
 
-### Selecting a Preset
+### Selecting a Feature Type
 
-The inspector has two modes: the first allows you to pick a preset, or
-predetermined selection of forms and tags.
+After you add a point, line, or area, you can choose what type of feature it
+is, like whether it's a highway or residential road, supermarket or cafe.
+The inspector will display buttons for common feature types, and you can
+find others by typing what you're looking for in the search box.
 
-Click the 'i' in the bottom-right-hand corner of a preset option to learn
-more about it. Click a preset to choose it.
+Click the 'i' in the bottom-right-hand corner of a feature type button to
+learn more about it. Click a button to choose that type.
 
 ### Using Forms and Editing Tags
 
-The second allows you to edit the
-attributes of a map element using those forms and tags.
+After you choose a feature type, or when you select a feature that already
+has a type assigned, the inspector will display fields with details about
+the feature like its name and address.
 
-Below the forms you see, you can click icons to add more easy-to-use forms,
+Below the fields you see, you can click icons to add other details,
 like [Wikipedia](http://www.wikipedia.org/) information, wheelchair
 access, and more.
 
@@ -25,9 +28,9 @@ other tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a
 great resource for learn more about popular tag combinations.
 
 Changes you make in the inspector are automatically applied to the map.
-You can undo them at any time by clicking the Undo button.
+You can undo them at any time by clicking the 'Undo' button.
 
 ### Closing the Inspector
 
-You can close the inspector by either clicking the close button in the top-right,
+You can close the inspector by clicking the close button in the top-right,
 pressing the 'Escape' key, or clicking on the map.

data/locales.js

@@ -139,7 +139,7 @@ locale.en = {
     "nothing_to_redo": "Nothing to redo.",
     "just_edited": "You just edited OpenStreetMap!",
     "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
-    "view_on_osm": "View on OSM",
+    "view_on_osm": "View on OSM →",
     "zoom_in_edit": "zoom in to edit the map",
     "logout": "logout",
     "report_a_bug": "report a bug",