better fix for 14134, restore tooltip image in help

changelog

@@ -10,16 +10,17 @@ CVS HEAD:
    * improve layout of some parts of help (#14075)
  * campaigns
    * Eastern Invasion: revisions to Weldyn Under Attack and Evacuation
+   * The Rise of Wesnoth: fixed glitch in The River Road (forum thread 7148)
  * graphics and sound
    * new unit portraits for Ghoul, Mermaid Initiate, Merman Fighter,
-     Merman Hunter,Naga Fighter, Nagini Fighter
-   * revised unit images and animations for Duelist, Elvish Shyde, Fencer,
-     Master at Arms
+       Merman Hunter,Naga Fighter, Nagini Fighter
+   * revised unit images and/or animations for Duelist, Elvish Shyde, Fencer,
+       Heavy Infantryman, Master at Arms, Shock Trooper
    * fixed missing storm trident image (#14111)
    * new observer icon
    * fixed wrong ice missile image used by Elvish High Lord (#14132)
    * fixed Lich using wrong image (#14139)
-   * removed tooltip picture (#14134): with #14084 present this cannot be fixed
+   * replaced tooltip picture (#14134), note still English and not translatable
    * fixed broken scepter of fire and scepter attack icons (#14028,#14231)
  * user interface
    * fixed fonts sometimes not being found, eg. on BeOS
@@ -36,6 +37,8 @@ CVS HEAD:
    * show wait cursor for long operations, if not using color cursors (#12670)
    * part-fix campaign text overflowing due to width being too narrow (#13961)
    * fixed tooltips disappearing when using dfool's theme (#14084)
+ * revised multiplayer maps: Bluewater Province, Charge, Hamlets,
+     Hornshark Island, Meteor Lake, Sablestone Delta
  * fixed AI units not getting rest-healing, causing replay errors
  * fixed configure options --with-icondir and --with-desktopdir (#14100)
  * changed Merman hoplite to bring it up to date with changes to steadfast
@@ -43,7 +46,7 @@ CVS HEAD:
  * made checksums work on AMD64
  * revised network code, try to use non-blocking I/O if available
  * new description= attribute of [attack], name="x" now implies
-   description=_"x" and icon="attacks/x.png" if not specified (#12788,#14113)
+     description=_"x" and icon="attacks/x.png" if not specified (#12788,#14113)
  * various bug fixes and code cleanups
 
 Version 0.9.5:

data/help.cfg

@@ -70,14 +70,8 @@ text= _ "These pages outline all you need to know to play Battle for Wesnoth. Th
 
 To begin with, it's best to click the <italic>text=Tutorial</italic> button at the main menu. This will take you to the interactive tutorial, which will teach you the basics of Wesnoth. After this, it is recommended that you play the Heir to the Throne campaign first - click <italic>text=Campaign</italic> then <italic>text='Heir to the Throne'</italic>. As Battle for Wesnoth can be quite challenging, you may wish to start on <italic>text=Easy</italic>." + "
 
-" +
+<img>src=help/tooltip.png align=right float=yes</img>" +
 _"While playing, keep in mind that if you mouse-over many items in the game, such as the information displayed in the status pane, a brief description will be shown explaining that item. This is especially useful when you encounter new <ref>dst=abilities text=abilities</ref> for the first time."
-
-# removing for now:
-# essentially impossible to do a screenshot with split-second tooltip timeout
-#"
-#
-#<img>src=help/tooltip.png align=right float=yes</img>" + 
 [/topic]
 
 [topic]