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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 85e3e07bc6620a0c0dadb05fedc18e340aa0eef0..4808e57181a2346d0e48f0ae3fdea15064f56571 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -84,6 +84,7 @@ think about merging them. This is recommended. :-)
 * [[users/mjd]] `https://github.com/mjdominus/ikiwiki.git` ([[browse|https://github.com/mjdominus/ikiwiki]])
 * [[users/kjs]] `git://src.kalleswork.net/ikiwiki.git`
 * bfree `git://github.com/bfree/ikiwiki.git`
+* [[users/leg]] `git://at.magma-soft.at/ikiwiki.info`
 
 ## branches
 

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ab1d7ddcfc57cfa25b43e63dde3accb549ef964e..f79b4498b875981a6c8a5f10ed2fff47401b0c44 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -106,6 +106,9 @@ Projects & Organizations
 * [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
 * [Bürgerinitiative S4-Ausbau](https://www.s4-ausbau.de/) - A initative in the larger munich area to improve the public transport line S4
 * [MagmaSoft](http://magma-soft.at/), as well as the support site and the [Software Wiki](http://at.magma-soft.at/sw/)
+* [[voice in time|http://voice-in-time.com]] a voice recording studio located in Hamburg, Germany (rather complex build using ikiwiki only, providing CGI access for the customer)
+* [[nb instrument|http://nb-instrument.com]] a workshop for beautifully handcrafted musical instruments, located in Hamburg, Germany (also one of our rather complex builds using ikiwiki only, providing CGI access for the customer)
+* [[coido architects|http://coido.de]] architectural company, located in Hamburg, Germany and Rotterdam, Netherlands (also rather complex build adding masonry and gallery scripts and some pjaxing to the picture, providing CGI access for the customer)
 
 Personal sites and blogs
 ========================

diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn
index 04a9166a8e9e883705702141b20ba0f44d580d99..239d33eec9798f2c7096ae9b44f6c8a0ac61d229 100644 (file)
--- a/doc/todo/BrowserID.mdwn
+++ b/doc/todo/BrowserID.mdwn
@@ -23,3 +23,6 @@ Some additional information on BrowserID:
 > program (haskell would be fine ;),
 > of <https://wiki.mozilla.org/Identity/BrowserID#Assertion_Verification>.
 > --[[Joey]]
+
+BrowserID, or Mobilla Persona, is shutting down with 30th of November 2016.
+Seen at <https://login.persona.org/about> --[[leg]]

diff --git a/doc/users/SamHathaway.mdwn b/doc/users/SamHathaway.mdwn
new file mode 100644 (file)
index 0000000..6458c2e
--- /dev/null
+++ b/doc/users/SamHathaway.mdwn
@@ -0,0 +1 @@
+Hey, this is my user page.

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index ff594fd122dc261475f4df15e81024892d6b298a..0cee27ec19e37a5afe56f13d1dcfe212890b76db 100644 (file)
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -17,6 +17,7 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
   authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) plugin)
 * [A small personal site](http://www.anglofish.net/) (happily hosted at
   [Branchable](http://www.branchable.com/))
+* [A wiki about Agile in distributed teams](http://shapemywork.com/)
 
 ## Non-public