From 4287a0206953b96711138d29d4c783922a56deff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 13:19:22 -0500 Subject: reorganize vim syntax highlighting info There was already a tip about it; move the plasticboy version to there. --- doc/ikiwiki/markdown.mdwn | 3 +-- doc/tips/vim_syntax_highlighting/discussion.mdwn | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn index 3bebaef65..94864c489 100644 --- a/doc/ikiwiki/markdown.mdwn +++ b/doc/ikiwiki/markdown.mdwn @@ -6,8 +6,7 @@ email messages. It is the markup language used by this wiki by default. For documentation about the markdown syntax, see [[formatting]] and [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A [markdown mode](http://jblevins.org/projects/markdown-mode/) for -emacs can help in editing, as can this -[syntax file](http://plasticboy.com/markdown-vim-mode/) for vim. +emacs can help in editing, as can the [[vim_syntax_highlighting]] file. Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part of the markdown syntax, and are the only bit of markup that this wiki diff --git a/doc/tips/vim_syntax_highlighting/discussion.mdwn b/doc/tips/vim_syntax_highlighting/discussion.mdwn index b1637e758..038854b9f 100644 --- a/doc/tips/vim_syntax_highlighting/discussion.mdwn +++ b/doc/tips/vim_syntax_highlighting/discussion.mdwn @@ -1 +1,8 @@ I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[JonDowland]] + +---- + +Another attempt at the same thing is here: + + +In my tests, [[ikiwiki.vim]] works better than that one, YMMV. --[[Joey]] -- cgit v1.2.3 From 5c0d43999f1e9eb0814eed3ccc0a91b030bb6a3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 13:30:20 -0500 Subject: response --- doc/plugins/format/discussion.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/plugins/format/discussion.mdwn b/doc/plugins/format/discussion.mdwn index b7d6ca71c..df8448ed6 100644 --- a/doc/plugins/format/discussion.mdwn +++ b/doc/plugins/format/discussion.mdwn @@ -3,3 +3,13 @@ Is there any way to tell if an htmlize hook have been called from a format direc I am currently modifying the [[contrib/highlightcode]] plugin by [[sabr]] and I wanted to have a different behavior depending on the fact that the htmlize hook is called from a format directive or not. For instance, this could disable the raw copy of the highlighted code. Since I have enabled the keepextension option, I tried to rely on the page extension to decide whenever I have to create the raw file or not but this does not seems a reliable approach. One possible solution is to add an optional parameter to the htmlize hook (and thus to htmlize function in IkiWiki.pm) which could tell if this is the format directive that called the function but I am not sure that is a good way to do this. + +> It's (probably) not just the format directive that has a potential problem here. +> Imagine a syntax highlighted source code file that contains some other +> directive, such as table or meta. Such a directive calls `htmlize` on the +> parameters passed to it. +> +> There is one way to detect this ATM. If `%IkiWiki::preprocessing` has +> anything in it, then ikiwiki is in the middle of handling a preprocessing +> directive. So you could check that. It's getting into internals, so not +> ideal.. --[[Joey]] -- cgit v1.2.3 From d5853f3e33f70ac82c8a77519a4e1c4781da83eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 17:40:03 -0500 Subject: reorg to avoid broken link in basewiki ikiwiki/markdown is a basewiki page and shouldn't link to pages in tips. Instead, make the tips link to it, so backlinks will point back to them. While I'm at it, move the info about the emacs mode to a tip. --- doc/ikiwiki/markdown.mdwn | 4 +--- doc/tips/emacs_syntax_highlighting.mdwn | 3 +++ doc/tips/vim_syntax_highlighting.mdwn | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 doc/tips/emacs_syntax_highlighting.mdwn diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn index 94864c489..684191929 100644 --- a/doc/ikiwiki/markdown.mdwn +++ b/doc/ikiwiki/markdown.mdwn @@ -4,9 +4,7 @@ is a minimal markup language that resembles plain text as used in email messages. It is the markup language used by this wiki by default. For documentation about the markdown syntax, see [[formatting]] and -[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A -[markdown mode](http://jblevins.org/projects/markdown-mode/) for -emacs can help in editing, as can the [[vim_syntax_highlighting]] file. +[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part of the markdown syntax, and are the only bit of markup that this wiki diff --git a/doc/tips/emacs_syntax_highlighting.mdwn b/doc/tips/emacs_syntax_highlighting.mdwn new file mode 100644 index 000000000..941cf5415 --- /dev/null +++ b/doc/tips/emacs_syntax_highlighting.mdwn @@ -0,0 +1,3 @@ +A [markdown mode](http://jblevins.org/projects/markdown-mode/) for +emacs can help in editing of ikiwiki +[[ikiwiki/markdown]] files. diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn index 453efa8d1..172b763c3 100644 --- a/doc/tips/vim_syntax_highlighting.mdwn +++ b/doc/tips/vim_syntax_highlighting.mdwn @@ -1,2 +1,4 @@ -[[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki. Installation -instructions are at the top of the file. +[[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki +[[ikiwiki/markdown]] files. + +Installation instructions are at the top of the file. -- cgit v1.2.3 From f0e58faefab108482e88f62db64ea6d654327d25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 18:05:30 -0500 Subject: Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links. --- IkiWiki/Plugin/recentchanges.pm | 2 +- debian/changelog | 2 ++ templates/change.tmpl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index a73ff37b9..3f70664ac 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -131,7 +131,7 @@ sub store ($$$) { #{{{ do => "recentchanges_link", page => $_->{page} ). - "\">". + "\" rel=\"nofollow\">". pagetitle($_->{page}). "" } diff --git a/debian/changelog b/debian/changelog index 6c068806c..566dd1954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low later parsing of any directives on the page. * Fix the link() pagespec to match links that are internally recorded as absolute. + * Add rel=nofollow to recentchanges_links for the same (weak) reasons it + was earlier added to edit links. -- Joey Hess Thu, 06 Nov 2008 16:01:00 -0500 diff --git a/templates/change.tmpl b/templates/change.tmpl index 61a54fded..0aebae61e 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -19,7 +19,7 @@
Changed by: - + -- cgit v1.2.3 From 1ea66c3d3f0a33bc3f04d073457b525a70380c37 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 18:08:09 -0500 Subject: add a robots.txt Yahoo! has been pounding on ikiwiki.cgi again. While I'd prefer ikiwiki to generate sites that avoided robots hitting it in other ways, I'm adding a robots.txt, at least temporarily. --- doc/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/robots.txt diff --git a/doc/robots.txt b/doc/robots.txt new file mode 100644 index 000000000..7be87f9bd --- /dev/null +++ b/doc/robots.txt @@ -0,0 +1,2 @@ +User-Agent: * +Disallow: /ikiwiki.cgi -- cgit v1.2.3 From c1fa07ad4f165b42c962ba2a310681107f38c4f7 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 10 Nov 2008 23:24:22 +0000 Subject: update my userpage (and try out git pushes) --- doc/users/jondowland.mdwn | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn index c6302616f..8bfa3dd76 100644 --- a/doc/users/jondowland.mdwn +++ b/doc/users/jondowland.mdwn @@ -1,5 +1,13 @@ -A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins. +I'm looking at ikiwiki both for my personal site but also as a +team-documentation management system for a small-sized group of UNIX +sysadmins. * My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts) -I am giving a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual [Linux conference](http://www.ukuug.org/events/linux2008/) about organising system administrator documentation which will feature IkiWiki. +I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual +[Linux conference](http://www.ukuug.org/events/linux2008/) about organising +system administrator documentation. Roughly a third of this talk was +discussing IkiWiki in some technical detail and suggesting it as a good piece +of software for this task. + + * slides at . -- cgit v1.2.3 From 91315207cf288b581ff0654225f5ebd111240ea2 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 10 Nov 2008 18:30:08 -0500 Subject: specifying the user in recentchanges for anon git pushes --- doc/tips/untrusted_git_push/discussion.mdwn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/tips/untrusted_git_push/discussion.mdwn diff --git a/doc/tips/untrusted_git_push/discussion.mdwn b/doc/tips/untrusted_git_push/discussion.mdwn new file mode 100644 index 000000000..0c9bd679f --- /dev/null +++ b/doc/tips/untrusted_git_push/discussion.mdwn @@ -0,0 +1,23 @@ +I've just tried this (commit c1fa07a). Recent changes shows: + +
+
Changed pages: + + +diffusers/jondowland + + + +
Changed by: + + +jon + + +
Commit type: +git +
Date: +18:24:22 11/10/08 +
+ +Note that the user for the commit is 'jon', and the link points at cgi to create users/jon. I was wondering if that is configurable for users pushing via git. It would be nice perhaps to specify it in some way, perhaps via a git-config setting (user.name?). I'm not too familiar with exactly what the changeset contains. -- [[JonDowland]] -- cgit v1.2.3 From f28069a05c063c8583b207333a14ed353874d89c Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 10 Nov 2008 23:34:09 +0000 Subject: add discussion on this tip --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn new file mode 100644 index 000000000..6e5f1668a --- /dev/null +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -0,0 +1,14 @@ +The u32 page is excellent, but I wonder if documenting the procedure here +would be worthwhile. Who knows, the remote site might disappear. But also +there are some variations on the approach that might be useful: + + * using a python script and the dom library to extract the page names from + Special:Allpages (such as + ) + * Or, querying the mysql back-end to get the names + * using WWW::MediaWiki for importing/exporting pages from the wiki, instead + of Special::Export + +Also, some detail on converting mediawiki transclusion to ikiwiki inlines... + +-- [[JonDowland]] -- cgit v1.2.3 From 183270a8453c0f504578f0c6b9ad72c6eb5bcc6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 18:34:35 -0500 Subject: response --- doc/tips/untrusted_git_push/discussion.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/tips/untrusted_git_push/discussion.mdwn b/doc/tips/untrusted_git_push/discussion.mdwn index 0c9bd679f..d433d61d4 100644 --- a/doc/tips/untrusted_git_push/discussion.mdwn +++ b/doc/tips/untrusted_git_push/discussion.mdwn @@ -20,4 +20,12 @@ I've just tried this (commit c1fa07a). Recent changes shows: 18:24:22 11/10/08 -Note that the user for the commit is 'jon', and the link points at cgi to create users/jon. I was wondering if that is configurable for users pushing via git. It would be nice perhaps to specify it in some way, perhaps via a git-config setting (user.name?). I'm not too familiar with exactly what the changeset contains. -- [[JonDowland]] +Note that the user for the commit is 'jon', and the link points at cgi to +create users/jon. I was wondering if that is configurable for users pushing +via git. It would be nice perhaps to specify it in some way, perhaps via a +git-config setting (user.name?). I'm not too familiar with exactly what the +changeset contains. -- [[JonDowland]] + +> All ikiwiki can do it look at who git has recorded as the author of +> the change (and it looks at the username part of the email address). +> You can set `user.email` in `.git/config`. --[[Joey]] -- cgit v1.2.3 From 17731892ec458ee6b1b68ce62bf30ad129c87e79 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 10 Nov 2008 23:38:45 +0000 Subject: reply --- doc/tips/untrusted_git_push/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/tips/untrusted_git_push/discussion.mdwn b/doc/tips/untrusted_git_push/discussion.mdwn index d433d61d4..e85625a1b 100644 --- a/doc/tips/untrusted_git_push/discussion.mdwn +++ b/doc/tips/untrusted_git_push/discussion.mdwn @@ -29,3 +29,5 @@ changeset contains. -- [[JonDowland]] > All ikiwiki can do it look at who git has recorded as the author of > the change (and it looks at the username part of the email address). > You can set `user.email` in `.git/config`. --[[Joey]] + +> > Ah, excellent. In which case this *should* DTRT... -- [[JonDowland]] -- cgit v1.2.3 From f8a09ba105e0b58ec59fe4cd8d92a1577cce14d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 19:48:58 -0500 Subject: tag: Normalize tagbase so leading/trailing slashes in it don't break things. --- IkiWiki/Plugin/tag.pm | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index c4a175677..7977bbcf5 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -44,6 +44,7 @@ sub tagpage ($) { #{{{ if ($tag !~ m{^\.?/} && defined $config{tagbase}) { $tag="/".$config{tagbase}."/".$tag; + $tag=~y#/#/#s; # squash dups } return $tag; diff --git a/debian/changelog b/debian/changelog index 566dd1954..c97647948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low absolute. * Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links. + * tag: Normalize tagbase so leading/trailing slashes in it don't break + things. -- Joey Hess Thu, 06 Nov 2008 16:01:00 -0500 -- cgit v1.2.3 From 6049fac46e65d60681366b4324660a6854fd029c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 21:43:59 -0500 Subject: typo --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c97647948..cc277beb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,8 +46,8 @@ ikiwiki (2.68) unstable; urgency=low * inline: Only the last feed link was put on the page, fix this to include all feed links. So rss will be included along with atom, and pages with multiple feeds will get links added for all feeds. - * tag: When tagpage is set, force the links created by tagging to point at - the toplevel tagpage, and not closer subpages. The html links already went + * tag: When tagbase is set, force the links created by tagging to point at + the toplevel tagbase, and not closer subpages. The html links already went there, but internally the links were not recorded as absolute, which could cause confusing backlinks etc. * Add an inject function, that can be used by plugins that want to -- cgit v1.2.3 From 53752bcb5d17ec51901ec926208793f9450b3243 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 21:47:29 -0500 Subject: remove redundant link munge This is not needed now that tagpage returns a page name starting with a slash. (Also fixes a minor bug that the edit links started with double slashes due to the hack.) --- IkiWiki/Plugin/tag.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index 7977bbcf5..d725ef9b3 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -56,13 +56,7 @@ sub taglink ($$$;@) { #{{{ my $tag=shift; my %opts=@_; - my $link=tagpage($tag); - - # Force tag creation links to create the tag under /tagbase, - # if there is a tagbase and this tag used it. - $link="/".$link if $tag ne $link; - - return htmllink($page, $destpage, $link, %opts); + return htmllink($page, $destpage, tagpage($tag), %opts); } #}}} sub preprocess_tag (@) { #{{{ -- cgit v1.2.3 From 8c47f16dccd8a4dd91f365233690bd8139431249 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 11 Nov 2008 04:39:26 +0100 Subject: po: help request Signed-off-by: intrigeri --- doc/plugins/contrib/po.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index cc19c53b3..4ad0fa063 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -118,6 +118,10 @@ Any thoughts on this? >>> accordingly, but I forgot to update this page at the same time. >>> Hoping it's not too complicated to relocated an existing remote... >>> (never done that, I'm a Git beginner as well as a Perl ->>> newbie) --[[intrigeri]]a +>>> newbie) --[[intrigeri]] >>>> >>>> Just a matter of editing .git/config, thanks for the heads up. +>>>>> +>>>>> Joey, please have a look at my branch, your help would be really +>>>>> welcome for the security research, as I'm almost done with what +>>>>> I am able to do myself in this area. --[[intrigeri]] -- cgit v1.2.3