Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / ikiwikiusers.mdwn

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 24c1af8f288d4e0f058d177b863699fdbd37c2ca..2ce5f885f1ab51b140323bae94c4c6dc28b29e6b 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -101,6 +101,8 @@ Projects & Organizations
 * [[hplusroadmap|http://diyhpl.us/wiki/]] - a community for open source hardware, do-it-yourself biohacking and practical transhumanism
 * [[OpenAFS|http://wiki.openafs.org]] - an open-source, cross-platform distributed file system
 * [Copyleft.org](http://copyleft.org/)
 * [[hplusroadmap|http://diyhpl.us/wiki/]] - a community for open source hardware, do-it-yourself biohacking and practical transhumanism
 * [[OpenAFS|http://wiki.openafs.org]] - an open-source, cross-platform distributed file system
 * [Copyleft.org](http://copyleft.org/)

+* [Hacklab Independência](https://hi.ato.br) - radical tech collective
+* [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites

 
 Personal sites and blogs
 ========================
 
 Personal sites and blogs
 ========================


@@ -193,8 +195,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/]]
 * [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.

  * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri
 * Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled
 * [Anarcat's homepage](http://anarcat.ath.cx/) - with a custom [[theme|theme_market]]
  * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri
 * Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled
 * [Anarcat's homepage](http://anarcat.ath.cx/) - with a custom [[theme|theme_market]]


@@ -206,3 +206,12 @@ Personal sites and blogs
 * [James Technotes](http://jamestechnotes.com), my [wiki](http://jamestechnotes.com) and [blog](http://jamestechnotes.com/blog).
 * [Amitai Schlair's site](http://www.schmonz.com/)
 * My ([[spalax]]) [professional website](http://paternault.fr)
 * [James Technotes](http://jamestechnotes.com), my [wiki](http://jamestechnotes.com) and [blog](http://jamestechnotes.com/blog).
 * [Amitai Schlair's site](http://www.schmonz.com/)
 * My ([[spalax]]) [professional website](http://paternault.fr)

+* [Aloodo Blog](http://blog.aloodo.org/)
+* Ninguém tem blog! - Restricted ikiwiki hosting
+  * [Dissertos radicais](http://dissertosradicais.tem.blog.br)
+  * [E pelas praças não terá nome](http://epelaspracasnaoteranome.tem.blog.br)
+  * [Igreja Universal do Reino do Iuri](http://iuri.tem.blog.br)
+  * [Mim](http://mim.tem.blog.br)
+* [Mídia Capoeira](https://capoeira.li/blog/) - independent journalism initiative
+* [Sean Whitton's personal website](http://spwhitton.name/)
+* [Matto's personal website](https://box.matto.nl)