small parallel way fix, plus handy new 'join' keypress (J)

diff --git a/config/potlatch/localised/en/help.html b/config/potlatch/localised/en/help.html
index e69f4b00fe6389d502a9b173c145ced628938873..55c4a515c23c6d1f494d3e2a1f0462d4688417e3 100644 (file)
--- 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.
 
-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!
 
@@ -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'.
+
+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.
 
-<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>
 
@@ -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
+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

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 74e021a6f4612beaf129716566f6db377f065cec..6557e79202d4442d193373d1589c92beadef849f 100644 (file)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ