Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 4b47d2db9108b5f062ebb1187ea2afff1b3e7e20..2de058b2d2cdd16d1b202eb699eb72d2f2fa208f 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -9,7 +9,8 @@ Released 29 April 2006.
 
 The 1.x series changed a great deal over the more than 50 releases in its
 lifetime. It is now in maintenance mode, only security issues or really bad
-bugs will be fixed in 1.x going forward.
+bugs will be fixed in 1.x going forward. 1.x will stop being supported with
+the release of 3.0.
 
 ----
 

diff --git a/underlays/basewiki/ikiwiki/subpage b/underlays/basewiki/ikiwiki/subpage
deleted file mode 120000 (symlink)
index dc18335..0000000
--- a/underlays/basewiki/ikiwiki/subpage
+++ /dev/null
@@ -1 +0,0 @@
-../../../doc/ikiwiki/subpage
\ No newline at end of file

diff --git a/underlays/basewiki/ikiwiki/subpage/linkingrules.mdwn b/underlays/basewiki/ikiwiki/subpage/linkingrules.mdwn
new file mode 120000 (symlink)
index 0000000..6694188
--- /dev/null
+++ b/underlays/basewiki/ikiwiki/subpage/linkingrules.mdwn
@@ -0,0 +1 @@
+../../../../doc/ikiwiki/subpage/linkingrules.mdwn
\ No newline at end of file