From a88fc0a89771378865f6035b610412198f5009c3 Mon Sep 17 00:00:00 2001
From: nenolod <devnull@localhost>
Date: Sat, 26 May 2007 22:30:41 -0700
Subject: [PATCH] [svn] - update NEWS in preparation of upcoming 2.2 release
 this week

---
 ChangeLog       | 16 ++++++++++++++++
 NEWS            |  5 ++++-
 include/serno.h |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2bd460d2..0aee431eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+jilles      2007/05/24 15:10:06 UTC	(20070524-3478)
+  Log:
+  Move sno_channeljoin to unsupported, due to the privacy
+  issue and the fact that any oper with admin or hidden_admin
+  can load extensions.
+  
+
+  Changes:	Modified:
+  +0 -1		trunk/doc/example.conf (File Modified) 
+  +0 -2		trunk/doc/reference.conf (File Modified) 
+  +0 -46	trunk/extensions/Makefile.in (File Modified) 
+  + -		trunk/extensions/sno_channeljoin.c (File Deleted) 
+  +47 -1	trunk/unsupported/Makefile.in (File Modified) 
+  + -		trunk/unsupported/sno_channeljoin.c (File Added) 
+
+
 nenolod     2007/05/24 04:28:36 UTC	(20070524-3476)
   Log:
   - createoperonly: like createauthonly, but checks opered status instead of authed status
diff --git a/NEWS b/NEWS
index e3573acfb..697614ce7 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,9 @@ See LICENSE for licensing details (GPL v2).
 - Allow /invite (but not invex) to override +r, +l, +j in addition to +i.
 - Remove the need to compile in the maximum number of clients, it can be
   set in ircd.conf now.
+- Add several new extensions, including createoperonly, and sno_whois.
+- Use ERR_TARGETLEFTIRC in some places where appropriate, instead of vague
+  error messages.
 
 -- charybdis-2.1.2
 
@@ -375,5 +378,5 @@ modules in case the developers need them.
 Other files recommended for reading: BUGS, README.FIRST, INSTALL
 
 --------------------------------------------------------------------------------
-$Id: NEWS 3378 2007-04-03 11:45:22Z nenolod $
+$Id: NEWS 3480 2007-05-27 05:30:41Z nenolod $
 
diff --git a/include/serno.h b/include/serno.h
index 6d68ababf..8d726e9e3 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070524-3476"
+#define SERNO "20070524-3478"