diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-03-17 23:22:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-03-17 23:22:26 -0400 |
| commit | 6cae23dbbe073a29400e89236b27ab7718fe2d54 (patch) | |
| tree | 4c8bb2fcca72798d4e19bd03b919597b0fc3b887 | |
| parent | cbc5fcff6182e620578fff619ae021eb5b30024c (diff) | |
| parent | 4054f8d8ce0802b43e1c2c6f9cb71badbbcaf919 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/plugins/contrib/highlightcode.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/ACL.mdwn | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/plugins/contrib/highlightcode.mdwn b/doc/plugins/contrib/highlightcode.mdwn index 8abb76583..f1df204bb 100644 --- a/doc/plugins/contrib/highlightcode.mdwn +++ b/doc/plugins/contrib/highlightcode.mdwn @@ -1,6 +1,8 @@ [[!template id=plugin name=highlightcode author="[[sabr]]"]] [[!tag type/format]] +(An alternative to this plugin, [[plugins/highlight]], is now provided with IkiWiki. --[[smcv]]) + A small plugin to allow Ikiwiki to display source files complete with syntax highlighting. Files with recognized extensions (i.e. my-file.cpp) are be rendered just like any other Ikiwiki page. You can even edit your source files with Ikiwiki's editor. It uses the Syntax::Highlight::Engine::Kate Perl module to do the highlighting. diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn index d40701d60..57979385d 100644 --- a/doc/todo/ACL.mdwn +++ b/doc/todo/ACL.mdwn @@ -76,3 +76,12 @@ Any idea when this is going to be finished? If you want, I am happy to beta tes > Example of use to only allow two users to edit the tipjar page: > locked_pages => 'tipjar and !(user(joey) or user(bob))', > --[[Joey]] + +> > Thank you for the hint but I am being still confused (read: dense)... What I am trying to do is this: + +> > * No anonymous access. +> > * Logged in users can edit and create pages. +> > * Users can set who can edit their pages. +> > * Some pages are only viewable by admins. + +> > Is it possible? If so how?... |