merged the recentchanges branch

[ikiwiki.git] / underlays / basewiki / wikilink.mdwn

diff --git a/underlays/basewiki/wikilink.mdwn b/underlays/basewiki/wikilink.mdwn
deleted file mode 120000 (symlink)
index 146ac42bbe15c50fa6dbee90cfdc8c9ef7ffecec..0000000000000000000000000000000000000000
--- a/underlays/basewiki/wikilink.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-../../doc/wikilink.mdwn
\ No newline at end of file

diff --git a/underlays/basewiki/wikilink.mdwn b/underlays/basewiki/wikilink.mdwn
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c0c22aeaede36d6a82d086dc3d3cc23a54c45fe7
--- /dev/null
+++ b/underlays/basewiki/wikilink.mdwn
@@ -0,0 +1,5 @@
+[[meta redir=ikiwiki/wikilink delay=10]]
+
+This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update
+your links, as this redirection page will be removed in a future ikiwiki
+release.