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

master
Joey Hess 2009-02-14 21:42:00 -05:00
commit 3e19033a6d
4 changed files with 21 additions and 27 deletions

View File

@ -0,0 +1,7 @@
Hi!
How about to replace sparkline-php from Suggests by a better alternative?
I would like to file a RM bug to get it out of archive. Do you have a better alternative for it? PHP has a lot of them..
Thanks

View File

@ -18,3 +18,11 @@ I am not sure why it is not finding shortcuts.mdwn. -- [[JosephTurian]]
>
> Anyway, I've made the shortcut plugin only warn about this..
> --[[Joey]]
> > I have
> > $installdir="/home/turian/utils/"
> > and the underlay dir is set to:
> > "$installdir/share/ikiwiki/basewiki",
> > which does contain shortcuts.mdwn. So I am not sure why it is not finding it.
> > I am grappling with installing ikiwiki in a user account, and would like to get the directories set up correctly.
> > How can I debug this issue further?

View File

@ -1,27 +1 @@
Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
suitable for publishing on a website. Ikiwiki stores pages and history in a
[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
There are many other [[features]], including support for
[[blogging|blog]], as well as a large array of [[plugins]].
[[!template id=links]]
## using ikiwiki
[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
[[man_page|usage]]. There are some [[examples]] of things you can do
with ikiwiki, and some [[tips]].
All wikis are supposed to have a [[SandBox]], so this one does too.
This site generally runs the latest release of ikiwiki; currently, it runs
ikiwiki [[!version ]].
## developer resources
The [[RoadMap]] describes where the project is going.
[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
can be submitted and tracked using this wiki.
ikiwiki is developed by [[Joey]] and many contributors,
and is [[FreeSoftware]].

View File

@ -26,6 +26,11 @@ pages, as well as doing syntax highlighting as a preprocessor directive
* [[users/jasonblevins]]'s code plugin uses src-highlight, and supports both
while file and directive use.
* [hlsimple](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/hlsimple.pm;hb=HEAD) is a wrapper for the the perl module Syntax::Highlight::Engine::Simple. This is pure perl, pretty simple, uses css. It ought to be pretty fast (according to the author, and just because it is not external).
On the other hand, there are not many predefined languages yet. Defining language syntaxes is about as much
work as source-highlight, but in perl. I plan to package the base module for debian. Perhaps after the author
releases the 5 or 6 language definitions he has running on his web site, it might be suitable for inclusion in ikiwiki. [[DavidBremner]]
## General problems
* Using non-perl syntax highlighting backends is slow. I'd prefer either