Merge 2011.1.

diff --cc user_docs/en/changes.t2t
index 2f48cd1,49e7df7..f9042f9
--- 1/user_docs/en/changes.t2t
--- 2/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@@ -3,28 -3,8 +3,29 @@@
  \r
  %!includeconf: ../changes.t2tconf\r
  \r
 += 2011.2 =\r
 +\r
 +== New Features ==\r
 +- It is now possible to hear the description for any given character by pressing the review current character script twice in quick succession.  For English characters this is the standard English phonetic alphabet. For languages such as traditional Chinese, example phraises using the given symbol are provided. Also pressing review current word or review current line three times will spell the word/line using these descriptions.\r
 +\r
 +\r
 +== Changes ==\r
 +- To move the caret to the review cursor, now press the move focus to navigator object script (desktop NVDA+shift+numpadMinus, laptop NVDA+shift+backspace) twice in quick succession. This frees up more keys on the keyboard. (#837)\r
 +- To hear the  decimal and hexadecimal representation of the character under the review cursor, now press review current character three times rather than twice, as twice now speaks the character description.\r
 +\r
 +\r
 +== Bug Fixes ==\r
 +- Collapsing combo boxes in a virtual buffer when focus mode has been forced with NVDA+space no longer auto-switches back to browse mode. (#1386)\r
 +- In Gecko (e.g. Firefox) and MSHTML (e.g. Internet Explorer) documents, NVDA now correctly renders certain text on the same line which was previously rendered on separate lines. (#1378)\r
 +\r
 +\r
 +== Changes for Developers ==\r
 +- Developer documentation can now be generated using SCons. See readme.txt at the root of the source distribution for details, including associated dependencies.\r
 +- Translators can now provide descriptions for characters in a characterDescriptions.dic file placed inside their locale directory. The file should be utf8, and contain lines made up of the character, followed by a tab, then one or more descriptions separated by tabs.\r
 +\r
 +\r
  = 2011.1.1 =\r
+ This release fixes several security and other important issues found in NVDA 2011.1.\r
  \r
  == Bug Fixes ==\r
  - The Donate item in the NVDA menu is now disabled when running on the logon, lock, UAC and other secure Windows screens, as this is a security risk. (#1419)\r