Merge branch 'clean' into allinone-da

3 files changed, 4 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 274e0ca..24e1940 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ 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 = master-FLAVOR-LOCALE
+ikiwiki_BRANCH = clean-FLAVOR-LOCALE
 # modules (subproject extension names) used.  Expands Git ORIGINs
 ikiwiki_MODULES = templates basewiki smiley
 # flavors used.  Expands Git BRANCHes
diff --git a/README b/README
index 3becd90..4e6efe3 100644
--- a/README
+++ b/README
@@ -8,6 +8,9 @@ the following locales:
 
  * danish (da) by Jonas Smedegaard <dr@jones.dk>
 
+Additionally, the configuration has been simplified to not mention non-Git VCS
+systems, and deprecated placeholder files has been removed from basewiki.
+
 
 Getting the source
 ------------------
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup
index d1c8efe..1f68a88 100644
--- a/ikiwiki_da.setup
+++ b/ikiwiki_da.setup
@@ -24,13 +24,6 @@ use IkiWiki::Setup::Standard {
 	# 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&amp;r1=[[r1]]&amp;r2=[[r2]]",
-	#svnrepo => "/svn/wiki",
-	#svnpath => "trunk",
-
 	# Git stuff.
 	#rcs => "git",
 	#historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master
@@ -38,32 +31,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 +39,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 +46,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?