Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / underlays / basewiki / ikiwiki / preprocessordirective.mdwn

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

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