From: Joey Hess Date: Sat, 13 Sep 2008 01:19:35 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f1e29d04a603351bd92780d1349d848b0eceba05?hp=ec6cd6fff8682b8b35007eabc3d587535bdb91e3 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index 4b47d2db9..2de058b2d 100644 --- 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 index dc1833550..000000000 --- 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 index 000000000..6694188b2 --- /dev/null +++ b/underlays/basewiki/ikiwiki/subpage/linkingrules.mdwn @@ -0,0 +1 @@ +../../../../doc/ikiwiki/subpage/linkingrules.mdwn \ No newline at end of file