diff --git a/docs/mintty.1.html b/docs/mintty.1.html
index 94c33d86..c9d8e847 100644
--- a/docs/mintty.1.html
+++ b/docs/mintty.1.html
@@ -1,5 +1,5 @@
-
+
@@ -331,8 +331,9 @@
USAGE
Menus
The context menu can be opened by right-clicking the mouse
-or by pressing the Menu key that is normally located
-next to the right Ctrl key.
+(with Shift in case right-click has been redefined) or by
+pressing the Menu key that is normally located next
+to the right Ctrl key.
Mintty also
adds a couple of items to the window menu, which can be
@@ -818,10 +819,13 @@
CONFIGURATION
Normal/Regular (FontWeight=400) and
Bold (FontWeight=700 or FontIsBold=yes) but if a font
family has a different scheme or more than 2 font weights,
-the weight value can be used for more specific selection.
-
+the weight value can be used for more specific selection. If
+a font family has no bold weight but boldness was requested,
+mintty does not adhere to this scheme but enforces bold font
+selection; however, in this case the bold attribute may not
+be effective.
– Show "hidden" fonts
-(ShowHiddenFonts=no) This hidden settings enables display of
+(ShowHiddenFonts=no): This hidden setting enables display of
monospace fonts in the font selection menu even if they are
marked to Hide in the Windows Font settings (from the
Control Panel — Fonts folder).
@@ -847,7 +851,7 @@ CONFIGURATION
Note that when
BoldAsFont is enabled, only bold text in one of the
eight ANSI colours has its colour changed, i.e. bold text
-without an explicitly spefified colour is shown with a bold
+without an explicitly specified colour is shown with a bold
font only. This matches xterm behaviour.
This option
@@ -897,6 +901,11 @@
CONFIGURATION
LANG is set according to the selected locale and
character set.
+
Note:
+This means, while not strictly necessary, that also locale
+variables unrelated to the terminal character set (e.g.
+LC_MESSAGES) are cleared to avoid confusion.
+
Character set
(Charset=)
@@ -909,7 +918,7 @@ CONFIGURATION
and ouput, it does not affect the processes already running
in mintty. This is because the environment variables of a
running process cannot be changed from outside that process.
-Therefore mintty needs to be restarted for a character set
+Therefore mintty should be restarted for a character set
change to take full effect.
Keys
@@ -1341,8 +1350,15 @@
CONFIGURATION
used to specify a log file that all output is copied into.
If it is empty, as it is by default, no logging is done. If
it contains %d it will be substituted with the
-process ID. See also the script(1) utility for a more
-flexible logging solution.
+process ID. If it contains % placeholders other than
+a single %d, the log file name will be constructed by
+calling strftime(3) on the pattern; note that this is likely
+to fail if a placeholder expands with "/"
+(%D).
+
+
See also the
+script(1) utility for a more flexible logging
+solution.
Window title
(Title=)
diff --git a/src/appinfo.h b/src/appinfo.h
index 427667f2..5be3cc36 100644
--- a/src/appinfo.h
+++ b/src/appinfo.h
@@ -6,7 +6,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 3
-#define PATCH_NUMBER 5
+#define PATCH_NUMBER 6
#define BUILD_NUMBER 0
// needed for res.rc
diff --git a/wiki/Changelog.md b/wiki/Changelog.md
index 24b1a523..0a33f245 100644
--- a/wiki/Changelog.md
+++ b/wiki/Changelog.md
@@ -1,3 +1,5 @@
+### 2.3.6 (30 Apr 2016) ###
+
Font configuration:
* Tweaked font weight selection (#520) to enforce selected boldness.
* Showing font warning on stderr rather than message box if possible (#527).