Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / index / discussion.mdwn

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index 92fe8fa4762032cca196abd3f18c3587519c2fe8..d52cb0a2dc41a3a7742f27e1955972d842b3b6d4 100644 (file)
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -96,7 +96,7 @@ I'd like to install ikiwiki as a non-root user. I can plow through getting all t
 perl dependencies installed because that's well documented in the perl world,
 but I don't know how to tell ikiwiki to install somewhere other than / --BrianWilson
 
-> Checkout the tips section for [[tips/SharedHosting]].  It should do the trick. --MattReynolds
+> Checkout the tips section for [[tips/DreamHost]].  It should do the trick. --MattReynolds
 
 ----
 
@@ -288,6 +288,10 @@ easily, perl is possible (but I'm not strong in perl).
 
 >>> It appears the scripts were never posted?  I recently imported my Mediawiki site into Iki.  If it helps, my notes are here: <http://iki.u32.net/Mediawiki_Conversion> --[[sabr]]
 
+>>>>> The scripts have been posted now, see [[joshtriplett]]'s user page, 
+>>>>> and I've pulled together all ways I can find to [[convert]] other
+>>>>> systems into ikiwiki. --[[Joey]]
+
 ----
 
 # LaTeX support?
@@ -411,7 +415,7 @@ I'm sure that this is documented somewhere but I've ransacked the wiki and I can
 > The default `wiki_file_regexp` matches filenames containing only
 > `[-[:alnum:]_.:/+]`
 > 
-> The IkiWiki::titlepage() function will convert freeform text to a valid
+> The titlepage() function will convert freeform text to a valid
 > page name. See [[todo/should_use_a_standard_encoding_for_utf_chars_in_filenames]]
 > for an example. --[[Joey]]