From c0dad919d6f385f38732516f5ba1de62e0f71660 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 17 Feb 2004 06:29:19 +0000
Subject: [PATCH] Updated.

---
 ChangeLog          | 8 +++-----
 plugins/Weather.py | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29a6e918b..a3fa31b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
-	* Changed the format of the Alias database, and also its location
-	(to go to your configuration directory rather than your data
-	directory now).  Be sure, if you're upgrading, to run
-	tools/aliasConvert.py on your Alias.db *BEFORE* installing the new
-	version.
+	* Added the ability to reply to factoids without the "whatis" in
+	the Factoids plugin.  Now, you can use "@foo" instead of "@whatis
+	foo".
 	
 	* Changed the format of the user and channel databases to
 	something much more readable and user-editable.  Be sure, if
diff --git a/plugins/Weather.py b/plugins/Weather.py
index 20961174c..158a60843 100644
--- a/plugins/Weather.py
+++ b/plugins/Weather.py
@@ -88,7 +88,7 @@ class Weather(callbacks.Privmsg):
     # The weather we pull uses weird codes.  Map obvious ones here.
     _countryMap = {'uk': 'gb'}
     def weather(self, irc, msg, args):
-        """<US zip code> <US/Canada city, state> <Foreign city, country>
+        """<US zip code | US/Canada city, state | Foreign city, country>
 
         Returns the approximate weather conditions for a given city.
         """