aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-03-28 13:30:00 -0400
committerJoey Hess <joey@kitenet.net>2013-03-28 13:30:00 -0400
commit2e05867a2f8d404a4f66dcdac10f838d05a748ef (patch)
treef4c2533ac7aceb98441d921fdb1effe035d6c876
parentab352678500156a9444a5815d65956af0aba7e4f (diff)
parentf1df82a0e0fa444dfa14654bc19e85ee4109ce77 (diff)
downloadikiwiki-2e05867a2f8d404a4f66dcdac10f838d05a748ef.tar
ikiwiki-2e05867a2f8d404a4f66dcdac10f838d05a748ef.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
-rw-r--r--doc/ikiwikiusers.mdwn2
-rw-r--r--doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn8
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 309814558..374b2a88e 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -189,4 +189,4 @@ Personal sites and blogs
* [[Martín Ferrari's homepage|http://tincho.org/]] and [[blog|http://blog.tincho.org/]]
* [WikiAtoBR](http://wiki.hi.ato.br) Open, free and annoymous wiki. No need for account registering and login. It is Brazilian so it is in Portuguese.
* [Manifesto](http://manifesto.hi.ato.br) Open, free and annoymous blog. No need for account registering and login. It is Brazilian so it is in Portuguese.
-
+ * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri
diff --git a/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn b/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn
new file mode 100644
index 000000000..a13218883
--- /dev/null
+++ b/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn
@@ -0,0 +1,8 @@
+GitHub's flavor of markdown adds fenced code blocks, delimited by triple-backquotes, like this:
+
+ ```
+ code
+ more code
+ ```
+
+That syntax proves quite a bit more convenient in many cases, because it doesn't require modifying every line of the code block to add indentation. Please consider adding optional support for this in ikiwiki. Please also consider turning it on by default for new wikis, though not for existing wikis since it could *potentially* break backward compatibility with existing content.