Merge branch 'allinone-nb' into allinone-multilang

Conflicts (manually resolved):

	ikiwiki_nb.setup

(Changes to Makefile suppressed)

1 files changed, 4 insertions, 52 deletions

diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 295f618..8642e63 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -16,20 +16,14 @@ use IkiWiki::Setup::Standard {
 
 	url => "http://wiki.example.org",
 	cgiurl => "http://wiki.example.org/ikiwiki.cgi",
-	templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/nb",
+	templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit_l10n/nb",
 	underlaydirs => [
+		$ENV{'HOME'} . "/private_webdata/samplewiki/content",
 		#$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb",
-		$ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb",
+		$ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/nb",
 		],
 	# Some plugins (smiley in particular) need non-localized master underlay
-	underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki",
-
-	# Subversion stuff.
-	#rcs => "svn",
-	#historyurl => "http://svn.example.org/trunk/[[file]]",
-	#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-	#svnrepo => "/svn/wiki",
-	#svnpath => "trunk",
+	underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit",
 
 	# Git stuff.
 	#rcs => "git",
@@ -38,32 +32,6 @@ use IkiWiki::Setup::Standard {
 	#gitorigin_branch => "samplewiki",
 	#gitmaster_branch => "master",
 
-	# Tla stuff.
-	#rcs => "tla"
-	#historyurl => ??,
-	#diffurl => ??,
-
-	# Mercurial stuff.
-	#rcs => "mercurial",
-	#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
-	#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
-
-	# Bazaar stuff.
-	#rcs => "bzr",
-	#historyurl => "", 
-	#diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
-
-	# Monotone stuff
-	#rcs => "monotone",
-	#mtnkey => "web\@machine.company.com",
-	#historyurl => "http://viewmtn.example.com/branch/head/filechanges/com.example.branch/[[file]]",
-	#diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
-	# Set if you want the wiki to sync on update and commit.
-	#mtnsync => 0,
-	# The path to your workspace (defaults to the srcdir itself)
-	# e.g. use if your srcdir is a subdirectory of the workspace.
-	#mtnrootdir => "path/to/root/of/workspace",
-
 	wrappers => [
 		#{
 		#	# The cgi wrapper.
@@ -72,17 +40,6 @@ use IkiWiki::Setup::Standard {
 		#	wrappermode => "06755",
 		#},
 		#{
-		#	# The svn post-commit wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-commit hook script, which may not be
-		#	# what you want.
-		#	wrapper => "/svn/wikirepo/hooks/post-commit",
-		#	wrappermode => "04755",
-		#	# Log to syslog since svn post-commit hooks
-		#	# hide output and errors.
-		#	syslog => 1,
-		#},
-		#{
 		#	# The git post-update wrapper.
 		#	# Note that this will overwrite any existing
 		#	# post-update hook script, which may not be
@@ -90,11 +47,6 @@ use IkiWiki::Setup::Standard {
 		#	wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki",
 		#	wrappermode => "06755",
 		#},
-		#{
-		#	# The monotone netsync hook.
-		#	wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
-		#	wrappermode => "06755",
-		#},
 	],
 
 	# Default to generating rss feeds for pages with feeds?