Recent changes to this wiki:

calendar update
diff --git a/archives/2017.mdwn b/archives/2017.mdwn
new file mode 100644
index 0000000..592399b
--- /dev/null
+++ b/archives/2017.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2017 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2017/01.mdwn b/archives/2017/01.mdwn
new file mode 100644
index 0000000..2441b7a
--- /dev/null
+++ b/archives/2017/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/02.mdwn b/archives/2017/02.mdwn
new file mode 100644
index 0000000..e295fbe
--- /dev/null
+++ b/archives/2017/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/03.mdwn b/archives/2017/03.mdwn
new file mode 100644
index 0000000..6c05242
--- /dev/null
+++ b/archives/2017/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/04.mdwn b/archives/2017/04.mdwn
new file mode 100644
index 0000000..76e7c08
--- /dev/null
+++ b/archives/2017/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/05.mdwn b/archives/2017/05.mdwn
new file mode 100644
index 0000000..678f63a
--- /dev/null
+++ b/archives/2017/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/06.mdwn b/archives/2017/06.mdwn
new file mode 100644
index 0000000..2887ab6
--- /dev/null
+++ b/archives/2017/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/07.mdwn b/archives/2017/07.mdwn
new file mode 100644
index 0000000..0f746b9
--- /dev/null
+++ b/archives/2017/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/08.mdwn b/archives/2017/08.mdwn
new file mode 100644
index 0000000..4da2722
--- /dev/null
+++ b/archives/2017/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/09.mdwn b/archives/2017/09.mdwn
new file mode 100644
index 0000000..70f5e1d
--- /dev/null
+++ b/archives/2017/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/10.mdwn b/archives/2017/10.mdwn
new file mode 100644
index 0000000..04f5435
--- /dev/null
+++ b/archives/2017/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/11.mdwn b/archives/2017/11.mdwn
new file mode 100644
index 0000000..fe53f8d
--- /dev/null
+++ b/archives/2017/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/12.mdwn b/archives/2017/12.mdwn
new file mode 100644
index 0000000..bb4a435
--- /dev/null
+++ b/archives/2017/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2017 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2017) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

calendar update
diff --git a/archives/2016.mdwn b/archives/2016.mdwn
new file mode 100644
index 0000000..ceb79b8
--- /dev/null
+++ b/archives/2016.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2016 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2016/01.mdwn b/archives/2016/01.mdwn
new file mode 100644
index 0000000..69e4612
--- /dev/null
+++ b/archives/2016/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/02.mdwn b/archives/2016/02.mdwn
new file mode 100644
index 0000000..359afa3
--- /dev/null
+++ b/archives/2016/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/03.mdwn b/archives/2016/03.mdwn
new file mode 100644
index 0000000..0c1dce2
--- /dev/null
+++ b/archives/2016/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/04.mdwn b/archives/2016/04.mdwn
new file mode 100644
index 0000000..d744e37
--- /dev/null
+++ b/archives/2016/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/05.mdwn b/archives/2016/05.mdwn
new file mode 100644
index 0000000..2ab7ec1
--- /dev/null
+++ b/archives/2016/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/06.mdwn b/archives/2016/06.mdwn
new file mode 100644
index 0000000..08f3c8e
--- /dev/null
+++ b/archives/2016/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/07.mdwn b/archives/2016/07.mdwn
new file mode 100644
index 0000000..16e56ef
--- /dev/null
+++ b/archives/2016/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/08.mdwn b/archives/2016/08.mdwn
new file mode 100644
index 0000000..ed1d4b4
--- /dev/null
+++ b/archives/2016/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/09.mdwn b/archives/2016/09.mdwn
new file mode 100644
index 0000000..d9c34fd
--- /dev/null
+++ b/archives/2016/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/10.mdwn b/archives/2016/10.mdwn
new file mode 100644
index 0000000..bf00469
--- /dev/null
+++ b/archives/2016/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/11.mdwn b/archives/2016/11.mdwn
new file mode 100644
index 0000000..611c2e4
--- /dev/null
+++ b/archives/2016/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/12.mdwn b/archives/2016/12.mdwn
new file mode 100644
index 0000000..a374294
--- /dev/null
+++ b/archives/2016/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2016 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2016) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

calendar update
diff --git a/archives/2015.mdwn b/archives/2015.mdwn
new file mode 100644
index 0000000..303f603
--- /dev/null
+++ b/archives/2015.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2015 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2015/01.mdwn b/archives/2015/01.mdwn
new file mode 100644
index 0000000..7930876
--- /dev/null
+++ b/archives/2015/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/02.mdwn b/archives/2015/02.mdwn
new file mode 100644
index 0000000..6017022
--- /dev/null
+++ b/archives/2015/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/03.mdwn b/archives/2015/03.mdwn
new file mode 100644
index 0000000..ccc0743
--- /dev/null
+++ b/archives/2015/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/04.mdwn b/archives/2015/04.mdwn
new file mode 100644
index 0000000..a79d46e
--- /dev/null
+++ b/archives/2015/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/05.mdwn b/archives/2015/05.mdwn
new file mode 100644
index 0000000..1ad2829
--- /dev/null
+++ b/archives/2015/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/06.mdwn b/archives/2015/06.mdwn
new file mode 100644
index 0000000..58cd2cb
--- /dev/null
+++ b/archives/2015/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/07.mdwn b/archives/2015/07.mdwn
new file mode 100644
index 0000000..14cac40
--- /dev/null
+++ b/archives/2015/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/08.mdwn b/archives/2015/08.mdwn
new file mode 100644
index 0000000..65f1bc8
--- /dev/null
+++ b/archives/2015/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/09.mdwn b/archives/2015/09.mdwn
new file mode 100644
index 0000000..d772ddf
--- /dev/null
+++ b/archives/2015/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/10.mdwn b/archives/2015/10.mdwn
new file mode 100644
index 0000000..e22ac54
--- /dev/null
+++ b/archives/2015/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/11.mdwn b/archives/2015/11.mdwn
new file mode 100644
index 0000000..1fd564b
--- /dev/null
+++ b/archives/2015/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/12.mdwn b/archives/2015/12.mdwn
new file mode 100644
index 0000000..5ae9222
--- /dev/null
+++ b/archives/2015/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2015 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2015) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

add jessie
diff --git a/events/jessie_release.mdwn b/events/jessie_release.mdwn
new file mode 100644
index 0000000..3927101
--- /dev/null
+++ b/events/jessie_release.mdwn
@@ -0,0 +1,20 @@
+Parties will be held
+[worldwide](http://wiki.debian.org/ReleasePartyJessie) to
+celebrate the release of Debian 8.
+The Debian Party Line is a distributed release celebration.
+Using [[mumble]] we can all voice chat together, on a virtual
+[party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
+
+### who
+
+Debian users and developers.
+
+### when
+
+April 25th and 26th 2015.
+
+We will follow the events leading up to the release of Wheezy. Developers
+who have a view into the process are invited to provide play-by-play
+commentary. And then we will ring in the new release. 
+
+The [[schedule]] has details.

Add time for Jessie release party
diff --git a/schedule.mdwn b/schedule.mdwn
index 74afca5..177011e 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -2,7 +2,7 @@ Schedule of events on the Debian Party Line.
 
 ## April 25th/26th, 2015
 
-* Distributed Jessie release celebration.
+* Distributed Jessie release celebration. Starting about 07:00 UTC on Sat 2015.04.25
 
 ## May 4th/5th, 2013
 

Add Jessie release party
diff --git a/schedule.mdwn b/schedule.mdwn
index c5bffc5..74afca5 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -1,5 +1,9 @@
 Schedule of events on the Debian Party Line. 
 
+## April 25th/26th, 2015
+
+* Distributed Jessie release celebration.
+
 ## May 4th/5th, 2013
 
 * Distributed Wheezy release celebration.

creating tag page tags/person
diff --git a/tags/person.mdwn b/tags/person.mdwn
new file mode 100644
index 0000000..d3b7dfa
--- /dev/null
+++ b/tags/person.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged person"]]
+
+[[!inline pages="tagged(person)" actions="no" archive="yes"
+feedshow=10]]

Add event page for Wheezy Release event
diff --git a/events/wheezy_release.mdwn b/events/wheezy_release.mdwn
new file mode 100644
index 0000000..efcf728
--- /dev/null
+++ b/events/wheezy_release.mdwn
@@ -0,0 +1,20 @@
+Parties will be held
+[worldwide](http://wiki.debian.org/ReleasePartyWheezy) to
+celebrate the release of Debian 7.0.
+The Debian Party Line is a distributed release celebration.
+Using [[mumble]] we can all voice chat together, on a virtual
+[party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
+
+### who
+
+Debian users and developers.
+
+### when
+
+May 4th and 5th.
+
+We will follow the events leading up to the release of Wheezy. Developers
+who have a view into the process are invited to provide play-by-play
+commentary. And then we will ring in the new release. 
+
+The [[schedule]] has details.

Add event about Wheezy Release party (May 4th/5th, 2013)
diff --git a/schedule.mdwn b/schedule.mdwn
index 20abe9d..c5bffc5 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -1,5 +1,9 @@
 Schedule of events on the Debian Party Line. 
 
+## May 4th/5th, 2013
+
+* Distributed Wheezy release celebration.
+
 ## February 4th, 2011
 
 * Some earlier than usual activity today, 20 or so people connected.

remove broken flattr button
diff --git a/sidebar.mdwn b/sidebar.mdwn
index abc32dc..ca3ad2a 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -2,5 +2,3 @@ Higher bandwidth Debian chat.
 
 * [[schedule]]
 * [[how_to_connect|mumble]]
-* [[!flattr url="http://debian-party-line.branchable.com/" button=compact]]  
-  (support our bandwidth!)

remove old content
diff --git a/sidebar.mdwn b/sidebar.mdwn
index e745199..abc32dc 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -4,9 +4,3 @@ Higher bandwidth Debian chat.
 * [[how_to_connect|mumble]]
 * [[!flattr url="http://debian-party-line.branchable.com/" button=compact]]  
   (support our bandwidth!)
-
----
-
-<img src="http://news.debian.net/wp-content/uploads/2011/squeeze_countdown.png" alt="squeeze countdown"/>
-First event:
-[[A distributed celebration of the Squeeze release|events/squeeze_release]]

calendar update
diff --git a/archives/2012.mdwn b/archives/2012.mdwn
new file mode 100644
index 0000000..9f5430b
--- /dev/null
+++ b/archives/2012.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2012 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2012/01.mdwn b/archives/2012/01.mdwn
new file mode 100644
index 0000000..1c525f4
--- /dev/null
+++ b/archives/2012/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/02.mdwn b/archives/2012/02.mdwn
new file mode 100644
index 0000000..b035a1c
--- /dev/null
+++ b/archives/2012/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/03.mdwn b/archives/2012/03.mdwn
new file mode 100644
index 0000000..0e7dd50
--- /dev/null
+++ b/archives/2012/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/04.mdwn b/archives/2012/04.mdwn
new file mode 100644
index 0000000..792741c
--- /dev/null
+++ b/archives/2012/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/05.mdwn b/archives/2012/05.mdwn
new file mode 100644
index 0000000..e976d21
--- /dev/null
+++ b/archives/2012/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/06.mdwn b/archives/2012/06.mdwn
new file mode 100644
index 0000000..4a0d751
--- /dev/null
+++ b/archives/2012/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/07.mdwn b/archives/2012/07.mdwn
new file mode 100644
index 0000000..4a7a5c0
--- /dev/null
+++ b/archives/2012/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/08.mdwn b/archives/2012/08.mdwn
new file mode 100644
index 0000000..43b7886
--- /dev/null
+++ b/archives/2012/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/09.mdwn b/archives/2012/09.mdwn
new file mode 100644
index 0000000..259f12d
--- /dev/null
+++ b/archives/2012/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/10.mdwn b/archives/2012/10.mdwn
new file mode 100644
index 0000000..ca2e0a7
--- /dev/null
+++ b/archives/2012/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/11.mdwn b/archives/2012/11.mdwn
new file mode 100644
index 0000000..55673e3
--- /dev/null
+++ b/archives/2012/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/12.mdwn b/archives/2012/12.mdwn
new file mode 100644
index 0000000..9b497ee
--- /dev/null
+++ b/archives/2012/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2012 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2012) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

update
diff --git a/events/squeeze_release.mdwn b/events/squeeze_release.mdwn
index 7098d79..68d2abf 100644
--- a/events/squeeze_release.mdwn
+++ b/events/squeeze_release.mdwn
@@ -5,6 +5,8 @@ The Debian Party Line is a distributed release celebration.
 Using [[mumble]] we can all voice chat together, on a virtual
 [party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
 
+> Update: [Event summary](http://kitenet.net/~joey/blog/entry/12_hours_of_talking)
+
 ### who
 
 Debian users and developers.

update
diff --git a/events.mdwn b/events.mdwn
new file mode 100644
index 0000000..00ca0d7
--- /dev/null
+++ b/events.mdwn
@@ -0,0 +1 @@
+[[!inline pages="page(./events/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]
diff --git a/index.mdwn b/index.mdwn
index 3b50cde..c5d31d5 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,7 +11,7 @@ outgoing bandwidth, and the same amount incoming for each user who's talking.
 We hope any reasonable broadband connection will do.
 
 The server is open for any Debian-related use. From time to time
-we may have special events on the server as well.
+we may have special [[events]] on the server as well.
 
 ---
 
diff --git a/posts.mdwn b/posts.mdwn
deleted file mode 100644
index 08e0148..0000000
--- a/posts.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Here is a full list of posts to the [[blog|index]].
-
-[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]

update
diff --git a/events/squeeze_release.mdwn b/events/squeeze_release.mdwn
new file mode 100644
index 0000000..7098d79
--- /dev/null
+++ b/events/squeeze_release.mdwn
@@ -0,0 +1,22 @@
+Parties will be held
+[worldwide](http://wiki.debian.org/ReleasePartySqueeze) to
+celebrate the release of Debian 6.0.
+The Debian Party Line is a distributed release celebration.
+Using [[mumble]] we can all voice chat together, on a virtual
+[party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
+
+### who
+
+Debian users and developers.
+
+(Your host: [[Joey_Hess|joey]])
+
+### when
+
+February 5th and 6th.
+
+We will follow the events leading up to the release of Squeeze. Developers
+who have a view into the process are invited to provide play-by-play
+commentary. And then we will ring in the new release. 
+
+The [[schedule]] has details.
diff --git a/index.mdwn b/index.mdwn
index d39e88d..3b50cde 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,37 +4,15 @@
 [[!inline pages=sidebar raw=yes]]
 """]]
 
-Parties will be held
-[worldwide](http://wiki.debian.org/ReleasePartySqueeze) to
-celebrate the release of Debian 6.0.
-The Debian Party Line is a distributed release celebration.
-Using [[mumble]] we can all voice chat together, on a virtual
-[party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
-
-### who
-
-Debian users and developers.
-
-(Your host: [[Joey_Hess|joey]])
-
-### when
-
-February 5th and 6th.
-
-We will follow the events leading up to the release of Squeeze. Developers
-who have a view into the process are invited to provide play-by-play
-commentary. And then we will ring in the new release. 
-
-The [[schedule]] has details.
-
-### where
-
-Everywhere there's bandwidth. Mumble needs 10-40 kbit/s outgoing
-bandwidth, and the same amount incoming for each user who's talking.
+The Debian Party Line is a [[mumble]] server, `mumble.debian.net`.
+Located in the UK, this server allows group voice chats about Debian
+topics from everywhere there's bandwidth. Mumble needs 10-40 kbit/s
+outgoing bandwidth, and the same amount incoming for each user who's talking.
 We hope any reasonable broadband connection will do.
 
-The mumble server is `mumble.debian.net`. It is located in the UK.
+The server is open for any Debian-related use. From time to time
+we may have special events on the server as well.
 
-### how
+---
 
-See [[instructions_for_using_mumble|mumble]].
+This server is provided by [[Joey_Hess|joey]].
diff --git a/schedule.mdwn b/schedule.mdwn
index fcc4bda..20abe9d 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -1,10 +1,10 @@
 Schedule of events on the Debian Party Line. 
 
-## February 4th
+## February 4th, 2011
 
 * Some earlier than usual activity today, 20 or so people connected.
 
-## February 5th
+## February 5th, 2011
 
 * 1:00 GMT - party line officially opens, but this may be a quiet time
   (check if your sound setup works, etc)
@@ -14,7 +14,7 @@ Schedule of events on the Debian Party Line.
 * 19:00-20:00 GMT - room 'Debian package management', questions&talks about
   package managers in Debian (run by jackyf)
 
-## February 6th
+## February 6th, 2011
 
 * Server remains up if you want to use it.
 
diff --git a/sidebar.mdwn b/sidebar.mdwn
index f63123f..e745199 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -9,4 +9,4 @@ Higher bandwidth Debian chat.
 
 <img src="http://news.debian.net/wp-content/uploads/2011/squeeze_countdown.png" alt="squeeze countdown"/>
 First event:
-A distributed celebration of the Squeeze release
+[[A distributed celebration of the Squeeze release|events/squeeze_release]]

remove rsvp
diff --git a/index.mdwn b/index.mdwn
index b44e259..d39e88d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,16 +11,6 @@ The Debian Party Line is a distributed release celebration.
 Using [[mumble]] we can all voice chat together, on a virtual
 [party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
 
-Do you plan to attend?
-[[!toggle id=poll text="RSVP! >>>"]]
-[[!toggleable id=poll text="""
-
-[[!poll 5 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
-14 "unsure" 5 "no"]]
-
-(This will help us plan for needed bandwidth.)
-"""]]
-
 ### who
 
 Debian users and developers.

Merge branch 'master' of ssh://debian-party-line.branchable.com
update
diff --git a/schedule.mdwn b/schedule.mdwn
index f9de611..dc94f52 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -14,8 +14,7 @@ Schedule of events on the Debian Party Line.
 
 ## February 6th
 
-* 14:00 GMT - [[Joey]] resumes play-by-play if release hasn't happened yet
-* 23:59 GMT - party line probably closes
+* Server remains up if you want to use it.
 
 This page is a wiki. Be bold and add your own events. Ad-hoc talks,
 tutorials, whatever you'd like to use the Party Line for.

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index c41c4ab..b44e259 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
+[[!poll 5 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
 14 "unsure" 5 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (no)
diff --git a/index.mdwn b/index.mdwn
index d0d5842..c41c4ab 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 4 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
-14 "unsure" 4 "no"]]
+14 "unsure" 5 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 49ceb14..d0d5842 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 4 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
-13 "unsure" 4 "no"]]
+14 "unsure" 4 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 51a739c..49ceb14 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 27 "yes, both days" 
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 28 "yes, both days" 
 13 "unsure" 4 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index cde3938..51a739c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 4 "yes, February 5th" 0 "yes, February 6th" 27 "yes, both days" 
-12 "unsure" 4 "no"]]
+13 "unsure" 4 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (no)
diff --git a/index.mdwn b/index.mdwn
index ae0ec04..cde3938 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 4 "yes, February 5th" 0 "yes, February 6th" 27 "yes, both days" 
-12 "unsure" 3 "no"]]
+12 "unsure" 4 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index ff4379f..ae0ec04 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 26 "yes, both days" 
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 27 "yes, both days" 
 12 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)

diff --git a/schedule.mdwn b/schedule.mdwn
index f9de611..e0138ba 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -11,6 +11,8 @@ Schedule of events on the Debian Party Line.
 * 14:00-23:59 GMT - [[Joey]] plans to be on the party line during much
   of this time period, to welcome guests and provide play-by-play of
   the release process.
+* 19:00-20:00 GMT - room 'Debian package management', questions&talks about
+  package managers in Debian (run by jackyf)
 
 ## February 6th
 

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 574cd86..ff4379f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 25 "yes, both days" 
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 26 "yes, both days" 
 12 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index bbd83ba..574cd86 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 4 "yes, February 5th" 0 "yes, February 6th" 25 "yes, both days" 
-11 "unsure" 3 "no"]]
+12 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 6fc9e2b..bbd83ba 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 25 "yes, both days" 
 11 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 791c256..6fc9e2b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,8 +15,8 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 5 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
-10 "unsure" 3 "no"]]
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
+11 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (no)
diff --git a/index.mdwn b/index.mdwn
index 2977b36..791c256 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 5 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
-10 "unsure" 2 "no"]]
+10 "unsure" 3 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index 238ad41..2977b36 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
+[[!poll 5 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index dc6b08f..238ad41 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 3 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
+[[!poll 4 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 812779b..dc6b08f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 3 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
+[[!poll 3 "yes, February 5th" 0 "yes, February 6th" 24 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index ab98515..812779b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 2 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
+[[!poll 3 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index 950d35c..ab98515 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 1 "yes, February 5th" 1 "yes, February 6th" 23 "yes, both days" 
+[[!poll 2 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 6th)
diff --git a/index.mdwn b/index.mdwn
index de12481..950d35c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
+[[!poll 1 "yes, February 5th" 1 "yes, February 6th" 23 "yes, both days" 
 10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (no)
diff --git a/index.mdwn b/index.mdwn
index 3c0b337..de12481 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 1 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
-10 "unsure" 1 "no"]]
+10 "unsure" 2 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 59dfc19..3c0b337 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 22 "yes, both days" 
+[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 23 "yes, both days" 
 10 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index b395990..59dfc19 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 22 "yes, both days" 
+[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 22 "yes, both days" 
 10 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 8314b78..b395990 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 21 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 22 "yes, both days" 
 10 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)

toc
diff --git a/mumble.mdwn b/mumble.mdwn
index 97722cb..03d0f58 100644
--- a/mumble.mdwn
+++ b/mumble.mdwn
@@ -1,6 +1,6 @@
 To get on the Debian Party Line, you need [mumble](http://packages.debian.org/squeeze/mumble).
 
-[[! toc]]
+[[!toc]]
 
 ## installation
 

toc
diff --git a/mumble.mdwn b/mumble.mdwn
index 9481a18..97722cb 100644
--- a/mumble.mdwn
+++ b/mumble.mdwn
@@ -1,5 +1,7 @@
 To get on the Debian Party Line, you need [mumble](http://packages.debian.org/squeeze/mumble).
 
+[[! toc]]
+
 ## installation
 
 Our mumble server is a mumble 1.2 server. The mumble 1.1 shipped in Debian

update, push-to-talk
diff --git a/mumble.mdwn b/mumble.mdwn
index c6776c6..9481a18 100644
--- a/mumble.mdwn
+++ b/mumble.mdwn
@@ -29,16 +29,15 @@ high quality standalone mic, use it! Otherwise, laptop microphones vary in
 quality, but mumble makes surprisingly good use of them, and has a
 sophisticated setup process to get the best possible quality.
 
-### avoiding clipping
+## push to talk
 
-Mumble's audio setup wizard may set you up in voice activity mode. This
-tends to clip off the start of things you say, so it is not a recommended 
-configuration. 
+You're recommended to enable push to talk mode, so that problems with your
+sound don't feedback or cause noise in the channel.
 
-To disable this mode, at the expense of mumble using more bandwidth:
+Go to Configure -> Settings -> Audio Input and select "Push to Talk" under "Transmission".
 
-* Go to Configure -> Settings -> Audio Input
-* Under "Transmission", select "Continuous"
+To configure the key you press to talk, go to
+Configure -> Settings -> Shortcuts.
 
 ### avoiding feedback
 

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index f19a90b..8314b78 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 21 "yes, both days" 
-9 "unsure" 1 "no"]]
+10 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 9c6010c..f19a90b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 20 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 21 "yes, both days" 
 9 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (no)
diff --git a/index.mdwn b/index.mdwn
index e5bdc9b..9c6010c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 20 "yes, both days" 
-9 "unsure" 0 "no"]]
+9 "unsure" 1 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index fcb7173..e5bdc9b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 19 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 20 "yes, both days" 
 9 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 03e5120..fcb7173 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 18 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 19 "yes, both days" 
 9 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 2fa8452..03e5120 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 17 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 18 "yes, both days" 
 9 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index d1ced21..2fa8452 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 16 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 17 "yes, both days" 
 9 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index f977e11..d1ced21 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 16 "yes, both days" 
-8 "unsure" 0 "no"]]
+9 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 147044d..f977e11 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 15 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 16 "yes, both days" 
 8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index ff72815..147044d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 14 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 15 "yes, both days" 
 8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 815277d..ff72815 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 13 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 14 "yes, both days" 
 8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

update
diff --git a/schedule.mdwn b/schedule.mdwn
index 7f08d3c..f9de611 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -1,5 +1,9 @@
 Schedule of events on the Debian Party Line. 
 
+## February 4th
+
+* Some earlier than usual activity today, 20 or so people connected.
+
 ## February 5th
 
 * 1:00 GMT - party line officially opens, but this may be a quiet time

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 972a8b2..815277d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 13 "yes, both days" 
 8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index 5f498b1..972a8b2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
+[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
 8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 52457bd..5f498b1 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
-7 "unsure" 0 "no"]]
+8 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 61f12c2..52457bd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
-6 "unsure" 0 "no"]]
+7 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index e189caf..61f12c2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 11 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 12 "yes, both days" 
 6 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

wording
diff --git a/sidebar.mdwn b/sidebar.mdwn
index bc4b711..f63123f 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,7 +3,7 @@ Higher bandwidth Debian chat.
 * [[schedule]]
 * [[how_to_connect|mumble]]
 * [[!flattr url="http://debian-party-line.branchable.com/" button=compact]]  
-  (help pay for bandwidth!)
+  (support our bandwidth!)
 
 ---
 

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 2ad878e..e189caf 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 11 "yes, both days" 
-5 "unsure" 0 "no"]]
+6 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

compacy
diff --git a/sidebar.mdwn b/sidebar.mdwn
index fae31f8..bc4b711 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -2,7 +2,7 @@ Higher bandwidth Debian chat.
 
 * [[schedule]]
 * [[how_to_connect|mumble]]
-* [[!flattr url="http://debian-party-line.branchable.com/"]]  
+* [[!flattr url="http://debian-party-line.branchable.com/" button=compact]]  
   (help pay for bandwidth!)
 
 ---

flattr
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 10591dc..fae31f8 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -2,6 +2,8 @@ Higher bandwidth Debian chat.
 
 * [[schedule]]
 * [[how_to_connect|mumble]]
+* [[!flattr url="http://debian-party-line.branchable.com/"]]  
+  (help pay for bandwidth!)
 
 ---
 

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 5ab6e59..2ad878e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 10 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 11 "yes, both days" 
 5 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 7fdb264..5ab6e59 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 10 "yes, both days" 
-4 "unsure" 0 "no"]]
+5 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 0c8d613..7fdb264 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 9 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 10 "yes, both days" 
 4 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 10089da..0c8d613 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 9 "yes, both days" 
-3 "unsure" 0 "no"]]
+4 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 705fea4..10089da 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 8 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 9 "yes, both days" 
 3 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 1497963..705fea4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 8 "yes, both days" 
-2 "unsure" 0 "no"]]
+3 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index 302c1bb..1497963 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -16,7 +16,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 8 "yes, both days" 
-1 "unsure" 0 "no"]]
+2 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 9dd883c..302c1bb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 7 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 8 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 68170fb..9dd883c 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 6 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 7 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

Merge remote branch 'origin/master'
typo
diff --git a/index.mdwn b/index.mdwn
index 5771331..c17fc81 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -8,7 +8,7 @@ Parties will be held
 [worldwide](http://wiki.debian.org/ReleasePartySqueeze) to
 celebrate the release of Debian 6.0.
 The Debian Party Line is a distributed release celebration.
-Using [[mumble]] we can all voice chat togeter, on a virtual
+Using [[mumble]] we can all voice chat together, on a virtual
 [party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
 
 Do you plan to attend?

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 294deaf..5f8a215 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 5 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 6 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 8e32772..294deaf 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 4 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 5 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 5771331..8e32772 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 3 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 4 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

reorg
diff --git a/index.mdwn b/index.mdwn
index 5e5f946..5771331 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,12 +11,6 @@ The Debian Party Line is a distributed release celebration.
 Using [[mumble]] we can all voice chat togeter, on a virtual
 [party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
 
-### who
-
-Debian users and developers.
-
-(Your host: [[Joey_Hess|joey]])
-
 Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
@@ -27,6 +21,12 @@ Do you plan to attend?
 (This will help us plan for needed bandwidth.)
 """]]
 
+### who
+
+Debian users and developers.
+
+(Your host: [[Joey_Hess|joey]])
+
 ### when
 
 February 5th and 6th.

Merge branch 'master' of ssh://debian-party-line.branchable.com
clarify
diff --git a/index.mdwn b/index.mdwn
index 58d9272..95375c2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -8,7 +8,7 @@ Parties will be held
 [worldwide](http://wiki.debian.org/ReleasePartySqueeze) to
 celebrate the release of Debian 6.0.
 The Debian Party Line is a distributed release celebration.
-Using [[mumble]] we can all chat togeter, on a virtual
+Using [[mumble]] we can all voice chat togeter, on a virtual
 [party line](http://en.wikipedia.org/wiki/Party_line_(telephony)).
 
 ### who

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 94ef24d..3d3879f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 2 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 3 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

poll vote (yes, February 5th)
diff --git a/index.mdwn b/index.mdwn
index 58d9272..94ef24d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 2 "yes, both days" 
+[[!poll 1 "yes, February 5th" 0 "yes, February 6th" 2 "yes, both days" 
 1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

update
diff --git a/schedule.mdwn b/schedule.mdwn
index 36ffc34..7f08d3c 100644
--- a/schedule.mdwn
+++ b/schedule.mdwn
@@ -4,8 +4,9 @@ Schedule of events on the Debian Party Line.
 
 * 1:00 GMT - party line officially opens, but this may be a quiet time
   (check if your sound setup works, etc)
-* 14:00-23:59 GMT - [[Joey]] plans to be on the party line
-  to welcome guests and provide play-by-play of the release process.
+* 14:00-23:59 GMT - [[Joey]] plans to be on the party line during much
+  of this time period, to welcome guests and provide play-by-play of
+  the release process.
 
 ## February 6th
 

poll vote (unsure)
diff --git a/index.mdwn b/index.mdwn
index b172885..58d9272 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,7 +22,7 @@ Do you plan to attend?
 [[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 2 "yes, both days" 
-0 "unsure" 0 "no"]]
+1 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
 """]]

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 63ec0a5..b172885 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 1 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 2 "yes, both days" 
 0 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

update
diff --git a/index.mdwn b/index.mdwn
index 094426a..3d32e44 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -18,7 +18,8 @@ Debian users and developers.
 (Your host: [[Joey_Hess|joey]])
 
 Do you plan to attend?
-[[!more linktext="RSVP!" text="""
+[[!toggle id=poll text="RSVP! >>>"]]
+[[!toggleable id=poll text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 0 "yes, both days" 
 0 "unsure" 0 "no"]]

foo
diff --git a/index.mdwn b/index.mdwn
index 02a9d19..094426a 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -18,7 +18,7 @@ Debian users and developers.
 (Your host: [[Joey_Hess|joey]])
 
 Do you plan to attend?
-[[!more linktext="RSVP! >>>" text="""
+[[!more linktext="RSVP!" text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 0 "yes, both days" 
 0 "unsure" 0 "no"]]

formaty
diff --git a/index.mdwn b/index.mdwn
index e4d25d4..02a9d19 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -17,12 +17,14 @@ Debian users and developers.
 
 (Your host: [[Joey_Hess|joey]])
 
-RSVP! Do you plan to attend?
+Do you plan to attend?
+[[!more linktext="RSVP! >>>" text="""
 
 [[!poll 0 "yes, February 5th" 0 "yes, February 6th" 0 "yes, both days" 
 0 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)
+"""]]
 
 ### when
 

poll vote (yes, both days)
diff --git a/index.mdwn b/index.mdwn
index 3d32e44..63ec0a5 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,7 @@ Do you plan to attend?
 [[!toggle id=poll text="RSVP! >>>"]]
 [[!toggleable id=poll text="""
 
-[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 0 "yes, both days" 
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 1 "yes, both days" 
 0 "unsure" 0 "no"]]
 
 (This will help us plan for needed bandwidth.)

add poll.
diff --git a/index.mdwn b/index.mdwn
index bfbb385..e4d25d4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -17,6 +17,13 @@ Debian users and developers.
 
 (Your host: [[Joey_Hess|joey]])
 
+RSVP! Do you plan to attend?
+
+[[!poll 0 "yes, February 5th" 0 "yes, February 6th" 0 "yes, both days" 
+0 "unsure" 0 "no"]]
+
+(This will help us plan for needed bandwidth.)
+
 ### when
 
 February 5th and 6th.

update
diff --git a/mumble.mdwn b/mumble.mdwn
index 30ace64..c6776c6 100644
--- a/mumble.mdwn
+++ b/mumble.mdwn
@@ -43,7 +43,8 @@ To disable this mode, at the expense of mumble using more bandwidth:
 ### avoiding feedback
 
 Try turning your speakers volume down, or turning down the sensativity of
-your mic, or moving the mic away from the speakers, if possible.
+your mic, or moving the mic away from the speakers, if possible. Or, put on
+some headphones.
 
 You may need to try going through the Audio Setup wizard again, and pick
 lower values there.

update
diff --git a/sidebar.mdwn b/sidebar.mdwn
index a5a0616..10591dc 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,10 +1,10 @@
 Higher bandwidth Debian chat.
 
+* [[schedule]]
+* [[how_to_connect|mumble]]
+
 ---
 
 <img src="http://news.debian.net/wp-content/uploads/2011/squeeze_countdown.png" alt="squeeze countdown"/>
 First event:
 A distributed celebration of the Squeeze release
-
-* [[schedule]]
-* [[how_to_connect|mumble]]

foo
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 0be49cf..a5a0616 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,4 +1,9 @@
+Higher bandwidth Debian chat.
+
+---
+
 <img src="http://news.debian.net/wp-content/uploads/2011/squeeze_countdown.png" alt="squeeze countdown"/>
+First event:
 A distributed celebration of the Squeeze release
 
 * [[schedule]]