Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/contact.mdwn b/doc/contact.mdwn
index a9b33871793e892b4f079f9ee61e599783fbf82d..37fb59071607e042b7476fcc738419a6ff97cd72 100644 (file)
--- a/doc/contact.mdwn
+++ b/doc/contact.mdwn
@@ -1,8 +1,10 @@
 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, and
-[CIA](http://cia.navi.cx), 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,
+[CIA](http://cia.navi.cx), and IRC, and respond in a timely fashion.

 
 

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