Merge branch 'master' of file:///srv/git/ikiwiki.info

diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 334acf0c0d743bb741e38b697964787cddfb9026..16e5a5a56e058e8d3415349c586e2649f1475856 100644 (file)
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -53,3 +53,14 @@ Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
 > universe of possible table formatting stuff is nearly endless, and at
 > some point it becomes clearer and simpler to just write the table in
 > html.. --[[Joey]]
+
+>> Thanks a lot for the info about Multimarkdown! It seems very interesting.
+
+>> I'll look at that plugin and try to add that feature, if it's not
+>> too hard.
+
+>> I know that people have many ideas how to format their tables
+>> and it's not easy to create universal tool. Of course `table` plugin
+>> was written rather for simple usage. However cell alignment is very
+>> helpful feature, so I think the plugin should be able to do it.
+>> --[[Paweł|ptecza]]

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index f2100f7c94ce15a633de5dee75f09ce1300f563d..7d8c525e767f1cd6e38f74c515e7bb843451fdb8 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -132,4 +132,9 @@ It seems I will have to install the ikiwiki from the tar.gz file. I have downloa
 > 
 > You do not need to use git-init if you use ikiwiki-makrepo. --[[Joey]]
 
+
+Thanks for your response. You're right. Ubuntu does have ikiwiki, except that it is an older version. I tried installing it; saw some error messages from the install, and decided against it. Plus the documentation here in ikiwiki.info seems slightly different. I made an executive/beginner decision: to go for the latest tarball. And found myself in deep water, ...
+
+Anyway, I think I might be able to install it from the tarball I downloaded. I've been reading the discussions, had a look at your screencasts, etc. I will give it another bash. -- [[WillDioneda]]
+
 ----

diff --git a/doc/todo/page_edit_disable.mdwn b/doc/todo/page_edit_disable.mdwn
index 40f7e14e3d9535ae7894d83ddf8f80cebcef239e..ee7c58d4eecfb8d91e28954820248c5429959235 100644 (file)
--- a/doc/todo/page_edit_disable.mdwn
+++ b/doc/todo/page_edit_disable.mdwn
@@ -42,3 +42,8 @@ by Cron. I haven't decided how to do it yet. --[[Paweł|ptecza]]
 > allow page editing. --[[Joey]]
 
 >> I'm glad you agree that it may make sense :) --[[Paweł|ptecza]]
+
+>> We're in a similar situation with http://web.monkeysphere.info 
+>> - wanting cgiurl so that our recentchanges page displays links, 
+>> but not wanting to enable editing of pages (since we're also 
+>> rsync'ing the html pages to mirrors) --[[Jamie]]