Merge remote branch 'upstream/master'

1 files changed, 45 insertions, 0 deletions

diff --git a/doc/help/irc.txt b/doc/help/irc.txt
new file mode 100644
index 000000000..303c39e68
--- /dev/null
+++ b/doc/help/irc.txt
@@ -0,0 +1,45 @@
+.. -*- mode: rst -*-
+
+.. _Freenode: http://chat.freenode.net
+.. _#bcfg2: irc://chat.freenode.net/bcfg2
+
+.. _help-irc:
+
+===========
+IRC Channel
+===========
+
+The Bcfg2 IRC channel is `#bcfg2`_ on `Freenode`_. It is home to both
+support and development discussions. If you have a question, suggestion,
+or just want to know about Bcfg2, please drop in and say hi.
+
+Archives are available at: http://colabti.org/irclogger/irclogger_logs/bcfg2
+
+.. raw:: html
+
+    <form method="get" action="http://colabti.org/irclogger/irclogger_log_search/bcfg2">
+      <input type=text name=search value='' size=48>
+      <input type=submit value="Search #bcfg2 irc logs">
+      <input type=hidden name=action value=search> <br>
+      in the timespan
+      <input type=text name=timespan value='' size=17>
+      (yyyymmdd-yyyymmdd)
+    <p>Options:<br>
+     <label><input type=checkbox name=nick value="checked">Search in the nick field</label><br>
+     <label><input type=checkbox name=text checked value="checked">Search in the text field</label><br>
+    </form>
+
+Administrative Note
+===================
+
+If the IRC logging stops working for a while, coordinate on #bcfg2 and
+then bug **feb** on #irclogger (freenode), and stick around on that
+channel until you get an answer (**feb** is great, but busy and in a
+non-US time zone). Actually as long as **ilogger2** is logged in you
+should be okay (**feb** looks at the logs).
+
+If you have private logs for the period of time **ilogger2** was off the
+channel, you can convert them to the will incorporate them into the online
+logs. Be sure to strip out any private messages in your logs first :-)
+
+.. _format shown here: http://colabti.org/irclogger/irclogger_log/bcfg2?date=2008-03-21,Fri;raw=on