Merge branch 'master' of ssh://git.ikiwiki.info

doc/forum/Error:___34__do__34___parameter_missing/comment_2_c5f24a8c4d2de0267cf0de1908480e82._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://ismael.olea.org/"
+ ip="150.214.94.198"
+ subject="comment 2"
+ date="2012-05-22T21:24:37Z"
+ content="""
+Gosh, that was it.
+
+Grrr. Sorry for being too rookie O:-)
+
+Thanks!
+"""]]

doc/forum/how_to_login_as_admin/comment_1_295e130c6400a2d7336758e82bcd5647._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://ismael.olea.org/"
+ ip="150.214.94.198"
+ subject="comment 1"
+ date="2012-05-22T23:31:09Z"
+ content="""
+Can be adminuser an OpenID address? 
+
+Because I can't get the websetup link at my preferences (plugin is set). I deactivated passwordauth plugin.
+"""]]

doc/sandbox.mdwn

@@ -185,3 +185,6 @@ This is simple enough for now [[sandbocen]] no?
 test by max
 
 test by bbb
+
+
+Can I make a [[NewPage]]?

doc/sandbox/NewPage.mdwn

@@ -0,0 +1 @@
+This page uses directory hierarchies. Good.

doc/todo/wikiwyg.mdwn

@@ -65,4 +65,4 @@ The plugin can be downloaded from <http://ikiwiki.xbaud.com/wikiwyg-1.6.tar.gz>
 
 >> Seems the new place is now at Github: <https://github.com/audreyt/wikiwyg-js>
 >> FYI
->> --[[Olea]]
+>> --[[users/Olea]]

doc/todo/wikiwyg/discussion.mdwn

@@ -178,4 +178,4 @@ Thanks, [[Greg]]
 >>> screwed up pushing the branch. :-( --[[Joey]]
 >>>> Seems the new place is now at Github: <https://github.com/audreyt/wikiwyg-js>
 >>>> FYI
->>>> --[[Olea]]
+>>>> --[[users/Olea]]