diff --git a/ChangeLog b/ChangeLog
index 7416a8dfb..dbb94fa29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-02 08:19-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSDocumentController.m: Correct grammar in 
+	reviewUnsavedDocumentsWithAlertTitle:...  "Quit Anyways" should
+	be "Quit Anyway".
+
 2006-10-01 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSTrackingRect.m:
@@ -50,6 +56,7 @@
 	* Headers/Additions/GNUstepGUI/GSTheme.h: add -infoDictionary method
 	and documentation.
 
+>>>>>>> .r23712
 2006-09-26 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSWorkspace.m: Use png in preference to tiff.
diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m
index 0b3e099ee..718d311e0 100644
--- a/Source/NSDocumentController.m
+++ b/Source/NSDocumentController.m
@@ -520,7 +520,7 @@ static NSDictionary *TypeInfoForHumanReadableName (NSArray *types, NSString *typ
   result = NSRunAlertPanel(title, _(@"You have unsaved documents"),
 			   _(@"Review Unsaved"), 
 			   cancelString, 
-			   _(@"Quit Anyways"));
+			   _(@"Quit Anyway"));
   
 #define ReviewUnsaved NSAlertDefaultReturn
 #define Cancel        NSAlertAlternateReturn