# 
# patch "ChangeLog"
#  from [bf8ce70a95de065b58a2b022b2c1d8cf07c2b1eb]
#    to [b8de069918d7329cd130d1d433c6d7cb6703c568]
# 
# patch "monotone.texi"
#  from [45ece9cd26bf52700e17578a803b431bdbdb7a3c]
#    to [5b6a6b87eae80009ef88f9c5f58dddcea441c296]
# 
# patch "win32/fs.cc"
#  from [8cd087e6761f376628ada87695722a691b5a94ae]
#    to [2ecc23a1ab514df19d2da8453fbd2a366837709b]
# 
========================================================================
--- ChangeLog	bf8ce70a95de065b58a2b022b2c1d8cf07c2b1eb
+++ ChangeLog	b8de069918d7329cd130d1d433c6d7cb6703c568
@@ -1,3 +1,8 @@
+2005-10-10  Matthew Gregan  <address@hidden>
+
+	* monotone.texi: Fix a typo.
+	* win32/fs.cc (get_homedir): Clarify comment.
+
 2005-10-09  Matthew Gregan  <address@hidden>
 
 	* contrib/usher.cc (main): Reset parser state for config file
========================================================================
--- monotone.texi	45ece9cd26bf52700e17578a803b431bdbdb7a3c
+++ monotone.texi	5b6a6b87eae80009ef88f9c5f58dddcea441c296
@@ -5691,7 +5691,7 @@
 
 @menu
 * Hooks::                     All hooks called by monotone.
-* Additional Lua Functions::  Extra functionality availabe to hook writers.
+* Additional Lua Functions::  Extra functionality available to hook writers.
 @end menu
 
 @page
========================================================================
--- win32/fs.cc	8cd087e6761f376628ada87695722a691b5a94ae
+++ win32/fs.cc	2ecc23a1ab514df19d2da8453fbd2a366837709b
@@ -41,6 +41,16 @@
   // See thread on monotone-devel:
   //   Message-Id: <address@hidden>
   //   URL: http://lists.gnu.org/archive/html/monotone-devel/2005-02/msg00241.html
+  // Since the discussion above, the code has been reverted to use always
+  // HOME if it is set.  We now use APPDATA (e.g. C:\Documents And
+  // Settings\user\Application Data) rather than USERPROFILE so that we're a
+  // better behaved Windows application.  There is still one potentially
+  // confusing case where a user is switching between Cygwin/MinGW shells
+  // and a Windows command prompt where HOME is only set up inside the
+  // Cygwin/MinGW shells and not globally--in this case, monotone will use
+  // HOME inside the Cygwin/MinGW shell and something else (probably
+  // APPDATA) when run in the Windows command prompt.  In many ways, it's
+  // tempting to simplify this code to always and only use APPDATA.
   char * home;
   L(F("Searching for home directory\n"));
   // First try MONOTONE_HOME, to give people a way out in case the cruft below