move to a more generic contact page

diff --git a/doc/contact.mdwn b/doc/contact.mdwn
new file mode 100644 (file)
index 0000000..a9b3387
--- /dev/null
+++ b/doc/contact.mdwn
@@ -0,0 +1,8 @@
+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.
+
+You could also drop by the IRC channel `#ikiwiki` on OFTC (`irc.oftc.net`).

diff --git a/doc/index.mdwn b/doc/index.mdwn
index e3b0ceb0d15576125fd8dac8f1bb32e5c64e485c..14d1dd1cf230aff446784dcbd2fc4bf3c086ae52 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -21,9 +21,7 @@ Thanks! --[[Joey]]
   [[examples]] of things you can do with ikiwiki.
 
 * Feel free to post your questions and thoughts about ikiwiki to
   [[examples]] of things you can do with ikiwiki.
 
 * Feel free to post your questions and thoughts about ikiwiki to

-  [[Discussion]].  You could also drop by the IRC channel `#ikiwiki` on OFTC
-  (`irc.oftc.net`).  [[ikiwiki_does_not_have_a_mailing_list|mailing_list]]; we
-  use the wiki instead.
+  [[Discussion]], or [[contact]] the developers.

 
 * [[Security]] lists potential security problems. ikiwiki is still being
   developed, and is being written with security as a priority, so don't
 
 * [[Security]] lists potential security problems. ikiwiki is still being
   developed, and is being written with security as a priority, so don't

diff --git a/doc/mailing_list.mdwn b/doc/mailing_list.mdwn
deleted file mode 100644 (file)
index 3e7bdf9..0000000
--- a/doc/mailing_list.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-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 the ability to create a [[weblog|blog]] on any page.
-ikiwiki also includes "discussion" sub-pages on every page.  ikiwiki
-developers monitor RecentChanges closely, via the webpage, email, and
-[CIA](http://cia.navi.cx), and respond in a timely fashion.