[cairo-commit] [cairo-www] 2 commits - ikiwiki.setup src/download.mdwn

[Nis Martensen]

Rebased ref, commits from common ancestor:
commit 7b21a09cb416f338cf3a138cb0d4322414d2aebc
Author: Nis Martensen <nis.martensen at web.de>
Date:   Tue Dec 27 21:06:18 2011 +0100

    Disable the CGI wrapper

diff --git a/ikiwiki.setup b/ikiwiki.setup
index ad1fc04..b065d29 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -63,12 +63,12 @@ use IkiWiki::Setup::Standard {
 	gitmaster_branch => "master",
 
 	wrappers => [
-		{
-			# The cgi wrapper.
-			cgi => 1,
-			wrapper => "/srv/cairo.freedesktop.org/cgi-bin/ikiwiki",
-			wrappermode => "06755",
-		},
+#		{
+#			# The cgi wrapper.
+#			cgi => 1,
+#			wrapper => "/srv/cairo.freedesktop.org/cgi-bin/ikiwiki",
+#			wrappermode => "06755",
+#		},
 		{
 			# Instead of overwriting git's post-update script
 		        # we generate a new program that can be called by
commit ba1c3d47628fc6dec067866350b159a484538269
Author: Lukas <Lukas at web>
Date:   Sun Aug 14 03:20:13 2011 -0700

    Fixed broken link to GTK+ for windows. The target had been split into two pages for x86, x64.

diff --git a/src/download.mdwn b/src/download.mdwn
index ea73d82..d0b54b0 100644
--- a/src/download.mdwn
+++ b/src/download.mdwn
@@ -53,7 +53,7 @@ Toolkit](http://gladewin32.sourceforge.net/modules/news/).
 
 From Daniel Keep (edited by Kalle Vahlman): 
 
-Go to [official GTK+ for Windows page](http://www.gtk.org/download-windows.html).
+Go to [official GTK+ for Windows page](http://www.gtk.org/download/).
 
 You want "cairo-1.4.8.zip", the binary distribution at "libpng 1.2.8",
 and "Zlib 1.2.3" (you can search on those strings to find them in the