about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am1
-rw-r--r--doc/Modes.txt5
-rw-r--r--doc/sample-ngircd.conf.tmpl3
3 files changed, 9 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 00f2530c..cd51d7fe 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,6 +19,7 @@ SUFFIXES = .tmpl
 static_docs = \
 	Bopm.txt \
 	Capabilities.txt \
+	Contributing.txt \
 	FAQ.txt \
 	GIT.txt \
 	HowToRelease.txt \
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.
 
 
diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index 57e65892..018855d5 100644
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -165,6 +165,9 @@
 	# they are not(!) channel-operators?
 	;OperCanUseMode = no
 
+	# Should IRC Operators get AutoOp (+o) in persistent (+P) channels?
+	;OperChanPAutoOp = yes
+
 	# Mask IRC Operator mode requests as if they were coming from the
 	# server? (This is a compatibility hack for ircd-irc2 servers)
 	;OperServerMode = no