Rev 6376: (gz) Add missing release notes for previously landed branches (Martin in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6376 [merge]
revision-id: pqm at pqm.ubuntu.com-20111215124354-r79d90ukkqzpfeyf
parent: pqm at pqm.ubuntu.com-20111215121853-1jw97a5rjazzqnbi
parent: martin.packman at canonical.com-20111215115455-x0asmkn6nm0bp5wx
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-12-15 12:43:54 +0000
message:
  (gz) Add missing release notes for previously landed branches (Martin
   Packman)
modified:
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-12-15 08:46:12 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-12-15 11:54:55 +0000
@@ -63,6 +63,9 @@
 * Properly ignore '\n' in an option reference since this cannot be part of a
   config option identifier. (Vincent Ladeuil, #902125)
 
+* Report mistake trying to move a removed file with a non-ascii name without
+  UnicodeEncodeError being raised. (Martin Packman, #898541)
+
 Documentation
 *************
 
@@ -97,6 +100,12 @@
   branches themselves. The active branch uses the key None.
   (Neil Martinsen-Burrell)
 
+* Helper ``win32utils.get_environ_unicode`` added for avoiding encoding
+  problems with ``os.environ.get`` use. (Martin Packman, #262874) 
+
+* Helper ``osutils.path_from_environ`` added for extracting a unicode path
+  from an environment variable. (Martin Packman, #832028)
+
 * New HPSS call ``BzrDir.checkout_metadir``. (Jelmer Vernooij, #894459)
 
 * New HPSS call ``VersionedFileRepository.get_inventories``,
@@ -226,7 +235,7 @@
   unreserved characters are unquoted in URLs. (Martin Packman, #842223)
 
 * Split segments from URLs for colocated branches without assuming the
-  combined form is a valid. (Martin Packman, #842233)
+  combined form is valid. (Martin Packman, #842233)
 
 * Support looking up revision numbers by revision id in empty branches.
   (Jelmer Vernooij, #535031)