[svn] Fix description of 043 numeric.

diff --git a/ChangeLog b/ChangeLog
index 5732fa8bfbd8f38835800ce63208a0f620041e05..0ae63f6a0b0b73da2fd3f7cb1d763912a7df40e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+jilles      2007/04/22 14:02:54 UTC    (20070422-3420)
+  Log:
+  SAVE: make the nickTS of the UID nick equal to 100, so it
+  is always in sync on the network.
+  
+
+  Changes:     Modified:
+  +5 -0                trunk/doc/collision_fnc.txt (File Modified) 
+  +15 -11      trunk/modules/core/m_nick.c (File Modified) 
+
+
 jilles      2007/04/22 11:22:10 UTC    (20070422-3418)
   Log:
   Force nickTS to increase when a local user changes their nick.

diff --git a/doc/collision_fnc.txt b/doc/collision_fnc.txt
index 81ff23ae5dad8f9689089bc7e928f43da63a2820..397c0679bdadffded0af48bd0aae5b3a2679e8cb 100644 (file)
--- a/doc/collision_fnc.txt
+++ b/doc/collision_fnc.txt
@@ -6,7 +6,8 @@ Nick collision FNC performs a forced nick change to the user's UID instead
 of a kill. The criteria for which user may keep the nick are the same as
 before. Server notices will say the clients are being "saved" instead of
 "killed". The client will get a 043 numeric, like this:
-:<server> 043 <uid> :Nick collision, forcing nick change to your unique ID
+
+:<server> 043 <nick> <uid> :Nick collision, forcing nick change to your unique ID
 
 The following conditions must be fulfilled:
 
@@ -43,4 +44,4 @@ nick changes their nick but is collided again (the server detecting the
 collision will not propagate the nick change further).
 
 -- 
-$Id: collision_fnc.txt 3420 2007-04-22 14:02:54Z jilles $
+$Id: collision_fnc.txt 3422 2007-04-22 14:35:28Z jilles $

diff --git a/include/serno.h b/include/serno.h
index cbe27f72435cb847524fdc9c342518a6ffd90b55..640465e455019abb42efd757eb6ed24535675528 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070422-3418"
+#define SERNO "20070422-3420"