Merge remote-tracking branch 'dirichlet.SCHWINGE/master'

1 files changed, 20 insertions, 6 deletions

diff --git a/colophon.mdwn b/colophon.mdwn
index a9a2952e..2a0dd119 100644
--- a/colophon.mdwn
+++ b/colophon.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2003, 2004, 2007, 2008, 2009 Free Software
+[[!meta copyright="Copyright © 2003, 2004, 2007, 2008, 2009, 2013 Free Software
 Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -6,16 +6,17 @@ id="license" text="Permission is granted to copy, distribute and/or modify this
 document under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no Invariant
 Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
-is included in the section entitled
-[[GNU Free Documentation License|/fdl]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
-Just like a book, this topic is designed to help describe the tools used to
+Just as in a book, this page is designed to help describe the tools used to
 create this website and what methods were used to give it its look and feel.
 
 
 What we see today is the junction of two different branches: the original
 static HTML pages and the wiki pages.
 
+
 # Static HTML Pages
 
 In November 2008, the Hurd's old static web pages were merged into the wiki
@@ -23,6 +24,7 @@ pages' repository.  After a lot of cleansing work, on 2008-11-22 the joined set
 of pages was made available for serving the official GNU Hurd web appearance at
 <http://www.gnu.org/software/hurd/>.
 
+
 # Wiki Pages
 
 ## Rev. I
@@ -52,6 +54,7 @@ timely fashion anymore.  In July 2006, the [slow burial of the Hurd
 Wiki](http://lists.gnu.org/archive/html/bug-hurd/2006-07/msg00014.html) was
 announced.
 
+
 ## Rev. II
 
 Considering this [from April 2006 on
@@ -60,5 +63,16 @@ already](http://lists.gnu.org/archive/html/web-hurd/2006-04/msg00000.html), on
 [ikiwiki](http://ikiwiki.info) was finally finished.  Read
 [[about_the_twiki_to_ikiwiki_conversion]].
 
-This wiki instance is now running distributed over two GNU/Hurd machines, and
-is also providing the content of the official GNU Hurd pages.
+This wiki instance was running distributed over two GNU/Hurd machines,
+[[flubber|public_hurd_boxen]] (Git repository) and
+[[snubber|public_hurd_boxen]] (web server), both hosted by Barry deFreese.
+
+The wiki's content also provides that of the official GNU Hurd pages,
+<http://www.gnu.org/software/hurd/>.
+
+
+## Rev. III
+
+As of early 2013, both flubber and snubber's duties are [[!message-id
+"87vc9417dc.fsf@kepler.schwinge.homeip.net" desc="taken over"]] by Richard
+Braun's [[darnassus|public_hurd_boxen]].