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

diff --git a/doc/forum/Error:___34__do__34___parameter_missing/comment_2_c5f24a8c4d2de0267cf0de1908480e82._comment b/doc/forum/Error:___34__do__34___parameter_missing/comment_2_c5f24a8c4d2de0267cf0de1908480e82._comment
new file mode 100644 (file)
index 0000000..dd2fdb2
--- /dev/null
+++ b/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!
+"""]]

diff --git a/doc/forum/how_to_login_as_admin/comment_1_295e130c6400a2d7336758e82bcd5647._comment b/doc/forum/how_to_login_as_admin/comment_1_295e130c6400a2d7336758e82bcd5647._comment
new file mode 100644 (file)
index 0000000..bceecf8
--- /dev/null
+++ b/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.
+"""]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index bd7ec789fda547bfdd30221d53d259783c04646a..e0193642d6c394374d8c26590cf3a792a01f34af 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/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]]?

diff --git a/doc/sandbox/NewPage.mdwn b/doc/sandbox/NewPage.mdwn
new file mode 100644 (file)
index 0000000..18e27fc
--- /dev/null
+++ b/doc/sandbox/NewPage.mdwn
@@ -0,0 +1 @@
+This page uses directory hierarchies. Good.

diff --git a/doc/todo/wikiwyg.mdwn b/doc/todo/wikiwyg.mdwn
index b9a7368eafc0d7e37e7ff08c964a9ffa949e425b..42bd6d54807812a7ae4699b2ffda2dfedfa22542 100644 (file)
--- a/doc/todo/wikiwyg.mdwn
+++ b/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]]

diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn
index 8c5727ace5eeab9dd6ab0a3a217bbcb6678efbcd..11c96a8b5d83fd9ceab07bbcab677091623a8694 100644 (file)
--- a/doc/todo/wikiwyg/discussion.mdwn
+++ b/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]]

diff --git a/doc/todo/Olea.mdwn b/doc/users/Olea.mdwn
similarity index 100%
rename from doc/todo/Olea.mdwn
rename to doc/users/Olea.mdwn