Merge branch 'master' into allinone

Conflicts (manually resolved):

	Makefile

2 files changed, 23 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 84073d3..6c658fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
 SOURCES = ikiwiki
 
+# Git origin (with capital MOULE replaced or stripped as needed)
 ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
+# Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed)
+ikiwiki_BRANCH = allinone-FLAVOR-LOCALE
+# modules (subproject extension names) used.  Expands Git ORIGINs
 ikiwiki_MODULES = templates basewiki smiley
+# flavors used.  Expands Git BRANCHes
 ikiwiki_basewiki_FLAVORS = nonedit
 ikiwiki_templates_FLAVORS = nonedit
-ikiwiki_POMODULES = basewiki smiley
-ikiwiki_BRANCH = allinone-FLAVOR-LOCALE
-ikiwiki_LOCALES = da nb
-ikiwiki_POLOCALES = da
+# locales used.  Expands Git BRANCHes
+#ikiwiki_LOCALES = da nb
+# gettext-based modules and locales used
+#ikiwiki_POMODULES = basewiki smiley
+#ikiwiki_POLOCALES = da
 
 #dummy_MODULES = content_dummy
 
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 5a5e016..fe84823 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -11,26 +11,26 @@ use IkiWiki::Setup::Standard {
 	adminemail => 'me@example.org',
 
 	# Be sure to customise these..
-	srcdir => "/path/to/source",
-	destdir => "/var/www/wiki",
+	srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content",
+	destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki",
 
-	url => "http://example.org/wiki",
-	cgiurl => "http://example.org/wiki/ikiwiki.cgi",
-	#templatedir => "/usr/share/ikiwiki/templates",
-	#underlaydir => "/usr/share/ikiwiki/basewiki",
+	url => "http://wiki.example.org",
+	cgiurl => "http://wiki.example.org/ikiwiki.cgi",
+	templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates",
+	underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki",
 
 	# Git stuff.
 	#rcs => "git",
-	#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
-	#diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-	#gitorigin_branch => "origin",
+	#historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master
+	#diffurl => "http://git.example.org/?p=samplewiki_content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+	#gitorigin_branch => "samplewiki",
 	#gitmaster_branch => "master",
 
 	wrappers => [
 		#{
 		#	# The cgi wrapper.
 		#	cgi => 1,
-		#	wrapper => "/var/www/wiki/ikiwiki.cgi",
+		#	wrapper => $ENV{'HOME'} . "/public_cgi/wiki.example.org/ikiwiki.cgi",
 		#	wrappermode => "06755",
 		#},
 		#{
@@ -38,7 +38,7 @@ use IkiWiki::Setup::Standard {
 		#	# Note that this will overwrite any existing
 		#	# post-update hook script, which may not be
 		#	# what you want.
-		#	wrapper => "/git/wiki.git/hooks/post-update",
+		#	wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki",
 		#	wrappermode => "06755",
 		#},
 	],
@@ -95,7 +95,7 @@ use IkiWiki::Setup::Standard {
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
 	# To add a directory to the perl search path, use this.
-	#libdir => "/home/me/.ikiwiki/",
+	#libdir => "/home/me/private_webdata/samplewiki/perl",
 	
 	# To override environment variable settings, you can list values here.
 	#ENV => {
@@ -141,7 +141,7 @@ use IkiWiki::Setup::Standard {
 	#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
 	# And a file holding your secret key. This file *must* not be
 	# readable by others!
-	#amazon_s3_key_file => "/home/me/.hide/.s3_key
+	#amazon_s3_key_file => "/home/me/secret_webdata/s3_key
 	# The globally unique name of the bucket to use to store the wiki.
 	#amazon_s3_bucket => "mywiki",
 	# A prefix to prepend to each page name.