From: Joey Hess <joey@kitenet.net>
Date: Thu, 14 Mar 2013 15:29:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c8bc7dfa66a217d664ca0cd396853c84d22f6531?hp=263db21b0f9627d02224487bd1e3e37cc8e13957

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index bb94242bb..309814558 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -187,3 +187,6 @@ Personal sites and blogs
 * [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.  
 * [[LucaCapello]]'s [homepage](http://luca.pca.it)
 * [[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.
+
diff --git a/doc/logo.mdwn b/doc/logo.mdwn
index 5e2b3c736..3608cb382 100644
--- a/doc/logo.mdwn
+++ b/doc/logo.mdwn
@@ -57,3 +57,13 @@ added).
   A simplified (442 byte) plain SVG version of the ikiwiki favicon.
 
   Contributed by [[JasonBlevins]]
+
+* <https://archive.org/download/IkiwikiLogo-hi.ato.br/ikiwiki_logo-hiato.png>
+
+  Hosted on: <https://archive.org/details/IkiwikiLogo-hi.ato.br>
+
+  I had to change the black letters to #c8c8c8 to put in my website.
+
+  This was created from the svg source.
+
+  Contributed by [[hiato]]
diff --git a/doc/plugins/comments/discussion.mdwn b/doc/plugins/comments/discussion.mdwn
index ceb02406d..2b8add938 100644
--- a/doc/plugins/comments/discussion.mdwn
+++ b/doc/plugins/comments/discussion.mdwn
@@ -227,3 +227,6 @@ use those formats because it would be a security problem.
 Any suggestions or hints how to implement this?
 
 -- [[wentasah]]
+
+> I've implemented this. See [[todo/Restrict_formats_allowed_for_comments]].
+> --[[wentasah]]
diff --git a/doc/todo/sortable_tables.mdwn b/doc/todo/sortable_tables.mdwn
new file mode 100644
index 000000000..8e7e6fe25
--- /dev/null
+++ b/doc/todo/sortable_tables.mdwn
@@ -0,0 +1 @@
+It would be nice if ikiwiki's table plugin could create sortable tables like Mediawiki does.