urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

master
Joey Hess 2008-12-23 16:27:02 -05:00
parent 70fa222d06 ecf2408bf6
commit 6e4f34b0b8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/plugins/aggregate/discussion.mdwn
View File

@ -35,7 +35,7 @@ Two things aren't working as I'd expect:
> problem. You can see the feed validator complain about it here: > problem. You can see the feed validator complain about it here:
> <http://feedvalidator.org/check.cgi?url=http%3A%2F%2Fwww.davidj.org%2Frss.xml> > <http://feedvalidator.org/check.cgi?url=http%3A%2F%2Fwww.davidj.org%2Frss.xml>
> >
> It's sorta unfortunate that [[cpan XML::Feed]] doesn't just assume the > It's sorta unfortunate that [[!cpan XML::Feed]] doesn't just assume the
> un-esxaped html is part of the description field. Probably other feed > un-esxaped html is part of the description field. Probably other feed
> parsers are more lenient. --[[Joey]] > parsers are more lenient. --[[Joey]]

2
doc/tips/inside_dot_ikiwiki.mdwn
View File

@ -66,7 +66,7 @@ to do it rarely, and the data I've wanted has been different each time.
## the session database ## the session database
`.ikiwiki/sessions.db` is the session database. See the [[cpan CGI::Session]] `.ikiwiki/sessions.db` is the session database. See the [[!cpan CGI::Session]]
documentation for more details. documentation for more details.
## lockfiles ## lockfiles

2
doc/todo/support_creole_markup.mdwn
View File

@ -12,7 +12,7 @@ And there is a perl module: Text::WikiCreole
Syntax file for vim: http://www.peter-hoffmann.com/code/vim/ (Since a typical ikiwiki user usually use external editors. :)) Syntax file for vim: http://www.peter-hoffmann.com/code/vim/ (Since a typical ikiwiki user usually use external editors. :))
> Should be pretty easy to add a plugin to do it using [[cpan > Should be pretty easy to add a plugin to do it using [[!cpan
> Text::WikiCreole]]. --[[Joey]] > Text::WikiCreole]]. --[[Joey]]
[[done]] [[done]]

8
doc/todo/syntax_highlighting.mdwn
View File

@ -7,16 +7,16 @@ pages, as well as doing syntax highlighting as a preprocessor directive
## The big list of possibilities ## The big list of possibilities
* [[plugins/contrib/highlightcode]] uses [[cpan Syntax::Highlight::Engine::Kate]], * [[plugins/contrib/highlightcode]] uses [[!cpan Syntax::Highlight::Engine::Kate]],
operates on whole source files only, has a few bugs (see operates on whole source files only, has a few bugs (see
[here](http://u32.net/Highlight_Code_Plugin/), and needs to be updated to [here](http://u32.net/Highlight_Code_Plugin/), and needs to be updated to
support [[bugs/multiple_pages_with_same_name]]. support [[bugs/multiple_pages_with_same_name]].
* [[cpan IkiWiki-Plugin-syntax]] only operates as a directive. * [[!cpan IkiWiki-Plugin-syntax]] only operates as a directive.
Interestingly, it supports multiple highlighting backends, including Kate Interestingly, it supports multiple highlighting backends, including Kate
and Vim. and Vim.
* [[plugins/contrib/syntax]] only operates as a directive * [[plugins/contrib/syntax]] only operates as a directive
([[not_on_source_code_files|automatic_use_of_syntax_plugin_on_source_code_files]]), ([[not_on_source_code_files|automatic_use_of_syntax_plugin_on_source_code_files]]),
and uses [[cpan Text::VimColor]]. and uses [[!cpan Text::VimColor]].
* [[plugins/contrib/sourcehighlight]] uses src-highlight, and operates on * [[plugins/contrib/sourcehighlight]] uses src-highlight, and operates on
whole source files only. Needs to be updated to whole source files only. Needs to be updated to
support [[bugs/multiple_pages_with_same_name]]. support [[bugs/multiple_pages_with_same_name]].
@ -43,7 +43,7 @@ pages, as well as doing syntax highlighting as a preprocessor directive
inside source files. Doing this probably means post-processing the inside source files. Doing this probably means post-processing the
results of the highlighting engine, to find places where it's highlighted results of the highlighting engine, to find places where it's highlighted
comments, and then running them through the ikiwiki rendering pipeline. comments, and then running them through the ikiwiki rendering pipeline.
This seems fairly doable with [[cpan Syntax::Highlight::Engine::Kate]], This seems fairly doable with [[!cpan Syntax::Highlight::Engine::Kate]],
at least. at least.
* The whole-file plugins tend to have a problem that things that look like * The whole-file plugins tend to have a problem that things that look like
wikilinks in the source code get munged into links by ikiwiki, which can wikilinks in the source code get munged into links by ikiwiki, which can

2
doc/users/xma.mdwn
View File

@ -9,7 +9,7 @@ Anyway, [[ikiwiki]] is really *awesome* !
## More about me ## More about me
I am CLI user living in the linux console. More precisely, I live in an [[GNU Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]]. I am CLI user living in the linux console. More precisely, I live in an [[GNU_Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]].
## Contacting me ## Contacting me