Rebuild for jessie-backports

[git.ikiwiki.info.git] / doc / contact.mdwn

diff --git a/doc/contact.mdwn b/doc/contact.mdwn
index 1a8a0bbf9669dcbc739f11a4cbe0fd8efbb13f5f..afcc677650b8d81fe362330b8da95f673b8ce49a 100644 (file)
--- a/doc/contact.mdwn
+++ b/doc/contact.mdwn
@@ -1,9 +1,17 @@
 The ikiwiki project strongly encourages collaboration through ikiwiki itself,
 and thus does not have a mailing list.  Anyone can create an account on
 ikiwiki's own wiki. ikiwiki provides a [[bug_tracker|bugs]], a
 The ikiwiki project strongly encourages collaboration through ikiwiki itself,
 and thus does not have a mailing list.  Anyone can create an account on
 ikiwiki's own wiki. ikiwiki provides a [[bug_tracker|bugs]], a

-[[TODO_list|TODO]], and "discussion" sub-pages for every page. ikiwiki
-developers monitor RecentChanges closely, via the webpage, email,
-[CIA](http://cia.navi.cx), and IRC, and respond in a timely fashion.
+[[TODO_list|TODO]], and "discussion" sub-pages for every page, as well as a
+[[forum]] for general questions and discussion. ikiwiki
+developers monitor [[RecentChanges]] closely, via the webpage, email,
+and IRC, and respond in a timely fashion.

 
 You could also drop by the IRC channel `#ikiwiki` on
 [OFTC](http://www.oftc.net/) (`irc.oftc.net`).
 
 You could also drop by the IRC channel `#ikiwiki` on
 [OFTC](http://www.oftc.net/) (`irc.oftc.net`).

+
+However, if you find a new security vulnerability, please email the maintainers
+privately instead of raising it in a public medium, so that we can
+arrange for coordinated disclosure when a fix is available. The maintainers
+are [[Joey Hess|joey]] (<joey@kitenet.net>),
+[[Simon McVittie|smcv]] (<smcv@debian.org>)
+and [[Amitai Schleier|schmonz]] (<schmonz-web-ikiwiki@schmonz.com>).