From: Joey Hess <joey@kitenet.net>
Date: Thu, 24 May 2012 20:33:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120629~53
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/41aee342747c1f06d526c8851c6fc7f11b455e41?hp=7f8706dfdb35e28bf81857dba01541c2958f62a6

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
index 000000000..dd2fdb248
--- /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
index 000000000..bceecf8e8
--- /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 bd7ec789f..e0193642d 100644
--- 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
index 000000000..18e27fc89
--- /dev/null
+++ b/doc/sandbox/NewPage.mdwn
@@ -0,0 +1 @@
+This page uses directory hierarchies. Good.
diff --git a/doc/todo/Olea.mdwn b/doc/todo/Olea.mdwn
deleted file mode 100644
index 1db2a7cf5..000000000
--- a/doc/todo/Olea.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="Ismael Olea"]]
-
-Ismael Olea is <a href="mailto:ismael@olea.org">ismael@olea.org</a>. 
-His web page is [here](http://olea.org/diario/).
diff --git a/doc/todo/wikiwyg.mdwn b/doc/todo/wikiwyg.mdwn
index b9a7368ea..42bd6d548 100644
--- 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 8c5727ace..11c96a8b5 100644
--- 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/users/Olea.mdwn b/doc/users/Olea.mdwn
new file mode 100644
index 000000000..1db2a7cf5
--- /dev/null
+++ b/doc/users/Olea.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="Ismael Olea"]]
+
+Ismael Olea is <a href="mailto:ismael@olea.org">ismael@olea.org</a>. 
+His web page is [here](http://olea.org/diario/).