From 260f925ad9cbfa2d9bfe95c31679331e0ee69258 Mon Sep 17 00:00:00 2001
From: Itms <itms@wildfiregames.com>
Date: Sun, 5 Jun 2016 20:48:22 +0000
Subject: [PATCH] Some fixes and improvements suggested by leper

This was SVN commit r18336.
---
 binaries/data/config/default.cfg                    | 8 ++++++--
 binaries/data/mods/public/gui/common/tooltips.js    | 2 +-
 binaries/data/mods/public/gui/manual/userreport.txt | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 154ab3c1fb..2170c19e48 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -4,8 +4,12 @@
 ; * DO NOT EDIT THIS FILE if you want personal customisations: *
 ; * create a text file called "local.cfg" instead, and copy    *
 ; * the lines from this file that you want to change.          *
-; * You also need to copy the section tags ([hotkey], [gui],   *
-; * etc.) for the things you change.                           *
+; *                                                            *
+; * If a setting is part of a section (for instance [hotkey])  *
+; * you need to append the section name at the beginning of    *
+; * your custom line (for instance you need to write           *
+; * "hotkey.pause = Space" if you want to change the pausing   *
+; * hotkey to the spacebar).                                   *
 ; *                                                            *
 ; * On Linux, create:                                          *
 ; *   $XDG_CONFIG_HOME/0ad/config/local.cfg                    *
diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index 5ba2c77456..6422947bab 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -457,7 +457,7 @@ function getHealerTooltip(template)
 		sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", template.healer.HP), {
 			"label": g_TooltipTextFormats.header[0] + translate("Heal:") + g_TooltipTextFormats.header[1],
 			"val": template.healer.HP,
-			// Translation: Short for hitpoints (that are healed in one healing action)
+			// Translation: Short for hit points (or health points) that are healed in one healing action
 			"unit": g_TooltipTextFormats.unit[0] + translatePlural("HP", "HP", template.healer.HP) + g_TooltipTextFormats.unit[1]
 		}),
 		sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", template.healer.Range), {
diff --git a/binaries/data/mods/public/gui/manual/userreport.txt b/binaries/data/mods/public/gui/manual/userreport.txt
index 18418d0680..96876e7ebe 100644
--- a/binaries/data/mods/public/gui/manual/userreport.txt
+++ b/binaries/data/mods/public/gui/manual/userreport.txt
@@ -2,7 +2,7 @@ As a free, open source game, we don't have the resources to test on a wide range
 
 The following data will be sent to our server:
 
-• A random user ID (stored in %APPDATA%\0ad\config\user.cfg on Windows, $HOME/.config/0ad/config/user.cfg on Unix), to let us detect repeated reports from the same user.
+• A random user ID (stored in %APPDATA%\0ad\config\user.cfg on Windows, ~/.config/0ad/config/user.cfg on Unix), to let us detect repeated reports from the same user.
 • Game version number and basic build settings (optimisation mode, CPU architecture, timestamp, compiler version).
 • Hardware details: OS version, graphics driver version, OpenGL capabilities, screen size, CPU details, RAM size.
 • Performance details: a snapshot of timing data a few seconds after you start a match or change graphics settings.