small fixes to help, and improve terrain grouping

data/help.cfg

@@ -1,7 +1,6 @@
 [help]
 [toplevel]
 sections=introduction,gameplay,units,abilities_section,traits_section,weapon_specials,terrains
-#sections=introduction,gameplay,traits
 topics=about,license
 [/toplevel]
 
@@ -65,7 +64,7 @@ Battle for Wesnoth is a turn-based fantasy strategy game somewhat unusual among
 [topic]
 id=fundamentals
 title= _ "Fundamentals of Gameplay"
-text= _ "These pages outline all you need to know to play Battle for Wesnoth. It covers how to play and the basic mechanics behind the game. For more detailed information on special situations and exceptions, please follow the links included." + _"
+text= _ "These pages outline all you need to know to play Battle for Wesnoth. They cover how to play and the basic mechanics behind the game. For more detailed information on special situations and exceptions, please follow the links included." + _"
 
 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>." + "
 
@@ -337,7 +336,7 @@ Most units receive about 60% defense in mountains, whereas Dwarves enjoy 70%."
 [/topic]
 
 [topic]
-id=terrain_swamp
+id=terrain_swamp_water
 title= _ "Swamp"
 text= "<img>src=terrain/swampwater.png align=left box=no</img>
 

data/terrain.cfg

@@ -1,6 +1,10 @@
 # Terrain configuration file. Defines how the terrain _work_ in the game. How
 # the terrains _look_ is defined in terrain_graphics.cfg .
 
+# NOTE: terrain id's are used implicitly by the in-game help:
+# each "[terrain] id=some_id" corresponds to "[section] id=terrain_some_id"
+# or "[topic] id=terrain_some_id" identifying its description in [help]
+
 [terrain]
 symbol_image=void
 id=shroud
@@ -64,16 +68,6 @@ heals=true
 gives_income=true
 [/terrain]
 
-[terrain]
-symbol_image=ice
-id=ice
-name= _ "Ice"
-char=i
-unit_height_adjust=-2
-aliasof=S
-light=true
-[/terrain]
-
 
 [terrain]
 symbol_image=bridge-n-s-tile
@@ -265,6 +259,16 @@ char=S
 light=true
 [/terrain]
 
+[terrain]
+symbol_image=ice
+id=ice
+name= _ "Ice"
+char=i
+unit_height_adjust=-2
+aliasof=S
+light=true
+[/terrain]
+
 [terrain]
 symbol_image=village-snow-tile
 id=snow_village
@@ -283,6 +287,14 @@ name= _ "Hills"
 char=h
 [/terrain]
 
+[terrain]
+symbol_image=desert-hills
+id=desert_hills
+name= _ "Desert Hills"
+char=J
+aliasof=h
+[/terrain]
+
 [terrain]
 symbol_image=snow-hills
 id=snow_hills
@@ -292,14 +304,6 @@ char=H
 aliasof=h
 [/terrain]
 
-[terrain]
-symbol_image=desert-hills
-id=desert_hills
-name= _ "Desert Hills"
-char=J
-aliasof=h
-[/terrain]
-
 [terrain]
 symbol_image=mountains
 id=mountains
@@ -322,6 +326,14 @@ name= _ "Forest"
 char=f
 [/terrain]
 
+[terrain]
+symbol_image=tropical-forest
+id=tropical_forest
+name= _ "Tropical Forest"
+aliasof=f
+char=T
+[/terrain]
+
 [terrain]
 symbol_image=snow-forest-tile
 id=snow_forest
@@ -331,14 +343,6 @@ aliasof=f
 char=F
 [/terrain]
 
-[terrain]
-symbol_image=tropical-forest
-id=tropical_forest
-name= _ "Tropical Forest"
-aliasof=f
-char=T
-[/terrain]
-
 [terrain]
 symbol_image=cavewall
 id=cavewall