about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-09-23 19:58:50 +0200
committerAlexander Barton <alex@barton.de>2012-09-23 20:06:14 +0200
commite3e181f4b3eae0e552632bce19bdff990196938f (patch)
treec20c120684ea51e14fbcec1cb25ba5b38026707e /doc
parentef82ef4ddb8b93e3d02197ffeed977d76dd99ba5 (diff)
parent1f2aa4da6f62124bdbed4f2dce7e40ed4b411e2a (diff)
downloadngircd-e3e181f4b3eae0e552632bce19bdff990196938f.tar.gz
ngircd-e3e181f4b3eae0e552632bce19bdff990196938f.zip
Merge branch 'bug92-xop'
By Alexander Barton (5) and Sebastian Köhler (2)

* bug92-xop:
  Fix NAMES/WHO response when client has multi-prefix
  Fix prefix of "halfop" when "multi-prefix" is active
  Clean up doc/.gitignore
  doc/Modes.txt: add version number to new channel modes
  Fix some "whitespace glitches"
  Tests and documentation for xop
  Implemented xop support

Conflicts (because of "multi-prefix fix"):
	src/ngircd/irc-info.c

This fixes bug #92 "ngircd does not support XOP usermodes".
Diffstat (limited to 'doc')
-rw-r--r--doc/Modes.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/Modes.txt b/doc/Modes.txt
index c2c533f2..e3b754d6 100644
--- a/doc/Modes.txt
+++ b/doc/Modes.txt
@@ -68,7 +68,12 @@ channel of which he is a member.
 
   mode	since	description
 
+  q	20	User is channel owner can only be set by a service, other
+		owner and irc op. Can promote other users to q, a, o, h, v.
+  a	20	User is channel admin and can promote other users to v, h, o
   o	0.2.0	User is channel operator and can op/kick/... other members.
+  h	20	User is half op and can set channel modes imntvIbek and kick
+		voiced and normal users.
   v	0.2.0	User is "voiced" and can speak even if channel is moderated.