From 0d8f3310cb631439ff12cfa0483bdb56fc66556b Mon Sep 17 00:00:00 2001 From: spalax Date: Mon, 30 Dec 2013 18:39:07 -0400 Subject: [PATCH 01/14] Personnal wishlist --- doc/users/spalax.mdwn | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/users/spalax.mdwn b/doc/users/spalax.mdwn index 764bf4a7f..4a3e823ac 100644 --- a/doc/users/spalax.mdwn +++ b/doc/users/spalax.mdwn @@ -2,10 +2,23 @@ User of IkiWiki. -I wrote and maintain a few plugins, which are available here: [[https://atelier.gresille.org/projects/gresille-ikiwiki]]. +# Plugins -[[!map pages="plugins/* and author(spalax)"]] +I wrote and maintain a few plugins, which are available here: [[https://atelier.gresille.org/projects/gresille-ikiwiki]]. [[!map pages="plugins/contrib/* and ! plugins/contrib/*/* and link(.)"]] +# Wishlist + +I have a few things in mind. Their status is something between *I will implement it someday* to *maybe someone could need this* or *I will need it if I implement this killer website I have in mind*. + +* [[plugins/contrib/addtag]]: Add the necessary javascript in the edit page to enable adding tags to the page by simply clicking one some link. +* [[plugins/contrib/jssearchtag]]: Create a page where user can tick or untick any combination of tag (s)he want, and dynamically sees an inline of the matching pages. I have to see to what extent the [[plugins/contrib/jssearchfield|jssearchfield]] plugin already does the same thing (not tested yet). +* [[plugins/contrib/parenttag]]: When a page is tagged `mathematics/algebra` (using `\[[!tag mathematics/algebra]]`), it is automatically tagged `mathematics` as well. Second step: looks inside page content for tags as user is typing, and allow user to remove them by clicking somewhere. +* [[plugins/contrib/htaccessmanager]]: Create a cgi page to manage a htaccess file. +* Automatically add calendar pages (see the [[ikiwiki-calendar discussion|ikiwiki-calendar/discussion]]). + + +# Contact + Contact: `spalax at gresille dot org`. From 701ecfc2bb339d438d1138233e8a9250e580adf1 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 30 Dec 2013 20:53:36 -0400 Subject: [PATCH 02/14] Reply on the cgit URL encoding problem. --- doc/todo/support_linking_to_cgit.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn index 92c7cb8a6..5c61ff42f 100644 --- a/doc/todo/support_linking_to_cgit.mdwn +++ b/doc/todo/support_linking_to_cgit.mdwn @@ -17,4 +17,16 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`? > In `91b477c` I made a similar change to how the cvs backend encodes > `diffurl`. Perhaps it applies to all VCS backends? --[[schmonz]] +>> Thanks a lot! I've not looked at it yet, but will try to do so +>> soonish, as this bug is a real problem for Tails when welcoming potential +>> new contributors. +>> +>> Also, note that this does not affect recentchanges only: we have +>> the same problem for URLs generated by the shortcut plugin, e.g. +>> `\[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/unsafe-browser]]` +>> in a page (with the shortcut defined as +>> `\[[!shortcut name=tails_gitweb url="https://git-tails.immerda.ch/tails/plain/%s"]]`) +>> produces URLs with `/` encoded as `%2F`, which fails the same way +>> in combination with cgit. --[[intrigeri]] + [[wishlist]] From 5351cdd0f0b1475775d09b342e244f79626d7acd Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 30 Dec 2013 21:02:59 -0400 Subject: [PATCH 03/14] I forgot about %S, sorry. --- doc/todo/support_linking_to_cgit.mdwn | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn index 5c61ff42f..758fd0bf4 100644 --- a/doc/todo/support_linking_to_cgit.mdwn +++ b/doc/todo/support_linking_to_cgit.mdwn @@ -19,14 +19,6 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`? >> Thanks a lot! I've not looked at it yet, but will try to do so >> soonish, as this bug is a real problem for Tails when welcoming potential ->> new contributors. ->> ->> Also, note that this does not affect recentchanges only: we have ->> the same problem for URLs generated by the shortcut plugin, e.g. ->> `\[[!tails_gitweb config/chroot_local-includes/usr/local/sbin/unsafe-browser]]` ->> in a page (with the shortcut defined as ->> `\[[!shortcut name=tails_gitweb url="https://git-tails.immerda.ch/tails/plain/%s"]]`) ->> produces URLs with `/` encoded as `%2F`, which fails the same way ->> in combination with cgit. --[[intrigeri]] +>> new contributors. --[[intrigeri]] [[wishlist]] From f3696cca89bc2606e05269fc8cc15f6c96b13881 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 31 Dec 2013 01:49:57 +0000 Subject: [PATCH 04/14] Implemented, needs review. --- doc/todo/support_linking_to_cgit.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn index 758fd0bf4..00afb82fd 100644 --- a/doc/todo/support_linking_to_cgit.mdwn +++ b/doc/todo/support_linking_to_cgit.mdwn @@ -21,4 +21,10 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`? >> soonish, as this bug is a real problem for Tails when welcoming potential >> new contributors. --[[intrigeri]] +>>> My `fix_diffurl_vs._cgit` branch now implements schmonz' change +>>> for the Git plugin. Please review and merge if you like +>>> it. --[[intrigeri]] + [[wishlist]] + +[[!tag patch]] From 160d7d633995a30b783322428867333751c784a0 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 31 Dec 2013 01:56:54 +0000 Subject: [PATCH 05/14] This was released a while ago, closing. --- doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn index eba59a682..d672d1c04 100644 --- a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn +++ b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn @@ -20,3 +20,5 @@ enabled: inserting a html tag without closing it is enough. > will be releasing that soon. I will cherry-pick the fix into at least > my debian-stable branch too. I don't know if this is worth doing a whole > security advisory for. --[[Joey]] + +[[done]] From 548fc7996287cce868197a17d72908328b645c5c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 31 Dec 2013 01:59:56 +0000 Subject: [PATCH 06/14] I don't plan to work on this any time soon, flagging wishlist. The translators I work with use a Git-based pull request + review + merge workflow nowadays. --- doc/todo/po:_better_translation_interface.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/po:_better_translation_interface.mdwn b/doc/todo/po:_better_translation_interface.mdwn index d2ae2ed5c..68da99f6f 100644 --- a/doc/todo/po:_better_translation_interface.mdwn +++ b/doc/todo/po:_better_translation_interface.mdwn @@ -3,3 +3,5 @@ with automatic escaping of special chars. [[Integrating with transifex|todo/po: transifex integration]] or with Pootle would be another way to go. + +[[wishlist]] From 4e891bd9d0fdb8bd0f65a0301d11f90aa8971536 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 31 Dec 2013 03:14:07 +0000 Subject: [PATCH 07/14] A rough implementation is now available, needs testing. --- doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn index 5d0318ae1..6c11fa17b 100644 --- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn +++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn @@ -11,3 +11,9 @@ files from the source repository when it has been disabled? >> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]] >>> I guess you could call `rcs_remove` followed by `unlink`. --[[Joey]] + +>>>> Implemented in my `po-disable` branch, added a basic test case +>>>> that passes, not tested in a real ikiwiki with a VCS yet. +>>>> Not sure I'll have time to do better any time soon, but for +>>>> anyone interested to lead this to completion, it should be a good +>>>> starting point. --[[intrigeri]] From 6d30cfc8646d3651196bfbe779ec61dcd3c545f9 Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 31 Dec 2013 16:27:35 +0100 Subject: [PATCH 08/14] Removed dead links --- doc/ikiwikiusers.mdwn | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index c00b8e74e..70d5042b7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -32,7 +32,7 @@ Projects & Organizations * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman) * The [Relativistic Programming research wiki](http://wiki.cs.pdx.edu/rp). * [Debian-IN](http://debian-in.alioth.debian.org/) -* [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/) +* [Braawi Ltd](http://braawi.com/) * [Webconverger](http://webconverger.org/) (a Web only linux distribution) with a [blog](http://webconverger.org/blog/) * [DebTorrent](http://debtorrent.alioth.debian.org) * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/) @@ -41,20 +41,17 @@ Projects & Organizations * [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend. * Reusable technical support websites, developed for [Redpill](http://redpill.dk/) realms: * [master demo site](http://support.redpill.dk/) ([source](http://source.redpill.dk/)) - * [Homebase](http://support.homebase.dk/) ([source](http://source.homebase.dk/)) + * [Homebase](http://support.homebase.dk/) * [Bitbase](http://support.bitbase.dk/) ([source](http://source.bitbase.dk/)) * [Børneuniversitetet](http://support.borneuni.dk/) ([source](http://source.borneuni.dk/)) * [CampusGrün Hamburg](http://www.campusgruen.org/) * The [awesome window manager homepage](http://awesome.naquadah.org/) -* [vcs-pkg](http://vcs-pkg.org) * [vcs-home](http://vcs-home.madduck.net) * [Public Domain collection of Debian related tips & tricks](http://dabase.com/tips/) - please add any tips too * [Finnish Debian community](http://debian.fi) -* [INCL intranuclear cascade and ABLA evaporation/fission](http://www.cs.helsinki.fi/u/kaitanie/incl/) * [dist-bugs](http://dist-bugs.kitenet.net/) * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de) * [monkeysphere](http://web.monkeysphere.info/) -* [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) * [MIT Student Information Processing Board](http://sipb.mit.edu/) @@ -67,18 +64,13 @@ Projects & Organizations * [Debian Costa Rica](http://cr.debian.net/) * [Fvwm Wiki](http://fvwmwiki.xteddy.org) * [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. -* [Apua IT](http://apua.se/) -* [PDFpirate Community](http://community.pdfpirate.org/) * [Software in the Public Interest](http://spi-inc.org/) * [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/) * [The FreedomBox Foundation](http://www.freedomboxfoundation.org/) -* [TenderWarehouse Community](http://community.tenderwarehouse.org/) * [AntPortal](http://antportal.com/wiki/) - also see our templates and themes on [github](https://github.com/AntPortal/ikiwiked) * [The Amnesic Incognito Live System](https://tails.boum.org/index.en.html) * [The Progress Linux OS wiki](http://wiki.progress-linux.org/) * [Oxford Computer Society](http://www.ox.compsoc.net/) -* [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/) -* [Arcada Project](http://arcadaproject.org/) * [*BSD UNIX user group in Denmark](http://www.bsd-dk.dk/) * [Telecomix Broadcast System](http://broadcast.telecomix.org/) * [WikiMIX.cc](http://WikiMIX.cc/) @@ -103,16 +95,14 @@ Personal sites and blogs * [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog * [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry) -* [Ulrik's personal web page](http://kaizer.se/wiki/) * [kite](http://kitenet.net) -* [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/) -* [Alessandro Dotti Contra's personal website](http://www.dotticontra.org/) and [weblog](http://www.dotticontra.org/blog) +* [Alessandro Dotti Contra's personal website](http://www.dotticontra.org/) * [Kelly Clowers' personal website](http://www.clowersnet.net/) * [Anna's nature features](http://kitenet.net/~anna/nature-feature/) * [Roland Mas's blog](http://roland.entierement.nu/categories/geek-en.html) -* [Sergio Talens-Oliag's personal wiki](http://mixinet.net/~sto/) and [blog](http://mixinet.net/~sto/blog.html) +* [Sergio Talens-Oliag's personal wiki](http://mixinet.net/~sto/) and [blog](http://mixinet.net/~sto/blog) * [Christian Aichinger's homepage](http://greek0.net/) -* Ben A'Lee's [homepage](http://subvert.org.uk/~bma/) and [wiki](http://wiki.subvert.org.uk/). +* Ben A'Lee's [homepage](http://benjaminalee.co.uk/). * [Adam Shand's homepage](http://adam.shand.net/iki/) * [Hess family wiki](http://kitenet.net/~family/) * [Zack](http://upsilon.cc/~zack)'s homepage, including [his weblog](http://upsilon.cc/~zack/blog/) @@ -120,7 +110,6 @@ Personal sites and blogs * [Keith Packard's homepage and blog](http://keithp.com/). * [Christian Mock's homepage](http://www.tahina.priv.at/). * [Choffee](http://choffee.co.uk/). -* [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog. * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/) * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall * [Schabis blaue Seite](http://schabi.de) - I abuse ikiwiki as blog/cms combo, and will migrate all existing content into ikiwiki eventually. @@ -150,7 +139,7 @@ Personal sites and blogs * [Per Bothner's blog](http://per.bothner.com/blog/) * [Bernd Zeimetz (bzed)](http://bzed.de/) * [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch) -* [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!! +* [NeoCarz Wiki](http://www.neocarz.com/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!! * [Natalian - Kai Hendry's personal blog](http://natalian.org/) * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au) * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage @@ -170,7 +159,6 @@ Personal sites and blogs * [Mukund](https://mukund.org/) * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) -* [Thomas Kane](http://planetkane.org/) * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... @@ -189,7 +177,6 @@ Personal sites and blogs * [The personal website of Andrew Back](http://carrierdetect.com) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. * [Salient Dream](http://www.salientdream.com/) - All Things Strange. -* [Kafe-in.net](https://www.kafe-in.net/) Ugly personnal blog. * [Anton Berezin's blog](http://blog.tobez.org/) * [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany. * [[OscarMorante]]'s [personal site](http://oscar.morante.eu). From c1d0e520958335ce48b016e63f75323cf1469e62 Mon Sep 17 00:00:00 2001 From: spalax Date: Tue, 31 Dec 2013 11:52:12 -0400 Subject: [PATCH 09/14] Added link to plugins/contrib/created_in_future --- doc/todo/tagging_with_a_publication_date.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/tagging_with_a_publication_date.mdwn b/doc/todo/tagging_with_a_publication_date.mdwn index 39fc4e220..b4d3ca007 100644 --- a/doc/todo/tagging_with_a_publication_date.mdwn +++ b/doc/todo/tagging_with_a_publication_date.mdwn @@ -69,3 +69,9 @@ on vacation". >>> >>> You'd still need a cron job to run ikiwiki -refresh every hour, or >>> whatever, so it can update. --[[Joey]] + +--- + +Some times ago, I wrote a Pagespec function that matches pages that have creation date in the future: [[plugins/contrib/created_in_future/]]. It can be used to solve the original problem. + +-- [[Louis|spalax]] From 7c171d57bae6729a0315ee8a73c2e7e14d3f2e8b Mon Sep 17 00:00:00 2001 From: spalax Date: Tue, 31 Dec 2013 11:56:24 -0400 Subject: [PATCH 10/14] Added link to plugins/contrib/created_in_future --- doc/todo/auto_publish_expire.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/todo/auto_publish_expire.mdwn b/doc/todo/auto_publish_expire.mdwn index 7a5a17517..09e8b0873 100644 --- a/doc/todo/auto_publish_expire.mdwn +++ b/doc/todo/auto_publish_expire.mdwn @@ -29,5 +29,13 @@ The date for publishing and expiring could be set be using some new directives; > I do think the general problem with that approach is that you have to be > careful to prevent the unpublished pages from leaking out in any > inlines, maps, etc. --[[Joey]] +> + +> Some times ago, I wrote a Pagespec function that matches pages that have +> creation date in the future: [[plugins/contrib/created_in_future/]]. It can +> be used to solve part of the original problem: publication on some date. For +> unpublication, I think that my plugin is not sufficient. +> +> -- [[Louis|spalax]] [[!tag wishlist]] From 2280b3b5c25c57f6daad4efed4209bd8265898a0 Mon Sep 17 00:00:00 2001 From: spalax Date: Tue, 31 Dec 2013 12:02:35 -0400 Subject: [PATCH 11/14] Added link to plugins/contrib/created_in_future --- doc/todo/publishing_in_the_future.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/todo/publishing_in_the_future.mdwn b/doc/todo/publishing_in_the_future.mdwn index 55fe3aa1f..9b6f3f885 100644 --- a/doc/todo/publishing_in_the_future.mdwn +++ b/doc/todo/publishing_in_the_future.mdwn @@ -125,3 +125,11 @@ Thoughts on the whole idea? — [[Jon]] >> implemented itself in terms of cron, or at, or both, or possibly >> other things depending on what people want to support). But that would >> be substantially more work, more than I can afford atm at least. — [[Jon]] + +> Some times ago, I wrote a Pagespec function that matches pages that have +> creation date in the future: [[plugins/contrib/created_in_future/]]. It can +> be enhanced to create the `current_date_before()` pagespec. The +> interesting part of my plugin is that it makes IkiWiki rebuild pages on the +> right date. +> +> -- [[Louis|spalax]] From 702a3e52eff762d962eeee0eed1336fdffd6f45e Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/EqhTfe4jxPljwEft7thqCULdP0RN0qk-#f8830" Date: Thu, 2 Jan 2014 04:23:41 -0400 Subject: [PATCH 12/14] --- doc/index.mdwn | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 89802c604..10ff84951 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -1,30 +1,5 @@ -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]] and [[podcasting|podcast]], as well as a large -array of [[plugins]]. +# An elephant can die from a broken heart -[[!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]]. Basic documentation for ikiwiki plugins -and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for -discussions. - -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]]. +It turns out that [elephants](http://www.omg-facts.com/Animals/An-Elephant-Can-Die-From-A-Broken-Heart/2937) are highly emotional animals. They form close-knit relationships with one another and mourn the loss of loved ones. At times, if a fellow elephant dies, the others in the herd will gather around and pay their respects as if at a funeral. +If a baby elephant loses its mother, it will grieve. The elephant will often become withdrawn and emaciated. Other members of the herd will gather around and nurse the orphan back to life. Elephants can form deep attachments with humans too. +In one case, an elephant handler raised a baby elephant. She had to go away for a brief time to attend her daughter’s wedding. When she returned, she found that the baby elephant had died of a broken heart at her absence. From ee423fdb963713508273fa383edee6e51702d005 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Thu, 2 Jan 2014 10:52:14 +0100 Subject: [PATCH 13/14] Revert spam. This reverts commit 702a3e52eff762d962eeee0eed1336fdffd6f45e. --- doc/index.mdwn | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 10ff84951..89802c604 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -1,5 +1,30 @@ -# An elephant can die from a broken heart +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]] and [[podcasting|podcast]], as well as a large +array of [[plugins]]. -It turns out that [elephants](http://www.omg-facts.com/Animals/An-Elephant-Can-Die-From-A-Broken-Heart/2937) are highly emotional animals. They form close-knit relationships with one another and mourn the loss of loved ones. At times, if a fellow elephant dies, the others in the herd will gather around and pay their respects as if at a funeral. -If a baby elephant loses its mother, it will grieve. The elephant will often become withdrawn and emaciated. Other members of the herd will gather around and nurse the orphan back to life. Elephants can form deep attachments with humans too. -In one case, an elephant handler raised a baby elephant. She had to go away for a brief time to attend her daughter’s wedding. When she returned, she found that the baby elephant had died of a broken heart at her absence. +[[!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]]. Basic documentation for ikiwiki plugins +and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for +discussions. + +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]]. From da5afbfbc0b7b90c6cc02d00dff583bf813fd4aa Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Thu, 2 Jan 2014 10:53:51 +0100 Subject: [PATCH 14/14] document spam --- doc/spam_fighting.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn index e5aa9f63e..bcb9d47bc 100644 --- a/doc/spam_fighting.mdwn +++ b/doc/spam_fighting.mdwn @@ -26,4 +26,5 @@ d93a948 | 2013/09/05 | soman81 | 31.17.11.19 d759052 | 2013/09/08 | spain1001 | 80.187.106.2 24a1c62 | 2013/09/15 | spain1001 | 80.187.106.136 cba01c2 | 2013/09/15 | spain1001 | 80.187.106.136 +702a3e5 | 2014/01/02 | Toni | 124.105.173.121 """]]