summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-07-13 11:43:43 +0200
committerJonas Smedegaard <dr@jones.dk>2008-07-13 11:43:43 +0200
commit1152dff251fb399e8cb8f15373acded6790e1b86 (patch)
treee61c3606ad49b7daab15ad568e1a8e854af9f1a4
parentf8fcd22c76635c0210b4e1ea9dda0c8cab627d62 (diff)
Drop non-Git VCS options from config. Use clean content branches.
-rw-r--r--Makefile2
-rw-r--r--README3
-rw-r--r--ikiwiki.setup49
3 files changed, 4 insertions, 50 deletions
diff --git a/Makefile b/Makefile
index fd39a38..6f93950 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SOURCES = ikiwiki
ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
ikiwiki_MODULES = templates basewiki smiley
ikiwiki_POMODULES = basewiki smiley
-ikiwiki_BRANCH = master-LOCALE
+ikiwiki_BRANCH = clean-LOCALE
ikiwiki_LOCALES = da no_NB
ikiwiki_POLOCALES = da
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.setup b/ikiwiki.setup
index c96a45f..2ad1cef 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -19,12 +19,6 @@ use IkiWiki::Setup::Standard {
#templatedir => "/usr/share/ikiwiki/templates",
#underlaydir => "/usr/share/ikiwiki/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]]",
- #svnpath => "trunk",
-
# Git stuff.
#rcs => "git",
#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
@@ -32,38 +26,6 @@ use IkiWiki::Setup::Standard {
#gitorigin_branch => "origin",
#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/",
- #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",
- # This is a monotone lua hook file used by ikiwiki for
- # inserting conflict markers. By default it will use
- # mtnrootdir/_MTN/mergerc. This hook will be populated with
- # default code the first time you use ikiwiki. You can
- # change it to alter how conflict markers are inserted.
- #mtnmergerc => "path/to/mergerc",
-
wrappers => [
#{
# # The cgi wrapper.
@@ -72,17 +34,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