Merge 16891:17044 from trunk.

[rails.git] / config / potlatch / localised / en / help.html

diff --git a/config/potlatch/localised/en/help.html b/config/potlatch/localised/en/help.html
old mode 100755 (executable)
new mode 100644 (file)
index e69f4b0..55c4a51
--- a/config/potlatch/localised/en/help.html
+++ b/config/potlatch/localised/en/help.html
@@ -74,7 +74,7 @@ The best type of GPS is one that records to the tracklog frequently (every secon
 <column/><headline>Uploading your track</headline>
 <bodyText>Now, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try <a href="http://www.gpsbabel.org/" target="_blank">GPSBabel</a>. Whatever, you want the file to be in GPX format.
 
 <column/><headline>Uploading your track</headline>
 <bodyText>Now, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try <a href="http://www.gpsbabel.org/" target="_blank">GPSBabel</a>. Whatever, you want the file to be in GPX format.
 

-Then use the 'GPS Traces' tab to upload your track to the OpenStreetMap server. But this is only the first bit - it won't appear on the map yet. You need to draw and name the roads yourself, using the track as a guide.</bodyText>
+Then use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.</bodyText>

 <headline>Using your track</headline>
 <bodyText>Find your uploaded track in the 'GPS Traces' listing, and click 'edit' <i>right next to it</i>. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!
 
 <headline>Using your track</headline>
 <bodyText>Find your uploaded track in the 'GPS Traces' listing, and click 'edit' <i>right next to it</i>. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!
 


@@ -156,13 +156,12 @@ You can 'revert' to a previously saved version of a way or point. Select it, the
 If you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the padlock (by the ID); and save as usual.
 
 Think someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.
 If you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the padlock (by the ID); and save as usual.
 
 Think someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.

+
+Use the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.

 </bodyText><column/><headline>FAQs</headline>
 <bodyText><b>How do I see my waypoints?</b>
 Waypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.
 
 </bodyText><column/><headline>FAQs</headline>
 <bodyText><b>How do I see my waypoints?</b>
 Waypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.
 

-<b>Why can't I type text with accents?</b>
-<u>Linux users only</u>: This is a bug in Adobe Flash Player for Linux. We can't do anything until Adobe fixes it - sorry. Until then, you can copy and paste from elsewhere.
-

 More FAQs for <a href="http://wiki.openstreetmap.org/wiki/Potlatch/FAQs" target="_blank">Potlatch</a> and <a href="http://wiki.openstreetmap.org/wiki/FAQ" target="_blank">OpenStreetMap</a>.
 </bodyText>
 
 More FAQs for <a href="http://wiki.openstreetmap.org/wiki/Potlatch/FAQs" target="_blank">Potlatch</a> and <a href="http://wiki.openstreetmap.org/wiki/FAQ" target="_blank">OpenStreetMap</a>.
 </bodyText>
 


@@ -202,6 +201,8 @@ Page 7: Quick reference
 C      Close <u>c</u>hangeset
 G      Show <u>G</u>PS tracks
 H      Show <u>h</u>istory
 C      Close <u>c</u>hangeset
 G      Show <u>G</u>PS tracks
 H      Show <u>h</u>istory

+I      Show <u>i</u>nspector
+J      <u>J</u>oin point to crossing ways

 K      Loc<u>k</u>/unlock current selection
 L      Show current <u>l</u>atitude/longitude
 M      <u>M</u>aximise editing window
 K      Loc<u>k</u>/unlock current selection
 L      Show current <u>l</u>atitude/longitude
 M      <u>M</u>aximise editing window