Changes between Version 89 and Version 90 of Help

Timestamp:

2009-10-17T11:16:18+02:00 (16 years ago)

Author:

anonymous

Comment:

--

Help

@@ -1 +1 @@
 [[TranslatedPages]]
-= Welcome to JOSM online help system =
+= Welcome to the JOSM online help system =
 
-You can improve this help by clicking on "Open in Browser" below.
+From JOSM cou can reach this page 
+  * by clicking the menu item [[Image(source:/trunk/images/help.png)]]''Help->Help'' 
+  * by clicking on one of a [[Image(source:/trunk/images/help.png)]] help button in one of the JOSM dialogs
+  * by pressing '''F1''' 
 
-If you have reached this page from pressing F1 in JOSM, then you can get more specific help on a particular window, dialog, or tool. Simply place the mouse cursor over that item prior to pressing F1.
+{{{
+#!html
+<p style="background-color:rgb(253,255,221);padding: 10pt; border-color:rgb(128,128,128);border-style: solid; border-width: 1px;">
+<strong>Please help to improve online help information.</strong><br/>
+This help might get outdated from time to time. Please help improving it by fixing parts that are missing or outdated - this is a wiki!
+</p>
+}}}
 
+[[TOC(inline)]]
 
-''' Beware: This help might get outdated from time to time! Please help improving it by fixing parts that are missing or outdated - this is a wiki! '''
-
-== Table of Contents ==
-
-=== Getting Started ===
+== Getting Started ==
  * [wiki:Introduction Introduction to JOSM]
  * JOSM Page on the OSM wiki: [http://wiki.openstreetmap.org/wiki/Josm]
@@ -20 +26 @@
  * [wiki:Shortcuts Keyboard shortcuts]
 
-=== Concepts ===
+== Concepts ==
  
  * [wiki:Help/Concepts/Object Objects] - explains what '''objects''' maps consist of and how these objects are described in detail 
@@ -27 +33 @@
 
 
-=== JOSM interface ===
+== JOSM interface ==
 
 [[Image(josm-screen-commented.png)]]
 
+=== Map View ===
  * [wiki:Help/MapView Map View] - The main area, where editing takes place
 
- * '''Main Menu''' (''note: depending on which [wiki:Help/Preferences/Plugins plugins] you have installed you may have more options on this menu'')
+=== Main Menu === 
+Depending on which [wiki:Help/Preferences/Plugins plugins] you have installed you may have more options on this menu.
+
    * [wiki:Help/Menu/File File]
    * [wiki:Help/Menu/Edit Edit]
@@ -43 +52 @@
    * [wiki:Help/Menu/Help Help]
 
+=== Toolbars ===
  * [wiki:/Help/MainToolbar Main Toolbar] - the toolbar above the main JOSM window. [[BR]]  
    This toolbar is highly customisable, with the ability to add and remove menus items from the [wiki:Help/Action/Preferences preferences] dialog.
@@ -48 +58 @@
  * [wiki:/Help/EditToolbar Edit Toolbar] - the toolbar down the left hand side of the main JOSM window
 
+=== Toogle Dialogs ===
  * [wiki:/Help/ToggleDialogs Toggle Dialogs] - lower left part of JOSM window
 
-=== JOSM Plugins ===
+=== Other dialogs ===
+ * [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] - use the Conflict Dialog to [wiki:/Help/Concepts/Conflict resolve conflicts].
+
+== JOSM Plugins ==
    * A list of available plugins can be found at the [wiki:Plugins plugin page].
    * Information and Documentation about various JOSM plugins can be found here: [http://wiki.openstreetmap.org/index.php/JOSM/Plugins]
 
-=== JOSM error messages ===
+== JOSM error messages ==
    * [wiki:Help/ErrorMsg/something_general Something General]
    * [wiki:Help/ErrorMsg/ErrorParsing Error while parsing] '''outdated'''