From 8d19a2b257b9d7c119a56a9112ae839a274f8850 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Wed, 28 Mar 2007 08:40:24 -0700
Subject: [PATCH] [svn] Merge old trunk r2081: Don't say that services cannot
 be killed in ERR_ISCHANSERVICE message (given when trying to kick or deop
 them), as that's not the case.

---
 ChangeLog        | 12 ++++++++++++
 include/serno.h  |  2 +-
 src/messages.tab |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ccd615..cfe931c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+jilles      2007/03/28 15:30:56 UTC	(20070328-3305)
+  Log:
+  Merge old trunk r2059
+  Clarifications to the descriptions of umode +Q and cmode +F,
+  suggested by Ariadne@SorceryNet.
+  
+
+  Changes:	Modified:
+  +6 -0		trunk/doc/sgml/oper-guide/cmodes.sgml (File Modified) 
+  +4 -3		trunk/doc/sgml/oper-guide/umodes.sgml (File Modified) 
+
+
 jilles      2007/03/28 15:22:49 UTC	(20070328-3303)
   Log:
   Merge old trunk r2907,r2991:
diff --git a/include/serno.h b/include/serno.h
index a583c89..5e6fdda 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3303"
+#define SERNO "20070328-3305"
diff --git a/src/messages.tab b/src/messages.tab
index 6bb0230..b5ef187 100644
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -16,7 +16,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: messages.tab 2731 2006-11-09 23:53:43Z jilles $
+ *   $Id: messages.tab 3307 2007-03-28 15:40:24Z jilles $
  */
 
 static  const char *  replies[] = {
@@ -506,7 +506,7 @@ static  const char *  replies[] = {
 /* 481 ERR_NOPRIVILEGES, */	":Permission Denied - You're not an IRC operator",
 /* 482 ERR_CHANOPRIVSNEEDED, */ ":%s 482 %s %s :You're not channel operator",
 /* 483 ERR_CANTKILLSERVER, */   ":You can't kill a server!",
-/* 484 ERR_ISCHANSERVICE */     ":%s 484 %s %s %s :Cannot kill, kick or deop a network service",
+/* 484 ERR_ISCHANSERVICE */     ":%s 484 %s %s %s :Cannot kick or deop a network service",
 /* 485 ERR_BANNEDNICK, */	NULL,
 /* 486 ERR_NONONREG */          "%s :You must log in with services to message this user",
 /* 487 */       NULL,