Merge remote branch 'mjgoins/master'

Conflicts:
	doc/george/changelog

1 files changed, 0 insertions, 29 deletions

diff --git a/doc/ikiwiki.setup.sample b/doc/ikiwiki.setup.sample
deleted file mode 100644
index 97e77c8..0000000
--- a/doc/ikiwiki.setup.sample
+++ /dev/null
@@ -1,29 +0,0 @@
-use IkiWiki::Setup::Standard {
-	wikiname => "Monkeysphere",
-	adminemail => 'webmaster@monkeysphere.info',
-	
-	srcdir => "/path/to/cloned/monkeysphere/repo/website",
-	destdir => "/path/to/web/dir",
-	
-	url => "http://monkeysphere.info",
-	
-	rcs => "git",
-
- 	wrappers => [
-	    {
-		wrapper => "/path/to/post-receive/hook",
-		wrappermode => "0755",
-	    }
- 	    ],
-	
-	rss => 1,
-	atom => 1,
-	verbose => 0,
-	syslog => 0,
-	
-	add_plugins => [qw{goodstuff favicon toc sidebar}],
-
-
-	tagbase => "tags",
-	
-}