diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-12-10 22:19:19 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-12-10 22:19:19 -0500 |
| commit | a21aa6b9c562cdf451977b80cbf5b31cb4d28bac (patch) | |
| tree | 24b3fc413c03a66c77aa2996c494b87b7caaab58 | |
| parent | 18cc0aa1c2d918f16f425e4a0e18b7d16919dbf6 (diff) | |
| parent | a132ca7c62df5ceb6c3be425613cd36c1938e335 (diff) | |
| download | ikiwiki-a21aa6b9c562cdf451977b80cbf5b31cb4d28bac.tar ikiwiki-a21aa6b9c562cdf451977b80cbf5b31cb4d28bac.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/news/version_3.20091113.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn | 7 | ||||
| -rw-r--r-- | doc/users/xma.mdwn | 28 |
3 files changed, 9 insertions, 30 deletions
diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn index f313b57d1..579174011 100644 --- a/doc/news/version_3.20091113.mdwn +++ b/doc/news/version_3.20091113.mdwn @@ -13,6 +13,6 @@ ikiwiki 3.20091113 released with [[!toggle text="these changes"]] * httpauth: Add cgiauthurl setting that can be used to do http basic auth only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. - * inline: Do not generated feeds for nested inlines. + * inline: Do not generate feeds for nested inlines. * inline: Allow direct inclusion of non-page files in raw mode. - * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
\ No newline at end of file + * inline: Fix display of all pages when archive=yes or show=0 are used."""]] diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn index 2d90772db..ce51d90a3 100644 --- a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn +++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn @@ -4,6 +4,12 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h > This change to toc.pm should do it. --[[KathrynAndersen]] +> > The patch looks vaguely OK to me but it's hard to tell without +> > context. It'd be much easier to review if you used unified diff +> > (`diff -u`), which is what `git diff` defaults to - almost all +> > projects prefer to receive changes as unified diffs (or as +> > branches in their chosen VCS, which is [[git]] here). --[[smcv]] + 56,57c56,57 < my $curlevel; < my $startlevel=0; @@ -19,3 +25,4 @@ Currently, the levels=X parameter lets you tweak how deep it will go for small h > return; > } +[[!tag patch]] diff --git a/doc/users/xma.mdwn b/doc/users/xma.mdwn deleted file mode 100644 index 89f2ff74c..000000000 --- a/doc/users/xma.mdwn +++ /dev/null @@ -1,28 +0,0 @@ -[[!meta title="Xavier Maillard"]] -# Xavier Maillard - -I just started using [[ikiwiki]] for my own webspace at http://maillard.mobi/~xma/wiki - -I am learning how to effectively use it. - -Anyway, [[ikiwiki]] is really *awesome* ! - -## 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]]. - -## Contacting me - -Various channels to contact me: - -- mail: xma@gnu.org -- jabber: xma01@jabber.fr -- mobile: +33 621-964-362 (I only anwser to people I know though) - -Voila. - -## Plans - -I am planning to make a presentation of [[ikiwiki]]to my [local LUG](http://lolica.org) for our next montly meeting. Any help would be greatly appreciated. - -We are discussing to replace our old unmaintained (and unmaintainable) [SPIP](http://spip.net) website with a wiki. This is why I would like using ikiwiki ;) |