summaryrefslogtreecommitdiff
path: root/doc/ikiwiki-transition.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-05-21 09:15:55 +0200
committerintrigeri <intrigeri@boum.org>2009-05-21 09:15:55 +0200
commitdf6f6a1d53493de0ee4f451220b8c8d34af6642a (patch)
tree51ed87d8494ffda4025989cf4fda8bdcd5daf8ca /doc/ikiwiki-transition.mdwn
parentef003f48f4a3fe8fb67fda62c70a299b07d75976 (diff)
parentf7ded1174dd8f4aec3371214bbadc1c1f7fc2e22 (diff)
Merge commit 'upstream/master' into pub/po
Diffstat (limited to 'doc/ikiwiki-transition.mdwn')
-rw-r--r--doc/ikiwiki-transition.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn
index e0b853ecf..6177f5a46 100644
--- a/doc/ikiwiki-transition.mdwn
+++ b/doc/ikiwiki-transition.mdwn
@@ -44,14 +44,14 @@ Moves values that used to be admin preferences into the setup file.
Note that all comments and any unusual stuff like perl code in the setup
file will be lost, as it is entirely rewritten by the move.
-# indexdb srcdir
+# indexdb your.setup|srcdir
The `indexdb` mode handles converting a plain text `.ikiwiki/index` file to
a binary `.ikiwiki/indexdb`. You do not normally need to run
`ikiwiki-transition indexdb`; ikiwiki will automatically run it as
necessary.
-# hashpassword srcdir
+# hashpassword your.setup|srcdir
The `hashpassword` mode forces any plaintext passwords stored in the
`.ikiwiki/userdb` file to be replaced with password hashes. (The
@@ -61,7 +61,7 @@ If this is not done explicitly, a user's plaintext password will be
automatically converted to a hash when a user logs in for the first time
after upgrade to ikiwiki 2.48.
-# deduplinks srcdir
+# deduplinks your.setup|srcdir
In the past, bugs in ikiwiki have allowed duplicate link information
to be stored in its indexdb. This mode removes such duplicate information,