9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[svn] Merge old trunk r2081:

Browse source 
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.
This commit is contained in:
jilles 2007-03-28 08:40:24 -07:00
parent e7d250a693
commit 8d19a2b257
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -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) jilles 2007/03/28 15:22:49 UTC (20070328-3303)
Log: Log:
Merge old trunk r2907,r2991: Merge old trunk r2907,r2991:

2
include/serno.h
View file

@ -1 +1 @@
#define SERNO "20070328-3303" #define SERNO "20070328-3305"

4
src/messages.tab
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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[] = { static const char * replies[] = {
@ -506,7 +506,7 @@ static const char * replies[] = {
/* 481 ERR_NOPRIVILEGES, */ ":Permission Denied - You're not an IRC operator", /* 481 ERR_NOPRIVILEGES, */ ":Permission Denied - You're not an IRC operator",
/* 482 ERR_CHANOPRIVSNEEDED, */ ":%s 482 %s %s :You're not channel operator", /* 482 ERR_CHANOPRIVSNEEDED, */ ":%s 482 %s %s :You're not channel operator",
/* 483 ERR_CANTKILLSERVER, */ ":You can't kill a server!", /* 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, /* 485 ERR_BANNEDNICK, */ NULL,
/* 486 ERR_NONONREG */ "%s :You must log in with services to message this user", /* 486 ERR_NONONREG */ "%s :You must log in with services to message this user",
/* 487 */ NULL, /* 487 */ NULL,