summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-03 23:41:11 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-03 23:41:11 -0400
commit73fe8e604878b84de739444ee8fbebb758fb5b14 (patch)
tree7f0645ff1fa1e0ced39ec61fef63fbd64395825e
parent3c022e2cd755508391cc866c11b146f0edf43762 (diff)
parent81211d2e75f43025d677f0d74cacb02989a4903d (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/plugins/table/discussion.mdwn15
-rw-r--r--doc/setup/discussion.mdwn9
-rw-r--r--doc/todo/page_edit_disable.mdwn11
3 files changed, 34 insertions, 1 deletions
diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 675f7f7df..05cdd5f8b 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -29,3 +29,18 @@ I hope this might be intresting for some ikiwiki user's.
> (Just FYI, in future, I recommend using a unified diff. Also, not
> renaming variables that don't really need to be renamed makes your patch
> easier to apply.) --[[Joey]]
+
+---
+
+# Horizontal cell alignment
+
+Do you know any easy method of horizontal cell alignment? I know I can set `class`
+attribute for the table, but how to set different `class` for different cells?
+
+[DokuWiki](http://www.dokuwiki.org/) has a nice horizontal alignment solution.
+Suppose that we have `|foo|` cell. If I want to align the cell to left,
+then I should type `|foo |`. If I want to do right alignment, then I type `| foo|`.
+For centering cell content I need to type `| foo |`. Please note that I used
+only one space for all examples, but in DokuWiki I can use many spaces.
+
+Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 807b64131..fc20736f0 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -118,3 +118,12 @@ If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try
I follow every steps of the setup procedure, change some templates and tried to modify some page through the web but was not able to do so. Every page seems to be locked by the adminuser user. When I remove the adminuser in the setup file, every ran fine. Did I miss something ? What is exactly the adminuser supposed to be allowed to ? Is he the only user allowed to modify pages ?
> This was a bug in ikwiki that was fixed in version 2.44. --[[Joey]]
+
+-----
+I hope you guys can put up with an absolute newbie. I am fairly new to linux and completely new to Perl. I have just installed MoinMoin locally in my PC, running ubuntu 8.4 and was about to use it until I ran into your ikiwiki. I thought ikiwiki is a better fit for what I want to do, so am seriously considering installing it as well in ubuntu. Except that the install seems way beyond my understanding.
+
+Do i need to install git first? Which git -- the git-core? Ubuntu's instructions on installing the git-core is: "sudo apt-get install git-core". Is that it? Do I need to do a git-init as well, or will the ikiwiki-makerepo handle that? If I have to do a git-init as well, what --share values should I specify?
+
+It seems I will have to install the ikiwiki from the tar.gz file. I have downloaded it, but do I need to install CPAN or CPAN++ first? That doesn't sound right. I am totally confused already. Does anyone have some install documents pitched to someone as ignorant as I am? -- [[WillDioneda]]
+
+----
diff --git a/doc/todo/page_edit_disable.mdwn b/doc/todo/page_edit_disable.mdwn
index 578c394a2..40f7e14e3 100644
--- a/doc/todo/page_edit_disable.mdwn
+++ b/doc/todo/page_edit_disable.mdwn
@@ -26,10 +26,19 @@ front-ends immediately via `post-commit` hook file or periodically
by Cron. I haven't decided how to do it yet. --[[Paweł|ptecza]]
> You disable display of recentchanges by disabling that plugin.
+
+>> Thanks for the hint! I didn't think about it :)
+
> You disable edit and preferences by not enabling a cgiurl at all.
->
+
+>> Yes, I've just discovered it. Unfortunately I need cgiurl,
+>> because I would like to use searching feature also for read-only
+>> pages.
+
> Maybe page editing will become a plugin some day, or be made
> configurable -- there are a few things like searching and websetup
> (and possibly the poll plugin, aggregate webtrigger, and pingee)
> that it may make sense to enable a cgi for even if you don't want to
> allow page editing. --[[Joey]]
+
+>> I'm glad you agree that it may make sense :) --[[Paweł|ptecza]]