about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-09-11 12:30:19 +0200
committerAlexander Barton <alex@barton.de>2012-09-11 12:30:19 +0200
commitf37600ee01f6cfd86e8fa80f77ee26ebaf3012b2 (patch)
tree1c1a9c7421b899a11a059b72615a7020b06ed7c2 /doc
parentf38a9035e5439cb395b2de6b9bdfa36102bfe80c (diff)
parent097c72aa65d9914d688eaece718648ca060e287a (diff)
downloadngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.tar.gz
ngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.zip
Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop
* 'xop' of https://github.com/kart0ffelsack/ngircd:
  Tests and documentation for xop
  Implemented xop support

Conflicts (because of merge of the 'cmode-M' branch):
	src/ngircd/channel.c
	src/ngircd/defines.h
	src/ngircd/messages.h
Diffstat (limited to 'doc')
-rw-r--r--doc/.gitignore1
-rw-r--r--doc/Modes.txt5
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
index 0035855c..a7b6a22c 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 sample-ngircd.conf
+Add_Modes.txt
diff --git a/doc/Modes.txt b/doc/Modes.txt
index c2c533f2..dec80ce8 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.