Recent changes to this wiki:

fix url
diff --git a/services/mx.mdwn b/services/mx.mdwn
index 7f34986949..86951e8036 100644
--- a/services/mx.mdwn
+++ b/services/mx.mdwn
@@ -4,4 +4,4 @@ In Postfix, this is configured with the [`relay_domains`](http://www.postfix.org
 
 It is unclear how such a list should be constructed. Anarcat's uses `/etc/passwd` as a database of valid recipients, through the default configuration, namely [`local_recipient_maps`](http://www.postfix.org/postconf.5.html#local_recipient_maps)` = proxy:unix:passwd.byname $alias_maps`. That list would need to be somehow extracted and copied over to the backup MX.
 
-It may also be useful to change [`maximal_queue_lifetime`](http://www.postfix.org/postconf.5.html#maximal_queue_lifetime) specifically for that transport so that emails can survive for longer in case of outage. It is *not* possible to have a different expiry for the relayed destinations, see [this FAQ](http://www.seaglass.com/postfix/faq.html#qexpmsg0) for rationale.
+It may also be useful to change [`maximal_queue_lifetime`](http://www.postfix.org/postconf.5.html#maximal_queue_lifetime) specifically for that transport so that emails can survive for longer in case of outage. It is *not* possible to have a different expiry for the relayed destinations, see [this FAQ](http://www.seaglass.com/postfix/faq.html#qexpmsg) for rationale.

no differential expiry
diff --git a/services/mx.mdwn b/services/mx.mdwn
index 27f5ffe7f7..7f34986949 100644
--- a/services/mx.mdwn
+++ b/services/mx.mdwn
@@ -4,4 +4,4 @@ In Postfix, this is configured with the [`relay_domains`](http://www.postfix.org
 
 It is unclear how such a list should be constructed. Anarcat's uses `/etc/passwd` as a database of valid recipients, through the default configuration, namely [`local_recipient_maps`](http://www.postfix.org/postconf.5.html#local_recipient_maps)` = proxy:unix:passwd.byname $alias_maps`. That list would need to be somehow extracted and copied over to the backup MX.
 
-It may also be useful to change [`maximal_queue_lifetime`](http://www.postfix.org/postconf.5.html#maximal_queue_lifetime) specifically for that transport so that emails can survive for longer in case of outage.
+It may also be useful to change [`maximal_queue_lifetime`](http://www.postfix.org/postconf.5.html#maximal_queue_lifetime) specifically for that transport so that emails can survive for longer in case of outage. It is *not* possible to have a different expiry for the relayed destinations, see [this FAQ](http://www.seaglass.com/postfix/faq.html#qexpmsg0) for rationale.

mention queue lifetime
diff --git a/services/mx.mdwn b/services/mx.mdwn
index 06963d1d06..27f5ffe7f7 100644
--- a/services/mx.mdwn
+++ b/services/mx.mdwn
@@ -3,3 +3,5 @@ A [secondary backup mail exchanger](https://en.wikipedia.org/wiki/MX_record#The_
 In Postfix, this is configured with the [`relay_domains`](http://www.postfix.org/postconf.5.html#relay_domains) and [`relay_recipient_maps`](http://www.postfix.org/postconf.5.html#relay_recipient_maps) as [documented here](http://www.postfix.org/STANDARD_CONFIGURATION_README.html#backup). The configuration is fairly straightforward, although it does mean the backup MX needs to have an up to date list of valid recipients to avoid backscatter spam.
 
 It is unclear how such a list should be constructed. Anarcat's uses `/etc/passwd` as a database of valid recipients, through the default configuration, namely [`local_recipient_maps`](http://www.postfix.org/postconf.5.html#local_recipient_maps)` = proxy:unix:passwd.byname $alias_maps`. That list would need to be somehow extracted and copied over to the backup MX.
+
+It may also be useful to change [`maximal_queue_lifetime`](http://www.postfix.org/postconf.5.html#maximal_queue_lifetime) specifically for that transport so that emails can survive for longer in case of outage.

describe how this could work
diff --git a/services/mx.mdwn b/services/mx.mdwn
new file mode 100644
index 0000000000..06963d1d06
--- /dev/null
+++ b/services/mx.mdwn
@@ -0,0 +1,5 @@
+A [secondary backup mail exchanger](https://en.wikipedia.org/wiki/MX_record#The_backup_MX) is a mail server which starts receiving mail once the main mail server goes down.
+
+In Postfix, this is configured with the [`relay_domains`](http://www.postfix.org/postconf.5.html#relay_domains) and [`relay_recipient_maps`](http://www.postfix.org/postconf.5.html#relay_recipient_maps) as [documented here](http://www.postfix.org/STANDARD_CONFIGURATION_README.html#backup). The configuration is fairly straightforward, although it does mean the backup MX needs to have an up to date list of valid recipients to avoid backscatter spam.
+
+It is unclear how such a list should be constructed. Anarcat's uses `/etc/passwd` as a database of valid recipients, through the default configuration, namely [`local_recipient_maps`](http://www.postfix.org/postconf.5.html#local_recipient_maps)` = proxy:unix:passwd.byname $alias_maps`. That list would need to be somehow extracted and copied over to the backup MX.

make a docs page instead
diff --git a/services.mdwn b/services.mdwn
index 5a3ebbb3b6..816e1d1ef9 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -20,4 +20,4 @@ See [[guidelines]] for terms of use.
 
 Services requests and offers can be mentionned here.
 
- * anarcat is looking for a [secondary backup mail exchanger](https://en.wikipedia.org/wiki/MX_record#The_backup_MX) for his own server. he would, obviously, offer the same service in exchange.
+ * anarcat is looking for a [[mx]] for his own server. he would, obviously, offer the same service in exchange.

i am looking for a secondary MX
diff --git a/services.mdwn b/services.mdwn
index 57d39b5aae..5a3ebbb3b6 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -15,3 +15,9 @@ hosted on their system.
  * <https://lib3.net/>
 
 See [[guidelines]] for terms of use.
+
+# Service market
+
+Services requests and offers can be mentionned here.
+
+ * anarcat is looking for a [secondary backup mail exchanger](https://en.wikipedia.org/wiki/MX_record#The_backup_MX) for his own server. he would, obviously, offer the same service in exchange.

remove dupe
diff --git a/services.mdwn b/services.mdwn
index c6bab0ea1a..57d39b5aae 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -14,12 +14,4 @@ hosted on their system.
    [services page](https://anarc.at/services/) for full list
  * <https://lib3.net/>
 
-## Terms of use
-
-[[!tip """Should we aim for more specific rules across all providers?
-
-> No. At least not unless necessary? Each provider has its own rules anyways..."""]]
-
- * Abide by the provider's rules.
- * Don't abuse.
-
+See [[guidelines]] for terms of use.

with custom template
diff --git a/sandbox.mdwn b/sandbox.mdwn
index e0ec50ef1f..abca7f130d 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test again again.
+test again again again.

test without safety belts
diff --git a/sandbox.mdwn b/sandbox.mdwn
index f0887f6c8a..e0ec50ef1f 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test again.
+test again again.

another test without project
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 19b1e621cb..f0887f6c8a 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test.
+test again.

another test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index abca7f130d..19b1e621cb 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test again again again.
+test.

another test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index e0ec50ef1f..abca7f130d 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test again again.
+test again again again.

another test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index f0887f6c8a..e0ec50ef1f 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test again.
+test again again.

another test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 19b1e621cb..f0887f6c8a 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1 @@
-test.
+test again.

test irc bot
diff --git a/sandbox.mdwn b/sandbox.mdwn
index e69de29bb2..19b1e621cb 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -0,0 +1 @@
+test.

answer and just do it
diff --git a/services.mdwn b/services.mdwn
index 7d737fc64b..c6bab0ea1a 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -3,14 +3,22 @@
 Members of the alliance are happy to share some, or all, of the services
 hosted on their system.
 
-[[!tip "Should we list only providers or full list of services (table)?"]]
+[[!tip """Should we list only providers or full list of services (table)?
 
- * <https://anarc.at/>
+> I would only give a broad overview of the services, not a complete
+> listing, as I do not want to maintain two copies. --[[anarcat]]
+"""]]
+
+ * <https://anarc.at/> - email, wikis (including this one), radio,
+   shell access, etc, see the
+   [services page](https://anarc.at/services/) for full list
  * <https://lib3.net/>
 
 ## Terms of use
 
-[[!tip "Should we aim for more specific rules across all providers?"]]
+[[!tip """Should we aim for more specific rules across all providers?
+
+> No. At least not unless necessary? Each provider has its own rules anyways..."""]]
 
  * Abide by the provider's rules.
  * Don't abuse.

Adjust URLs, again
diff --git a/index.mdwn b/index.mdwn
index ac9f4908a3..0a3bb548b4 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -33,9 +33,3 @@ Just a logo idea:
 [[!img logo_proposed.svg]]
 
 Feel free to modify or propose other ideas!
-
-# Who
-
-People involved:
-
- * <https://anarc.at/>
diff --git a/services.mdwn b/services.mdwn
index c8ce693530..7d737fc64b 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -5,12 +5,12 @@ hosted on their system.
 
 [[!tip "Should we list only providers or full list of services (table)?"]]
 
- * https://anarc.at
- * https://lib3.net
+ * <https://anarc.at/>
+ * <https://lib3.net/>
 
 ## Terms of use
 
-[[!tip "Should aim for more specific rules across all providers"]]
+[[!tip "Should we aim for more specific rules across all providers?"]]
 
  * Abide by the provider's rules.
  * Don't abuse.

Question about rules
diff --git a/services.mdwn b/services.mdwn
index e84302e509..c8ce693530 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -10,6 +10,8 @@ hosted on their system.
 
 ## Terms of use
 
+[[!tip "Should aim for more specific rules across all providers"]]
+
  * Abide by the provider's rules.
  * Don't abuse.
 

Adjust URLs
diff --git a/services.mdwn b/services.mdwn
index fd4019b92d..e84302e509 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -5,8 +5,8 @@ hosted on their system.
 
 [[!tip "Should we list only providers or full list of services (table)?"]]
 
- * <anarc.at>
- * <lib3.net>
+ * https://anarc.at
+ * https://lib3.net
 
 ## Terms of use
 

Adjust syntax, again
diff --git a/services.mdwn b/services.mdwn
index 32379c61fc..fd4019b92d 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -3,10 +3,10 @@
 Members of the alliance are happy to share some, or all, of the services
 hosted on their system.
 
-[[!tip Should we list only providers or full list of services (table)?]]
+[[!tip "Should we list only providers or full list of services (table)?"]]
 
- * [anarc.at][]
- * [lib3.net][]
+ * <anarc.at>
+ * <lib3.net>
 
 ## Terms of use
 

Adjust syntax
diff --git a/services.mdwn b/services.mdwn
index bd75d04d2e..32379c61fc 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -3,10 +3,10 @@
 Members of the alliance are happy to share some, or all, of the services
 hosted on their system.
 
-[!tip Should we list only providers or full list of services (table)?]
+[[!tip Should we list only providers or full list of services (table)?]]
 
- * [anarc.at]
- * [lib3.net]
+ * [anarc.at][]
+ * [lib3.net][]
 
 ## Terms of use
 

Move services to own page
diff --git a/index.mdwn b/index.mdwn
index a94b39af5e..ac9f4908a3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,7 +9,7 @@ The goal of the Alliance is to support and promote self-hosted free software web
 The goal of the Alliance is accomplished through the following projects:
 
  * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
- * __Services__ : members of the Alliance can benefit from services run by other members
+ * __[[Services]]__ : members of the Alliance can benefit from services run by other members
  * __[[Guidelines]]__ : we agree on a number of guidelines that all members of the Alliance must follow
  * __Documentation__ : we share information and skills about the practice of self-hosting
 
@@ -34,12 +34,6 @@ Just a logo idea:
 
 Feel free to modify or propose other ideas!
 
-# Services
-
-What services we currently offer:
-
- * <https://anarc.at/services>
-
 # Who
 
 People involved:
diff --git a/services.mdwn b/services.mdwn
new file mode 100644
index 0000000000..bd75d04d2e
--- /dev/null
+++ b/services.mdwn
@@ -0,0 +1,15 @@
+# Services
+
+Members of the alliance are happy to share some, or all, of the services
+hosted on their system.
+
+[!tip Should we list only providers or full list of services (table)?]
+
+ * [anarc.at]
+ * [lib3.net]
+
+## Terms of use
+
+ * Abide by the provider's rules.
+ * Don't abuse.
+

Typo
diff --git a/index.mdwn b/index.mdwn
index 808a57179d..a94b39af5e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -32,7 +32,7 @@ Just a logo idea:
 
 [[!img logo_proposed.svg]]
 
-Feel free to modify or propose othe ideas!
+Feel free to modify or propose other ideas!
 
 # Services
 

# Logo
diff --git a/index.mdwn b/index.mdwn
index 44d236f038..808a57179d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -28,10 +28,12 @@ Who can join? Do we define what is a small server?
 
 ## Logo
 
-Une idée de logo:
+Just a logo idea:
 
 [[!img logo_proposed.svg]]
 
+Feel free to modify or propose othe ideas!
+
 # Services
 
 What services we currently offer:

Convert SVG text to path
diff --git a/logo_proposed.svg b/logo_proposed.svg
index 6579074f02..a6ca46d0ea 100644
--- a/logo_proposed.svg
+++ b/logo_proposed.svg
@@ -6,7 +6,6 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.1"
    id="svg2"
    viewBox="0 0 461.63632 507.71169"
@@ -122,18 +121,111 @@
        id="path5680"
        d="m 202.33483,450.76776 c 95.32119,-216.40041 375.6581,-173.47522 424.14571,-1e-5"
        style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <text
-       transform="translate(-5.410022,-8.6560352)"
+    <g
        id="text5682"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.67778778px;line-height:125%;font-family:'Droid Sans Mono';-inkscape-font-specification:'Droid Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><textPath
-         id="textPath5688"
-         xlink:href="#path5680"><tspan
-   id="tspan5684"><tspan
-     x="146.37492"
-     y="240.70296"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
-     id="tspan5686">Alliance des Petits Serveurs</tspan></tspan></textPath></text>
+       transform="translate(-5.410022,-8.6560352)">
+      <path
+         id="path6232"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 202.30133,450.15679 -20.60117,-20.34713 3.2336,-6.53297 28.68076,4.02364 -2.54635,5.14448 -5.81268,-0.83817 -4.69621,9.48793 4.2091,4.07795 -2.46705,4.98427 z m -5.43402,-12.66259 3.28647,-6.63977 -11.82099,-1.72885 8.53452,8.36862 z" />
+      <path
+         id="path6234"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 215.50008,424.47488 -25.5863,-14.83277 2.57008,-4.43336 25.5863,14.83277 -2.57008,4.43336 z" />
+      <path
+         id="path6236"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 221.0574,415.11619 -24.96847,-15.85073 2.74647,-4.3263 24.96846,15.85073 -2.74646,4.3263 z" />
+      <path
+         id="path6238"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 208.30838,386.40775 q 1.19075,0.8273 1.2558,1.74318 0.0651,0.91588 -0.77359,2.12294 -0.92931,1.33756 -1.82389,1.44158 -0.88326,0.0877 -1.91089,-0.62626 -1.14182,-0.79331 -1.26851,-1.65527 -0.14301,-0.87329 0.72963,-2.12929 0.88397,-1.27231 1.75865,-1.48692 0.85836,-0.22594 2.0328,0.59004 z m 18.68216,19.58262 -17.11093,-11.88831 2.92391,-4.2084 17.11093,11.8883 -2.92391,4.20841 z" />
+      <path
+         id="path6240"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 240.86785,387.43328 -1.69182,-1.35087 q 0.27681,4.10983 -1.89202,6.82607 -2.15644,2.70071 -4.67189,2.95432 -2.53097,0.24122 -4.75053,-1.53103 -1.73839,-1.38805 -2.31375,-2.99123 -0.56297,-1.61869 -0.0963,-3.50822 0.4635,-1.91744 2.28171,-4.73571 l 2.41298,-3.69048 -0.7295,-0.58249 q -1.36588,-1.09061 -2.51941,-0.66457 -1.16905,0.41365 -2.43317,1.99683 -1.04104,1.3038 -1.36244,2.59761 -0.309,1.2783 0.13871,2.37287 l -4.49332,1.52105 q -0.72455,-1.92563 -0.0536,-4.26203 0.65542,-2.3488 2.63835,-4.83221 3.03637,-3.80274 5.70968,-4.41322 2.67019,-0.63839 5.69686,1.77831 l 11.06672,8.83644 -2.93722,3.67856 z m -7.81916,-5.7096 -1.43727,2.18202 q -1.53641,2.30618 -1.66842,3.77663 -0.11962,1.45493 1.15313,2.47119 1.11754,0.89232 2.03235,0.60608 0.89929,-0.29863 1.71725,-1.32304 0.58248,-0.7295 0.96272,-2.12884 0.3771,-1.42725 0.34451,-3.10538 l -3.10427,-2.47866 z" />
+      <path
+         id="path6242"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 256.86387,369.85362 -8.23496,-7.99899 q -2.33657,-2.26961 -3.53534,-2.60334 -1.18494,-0.34798 -2.31974,0.82031 -1.5915,1.63844 -1.66783,6.05005 l 9.97313,9.68736 -3.57048,3.67582 -14.94546,-14.5172 3.57048,-3.67582 1.93764,1.88212 q -0.0335,-2.30309 0.65517,-4.20934 0.68865,-1.90624 1.92033,-3.17425 2.22809,-2.29383 4.57514,-2.20153 2.34706,0.0923 5.23927,2.90164 l 9.97314,9.68736 -3.57049,3.67581 z" />
+      <path
+         id="path6244"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 275.8069,349.00171 q 0.23242,2.11922 -0.66304,4.07415 -0.89546,1.95494 -3.16955,3.87975 -3.85079,3.25936 -7.5925,2.83538 -3.75455,-0.43915 -7.24488,-4.56283 -3.40052,-4.01756 -3.38943,-7.87818 0.0111,-3.86061 3.83155,-7.09431 2.04668,-1.73233 4.20315,-2.41264 2.17164,-0.69314 4.18603,-0.004 l -1.15284,4.54077 q -1.13373,-0.26342 -2.12858,0.006 -1.00769,0.25442 -2.12957,1.204 -2.0012,1.69384 -1.81079,3.64044 0.19041,1.94661 2.37187,4.52391 2.18146,2.5773 4.05935,3.04356 1.88022,0.43826 3.98754,-1.3454 0.90964,-0.76993 1.44952,-1.66927 0.53989,-0.89933 0.47785,-2.35609 l 4.71432,-0.42526 z" />
+      <path
+         id="path6246"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 279.12555,339.10309 q 1.69704,2.2072 3.38284,2.51377 1.68581,0.30657 3.82516,-1.1744 1.24116,-0.85919 1.95722,-1.81388 0.7324,-0.96598 0.82415,-2.33398 l 4.68436,0.0668 q -8e-5,2.19835 -1.14078,4.07506 -1.12436,1.86541 -3.96595,3.83251 -4.22972,2.92804 -7.85759,2.15408 -3.61153,-0.78525 -6.72045,-5.27627 -6.3648,-9.19433 1.866,-14.89213 3.65814,-2.53236 7.00461,-1.78103 3.35151,0.7237 6.08736,4.67579 l 1.43575,2.07403 -11.38268,7.8797 z m 5.18964,-7.89249 q -2.70194,-3.9031 -6.11511,-1.54032 -1.12683,0.78006 -1.57407,1.66943 -0.45855,0.87304 -0.36814,1.94583 0.0954,1.04516 0.96968,2.8315 l 7.08764,-4.90644 z" />
+      <path
+         id="path6248"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 320.42369,325.36236 -0.89323,-1.8184 q -0.74939,1.718 -1.86032,3.06036 -1.11094,1.34237 -2.92934,2.23561 -3.52983,1.73393 -6.654,0.10411 -3.12417,-1.62981 -5.4098,-6.28278 -2.33819,-4.75992 -1.5841,-8.40547 0.77191,-3.6543 4.49785,-5.48456 1.31923,-0.64804 2.98125,-0.77845 1.65325,-0.14824 2.97404,0.24303 l -4.53624,-9.23462 4.59948,-2.25936 13.03952,26.54507 -4.22511,2.07546 z m -7.01235,-13.3293 q -1.05495,-0.30057 -2.38762,-0.26555 -1.32361,0.008 -2.44674,0.56014 -1.85405,0.91076 -2.18903,3.06693 -0.34374,2.13835 0.99612,4.86595 1.32234,2.69195 2.98466,3.77849 1.68015,1.07778 3.60552,0.132 1.14095,-0.56046 2.0636,-1.65544 0.93173,-1.12155 1.39306,-2.29972 l -4.01957,-8.1828 z" />
+      <path
+         id="path6250"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 330.81656,311.07422 q 1.08872,2.56249 2.64361,3.28238 1.55489,0.71989 3.99748,-0.17671 1.41707,-0.52017 2.34984,-1.26456 0.95141,-0.75124 1.38359,-2.05241 l 4.51764,1.24036 q -0.55185,2.12795 -2.12708,3.65828 -1.55658,1.52349 -4.80093,2.71439 -4.82925,1.77267 -8.14672,0.11292 -3.29883,-1.6666 -5.181,-6.79417 -3.85333,-10.49754 5.54412,-13.94706 4.17664,-1.53312 7.22741,0.0341 3.06257,1.54174 4.71889,6.054 l 0.86922,2.36801 -12.99607,4.77046 z m 7.00448,-6.33726 q -1.63578,-4.45633 -5.53273,-3.02588 -1.28656,0.47226 -1.94271,1.2209 -0.66299,0.73 -0.84474,1.79114 -0.16996,1.03566 0.22794,2.98425 l 8.09224,-2.97041 z" />
+      <path
+         id="path6252"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 365.302,303.7563 q 0.52392,1.99812 -0.12157,3.68686 -0.62627,1.6837 -2.29344,2.92165 -1.64795,1.23291 -4.03033,1.85758 -6.32098,1.6574 -9.52919,-1.25905 l 3.00875,-3.56095 q 1.22541,0.99285 2.50822,1.10823 1.29698,0.0911 2.64187,-0.26151 3.53514,-0.92693 2.99611,-2.98269 -0.23677,-0.903 -1.36177,-1.12136 -1.13004,-0.23757 -3.39867,-0.19713 -4.2472,0.16909 -6.30344,-1.01658 -2.05625,-1.18567 -2.7313,-3.76017 -0.70024,-2.67057 0.88292,-4.93371 1.60237,-2.26818 5.57941,-3.31098 2.70899,-0.71031 4.99145,-0.38477 2.30167,0.32051 3.8694,1.75747 l -3.0179,3.60441 q -1.85967,-1.68895 -4.85685,-0.90307 -1.53702,0.40301 -2.18369,1.14751 -0.6517,0.72529 -0.43508,1.55144 0.20654,0.78772 1.04335,1.08165 0.83178,0.27471 3.06198,0.24434 3.66074,-0.0564 5.34256,0.40612 1.696,0.43824 2.77275,1.4906 1.09092,1.02811 1.56446,2.83411 z" />
+      <path
+         id="path6254"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 398.77255,286.31103 q 0.57642,4.93198 -1.47249,7.59113 -2.02918,2.65684 -7.23735,3.26554 l -4.53742,0.5303 0.98683,8.44355 -5.56328,0.6502 -3.19105,-27.30344 10.25852,-1.19895 q 4.63606,-0.54183 7.41486,1.33311 2.77649,1.85522 3.34138,6.68856 z m -5.73621,0.71041 q -0.26977,-2.30817 -1.67198,-3.18415 -1.38248,-0.87829 -4.69677,-0.49094 l -2.78164,0.3251 1.07214,9.17348 2.26871,-0.26515 q 3.05783,-0.35738 4.17336,-0.9077 1.13295,-0.57235 1.48883,-1.63381 0.37561,-1.06377 0.14735,-3.01683 z" />
+      <path
+         id="path6256"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 409.44428,295.14281 q 0.18232,2.7782 1.41264,3.97078 1.23031,1.19258 3.83195,1.15206 1.50934,-0.0235 2.63547,-0.41847 1.14599,-0.39528 1.98326,-1.48101 l 3.85546,2.6614 q -1.22302,1.82673 -3.21494,2.75166 -1.97206,0.92462 -5.42767,0.97845 -5.14368,0.0801 -7.7278,-2.58123 -2.56426,-2.66165 -2.64933,-8.12309 -0.17414,-11.18107 9.83519,-11.33696 4.4486,-0.0693 6.81148,2.41672 2.38243,2.46583 2.45728,7.2719 l 0.0393,2.52219 -13.84227,0.2156 z m 8.70311,-3.67145 q -0.0739,-4.74649 -4.22462,-4.68185 -1.37033,0.0213 -2.23674,0.51159 -0.86671,0.47039 -1.38839,1.41215 -0.50213,0.92159 -0.7694,2.89235 l 8.61915,-0.13424 z" />
+      <path
+         id="path6258"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 439.57274,305.04503 q -2.10044,0.48398 -4.38003,0.33966 -3.6077,-0.2284 -5.0906,-1.95424 -1.48289,-1.72584 -1.25198,-5.37318 l 0.66135,-10.44647 -2.63639,-0.16691 0.25726,-4.06361 2.63639,0.1669 0.36645,-5.78817 5.11421,0.32377 -0.36645,5.78818 4.8367,0.3062 -0.25727,4.06362 -4.83669,-0.30621 -0.61994,9.79233 q -0.12299,1.9426 0.42777,2.67404 0.57057,0.73269 1.68063,0.80297 1.4074,0.0891 2.83137,-0.39791 l 0.62722,4.23903 z" />
+      <path
+         id="path6260"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 451.20567,279.74793 q -0.16904,1.44005 -0.94636,1.92877 -0.77731,0.48871 -2.23709,0.31736 -1.6176,-0.18988 -2.13067,-0.93006 -0.49334,-0.73786 -0.34746,-1.98065 0.16209,-1.38087 0.86281,-1.89857 0.70304,-0.53743 2.222,-0.35913 1.53869,0.18061 2.13993,0.85115 0.60356,0.6508 0.43684,2.07113 z m -8.47673,25.70307 2.42906,-20.69337 5.08951,0.59742 -2.42907,20.69337 -5.0895,-0.59742 z" />
+      <path
+         id="path6262"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 464.8806,308.77655 q -2.14018,0.25642 -4.39123,-0.13102 -3.56254,-0.61318 -4.85222,-2.48781 -1.28968,-1.87462 -0.66977,-5.47631 l 1.77552,-10.3157 -2.60339,-0.44809 0.69066,-4.01274 2.6034,0.44809 0.98378,-5.71572 5.05018,0.86923 -0.98377,5.71572 4.77614,0.82206 -0.69066,4.01274 -4.77615,-0.82206 -1.66434,9.66974 q -0.33017,1.91829 0.13914,2.70447 0.48889,0.78955 1.58505,0.97822 1.38978,0.2392 2.85769,-0.0926 l 0.16997,4.2818 z" />
+      <path
+         id="path6264"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 484.87221,307.50654 q -0.49962,2.00433 -1.87657,3.17588 -1.35767,1.17635 -3.41446,1.46198 -2.03751,0.29043 -4.4273,-0.30528 -6.34064,-1.58054 -7.75491,-5.67909 l 4.34886,-1.6794 q 0.59835,1.45923 1.66828,2.17628 1.094,0.70257 2.44308,1.03886 3.54613,0.88395 4.06017,-1.1782 0.22579,-0.90581 -0.65628,-1.63743 -0.87726,-0.7509 -2.88679,-1.80451 -3.80696,-1.89059 -5.04157,-3.91782 -1.23462,-2.02723 -0.59087,-4.60974 0.66777,-2.67888 3.14302,-3.90416 2.49452,-1.22049 6.48392,-0.22604 2.71742,0.67737 4.56338,2.05867 1.86525,1.38611 2.55068,3.39926 l -4.37774,1.71314 q -0.82057,-2.37436 -3.82707,-3.1238 -1.5418,-0.38433 -2.46649,-0.0417 -0.91988,0.32338 -1.12645,1.1521 -0.19697,0.79017 0.39601,1.44973 0.59778,0.64029 2.56877,1.6843 3.23839,1.70792 4.49172,2.92102 1.2774,1.19863 1.71676,2.6387 0.46344,1.4256 0.0118,3.23721 z" />
+      <path
+         id="path6266"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 518.45797,317.62085 q -1.53924,3.83389 -4.88586,4.86603 -3.32819,1.03955 -8.23115,-0.9289 -3.39151,-1.36163 -5.44688,-3.49242 -2.03693,-2.12338 -2.59724,-5.25917 l 5.22821,-1.4539 q 0.38153,1.60859 0.92251,2.5535 0.54098,0.9449 1.48787,1.73172 0.94689,0.78682 2.36617,1.35663 2.1197,0.85102 3.58796,0.60578 1.4941,-0.25627 2.09352,-1.74928 0.3404,-0.84788 0.14587,-1.58948 -0.1761,-0.7342 -0.84275,-1.47271 -0.65924,-0.75695 -2.4906,-2.1129 -1.77607,-1.33376 -3.33095,-2.57871 -1.52905,-1.25598 -2.47149,-2.6403 -0.92401,-1.37692 -1.13589,-2.98162 -0.21187,-1.60469 0.58735,-3.59536 1.45783,-3.63113 4.72333,-4.67445 3.2729,-1.06174 7.84407,0.7735 6.61715,2.65667 7.54309,8.2936 l -5.20614,1.50557 q -0.39942,-2.04384 -1.42689,-3.26968 -1.02748,-1.22583 -2.83383,-1.95105 -1.80635,-0.72522 -3.21555,-0.52047 -1.38337,0.19371 -1.94579,1.59456 -0.49581,1.23495 0.41744,2.37212 0.92066,1.11874 3.58496,2.95892 1.45183,1.07516 2.83719,2.20924 1.39276,1.11566 2.27991,2.47778 0.90557,1.36952 1.09888,3.07377 0.1933,1.70425 -0.68732,3.89768 z" />
+      <path
+         id="path6268"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 527.55056,320.95611 q -1.17474,2.52422 -0.66859,4.16121 0.50614,1.63699 2.80737,2.85127 1.33507,0.70446 2.51248,0.89904 1.19499,0.20385 2.45089,-0.34617 l 2.10291,4.18633 q -1.9502,1.01461 -4.14155,0.86891 -2.17378,-0.13643 -5.23038,-1.74928 -4.54977,-2.40074 -5.53768,-5.97627 -0.97035,-3.56626 1.5787,-8.3971 5.21859,-9.89003 14.07219,-5.21832 3.93494,2.07631 4.81304,5.39178 0.90494,3.30718 -1.33822,7.55831 l -1.1772,2.23097 -12.24396,-6.46068 z m 9.39682,0.96088 q 2.21536,-4.19843 -1.45607,-6.13571 -1.2121,-0.63958 -2.2075,-0.62583 -0.98613,-0.004 -1.89608,0.57155 -0.88312,0.56707 -2.06428,2.16713 l 7.62393,4.02286 z" />
+      <path
+         id="path6270"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 558.64618,331.50916 q -0.45058,-0.7655 -1.55058,-1.47858 -1.2,-0.7779 -2.66148,-0.89684 -1.434,-0.1248 -3.28041,0.24051 l -7.36845,11.36665 -4.29999,-2.78748 11.33358,-17.4833 4.29999,2.78748 -1.62062,2.49999 q 1.8779,-0.48692 3.65236,-0.44913 1.77446,0.0378 3.34112,1.05338 1.33333,0.86433 1.67311,1.58167 l -3.51863,3.56565 z" />
+      <path
+         id="path6272"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 561.10553,353.17904 -3.72817,-2.90641 6.98296,-20.97493 4.13545,3.22391 -4.78851,13.66957 12.07254,-7.99108 4.04146,3.15065 -18.71573,11.82829 z" />
+      <path
+         id="path6274"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 578.58926,356.21397 q -1.83021,2.09809 -1.79914,3.81126 0.0311,1.71317 1.90397,3.51937 1.08657,1.04787 2.16347,1.56213 1.09119,0.52805 2.4505,0.34889 l 0.8561,4.60594 q -2.1554,0.4324 -4.21984,-0.3168 -2.05015,-0.73542 -4.53783,-3.13449 -3.70293,-3.57103 -3.65781,-7.28026 0.0594,-3.69544 3.85106,-7.62711 7.76251,-8.04922 14.9682,-1.10018 3.20253,3.08846 3.12424,6.51735 -0.0502,3.42838 -3.38686,6.88825 l -1.75104,1.81572 -9.96502,-9.61007 z m 8.7592,3.53554 q 3.29528,-3.41699 0.30721,-6.29863 -0.9865,-0.95136 -1.94647,-1.21489 -0.94619,-0.27783 -1.98023,0.0219 -1.00596,0.29918 -2.58541,1.50776 l 6.2049,5.9839 z" />
+      <path
+         id="path6276"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 593.79232,386.08068 2.07791,-1.69475 q -1.97726,-0.13023 -3.9435,-1.064 -1.9383,-0.93093 -3.08069,-2.33159 -2.23457,-2.73976 -1.61748,-5.06285 0.63248,-2.33565 3.4338,-4.62043 l 10.78972,-8.80018 3.23887,3.9711 -8.89652,7.25608 q -1.7085,1.39346 -2.45342,2.33423 -0.74492,0.94076 -0.73488,1.67587 0.038,0.73793 0.75356,1.61527 1.44368,1.77007 5.78901,2.35255 l 10.78972,-8.80019 3.23886,3.97111 -16.14609,13.16889 -3.23887,-3.97111 z" />
+      <path
+         id="path6278"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 620.40063,396.71429 q -0.10125,-0.88248 -0.81734,-1.98052 -0.78118,-1.19787 -2.06871,-1.89953 -1.26004,-0.69588 -3.09586,-1.11111 l -11.34644,7.39952 -2.79924,-4.29235 17.45222,-11.38138 2.79924,4.29235 -2.49555,1.62746 q 1.91395,0.31686 3.52047,1.07134 1.60652,0.75447 2.62639,2.31835 0.86798,1.33096 0.88749,2.12447 l -4.66267,1.8314 z" />
+      <path
+         id="path6280"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 621.6301,419.95273 q -1.83282,0.95276 -3.62248,0.69665 -1.78051,-0.23848 -3.35645,-1.59066 -1.56678,-1.33454 -2.70276,-3.51983 -3.01403,-5.79806 -0.87915,-9.57172 l 4.13809,2.14691 q -0.69732,1.41461 -0.5262,2.69117 0.19791,1.28503 0.83919,2.51866 1.68566,3.24268 3.57135,2.26244 0.82829,-0.43058 0.79249,-1.57602 -0.0182,-1.1546 -0.55924,-3.35813 -1.10401,-4.10468 -0.40235,-6.3722 0.70165,-2.26752 3.06317,-3.49511 2.44964,-1.27341 5.00682,-0.22984 2.56634,1.06118 4.4627,4.7092 1.29173,2.48488 1.47892,4.78283 0.19636,2.31556 -0.85839,4.16222 l -4.18249,-2.14621 q 1.23595,-2.18709 -0.1932,-4.93633 -0.73289,-1.40986 -1.60195,-1.8759 -0.85144,-0.4752 -1.60924,-0.0813 -0.72255,0.37561 -0.82417,1.2567 -0.084,0.87193 0.43874,3.04021 0.86443,3.55766 0.78525,5.30012 -0.0524,1.75093 -0.84062,3.03371 -0.76144,1.29125 -2.41803,2.1524 z" />
+    </g>
     <rect
        ry="10.272203"
        y="415.27985"
@@ -214,19 +306,90 @@
        id="path5989"
        d="m 224.99104,687.70828 c 68.49548,116.54568 323.88922,114.50886 371.83503,-15.30185"
        style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <text
-       transform="translate(2.2952779,2.2952779)"
-       y="43.610279"
-       x="3.8254633"
+    <g
        id="text5999"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><textPath
-         id="textPath6005"
-         xlink:href="#path5989"><tspan
-   id="tspan6001"><tspan
-     x="172.14578"
-     y="854.87518"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
-     id="tspan6003">Small Servers Alliance</tspan></tspan></textPath></text>
+       transform="translate(2.2952779,2.2952779)">
+      <path
+         id="path6283"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 244.28193,701.7588 q -3.34173,2.42002 -6.71902,1.51044 -3.36565,-0.89353 -6.46049,-5.16708 -2.14079,-2.95615 -2.74309,-5.85085 -0.59066,-2.87863 0.60536,-5.82656 l 5.1917,1.55496 q -0.53402,1.56233 -0.57997,2.64875 -0.046,1.08642 0.33524,2.25537 0.3812,1.16895 1.27707,2.40604 1.338,1.84759 2.7092,2.42206 1.39889,0.5789 2.70024,-0.36351 0.73904,-0.5352 0.96948,-1.2654 0.24209,-0.71413 0.072,-1.69306 -0.15405,-0.99057 -0.97959,-3.11131 -0.79064,-2.07253 -1.44166,-3.95228 -0.62332,-1.87531 -0.68265,-3.54676 -0.0477,-1.65539 0.6276,-3.1241 0.6753,-1.4687 2.41043,-2.72526 3.165,-2.29204 6.47968,-1.43508 3.33075,0.84532 6.21617,4.82969 4.17687,5.7677 1.95821,11.02368 l -5.20056,-1.49956 q 0.75063,-1.93961 0.53507,-3.52242 -0.21556,-1.58281 -1.35576,-3.15728 -1.14021,-1.57447 -2.43994,-2.15171 -1.27203,-0.57281 -2.49304,0.31143 -1.07643,0.77953 -0.91018,2.2266 0.18231,1.43544 1.45386,4.40879 0.65434,1.68141 1.22114,3.37722 0.58288,1.68418 0.6073,3.30744 0.0361,1.63932 -0.70793,3.18227 -0.74399,1.54294 -2.65585,2.92748 z" />
+      <path
+         id="path6285"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 259.13252,726.63077 8.18817,-9.12332 q 1.2322,-1.37292 1.75878,-2.28632 0.52658,-0.9134 0.42553,-1.48387 -0.073,-0.57198 -0.84069,-1.26095 -0.871,-0.78172 -2.42831,-1.00663 -1.55731,-0.2249 -3.24675,-0.0353 l -9.27462,10.33384 -3.80876,-3.41836 8.18817,-9.12331 q 1.35144,-1.50579 1.8148,-2.28935 0.47661,-0.79833 0.40206,-1.39832 -0.0613,-0.61475 -0.87324,-1.34347 -0.70861,-0.63598 -2.12889,-0.92448 -1.40702,-0.30326 -3.54617,-0.11747 l -9.27462,10.33385 -3.80876,-3.41836 13.89868,-15.48601 3.80877,3.41836 -1.80193,2.00772 q 2.09637,-0.19753 3.84559,0.19963 1.74923,0.39715 3.16644,1.6691 1.93391,1.73568 2.25296,3.22146 0.33382,1.49904 -0.49259,3.10289 2.52109,-0.13619 4.25555,0.24771 1.74923,0.39715 3.29931,1.78835 2.25868,2.02716 2.13936,4.23898 -0.11932,2.21181 -2.83546,5.23815 l -9.27462,10.33385 -3.80876,-3.41836 z" />
+      <path
+         id="path6287"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 278.32783,739.40015 1.14322,-1.83522 q -4.0444,0.75245 -6.99085,-1.083 -2.92961,-1.82497 -3.47365,-4.29058 -0.53356,-2.48245 0.96627,-4.89012 1.17469,-1.88572 2.698,-2.64284 1.54014,-0.74663 3.46864,-0.50348 1.95582,0.2368 4.96271,1.71261 l 3.9412,1.96434 0.49295,-0.79133 q 0.92297,-1.48164 0.36624,-2.5763 -0.54624,-1.1115 -2.26359,-2.1813 -1.4143,-0.88102 -2.73502,-1.04938 -1.30388,-0.15786 -2.33754,0.41349 l -2.03122,-4.2801 q 1.82581,-0.9426 4.22133,-0.54875 2.406,0.37701 5.09989,2.05514 4.12503,2.56963 5.04142,5.15033 0.94371,2.57436 -1.10151,5.85755 l -7.47816,12.00467 -3.99033,-2.48573 z m 4.75423,-8.4198 -2.33149,-1.17192 q -2.46618,-1.25584 -3.94009,-1.2158 -1.45706,0.0505 -2.3171,1.43114 -0.75516,1.21226 -0.36487,2.08638 0.40077,0.85729 1.51201,1.54952 0.79133,0.49295 2.22356,0.7074 1.45955,0.2081 3.12032,-0.0194 l 2.09766,-3.36737 z" />
+      <path
+         id="path6289"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 287.36531,744.41593 13.40002,-26.32187 4.5608,2.32183 -13.40002,26.32187 -4.5608,-2.32183 z" />
+      <path
+         id="path6291"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 297.11966,749.21187 12.03855,-26.97173 4.67341,2.08593 -12.03855,26.97173 -4.67341,-2.08593 z" />
+      <path
+         id="path6293"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 337.49038,755.46648 q -1.23555,3.93664 -4.48779,5.22364 -3.23331,1.29294 -8.26766,-0.28714 -3.48241,-1.09299 -5.69401,-3.05534 -2.19268,-1.95641 -2.99354,-5.03528 l 5.09303,-1.85273 q 0.50453,1.57211 1.11638,2.47102 0.61186,0.89892 1.61564,1.60898 1.00378,0.71007 2.46109,1.16746 2.17651,0.68312 3.61945,0.32517 1.4678,-0.37094 1.94895,-1.90396 0.27325,-0.8706 0.0221,-1.59393 -0.23223,-0.71739 -0.95322,-1.40108 -0.71505,-0.7026 -2.64359,-1.91082 -1.87176,-1.19039 -3.5164,-2.3095 -1.61978,-1.1321 -2.66542,-2.43744 -1.02672,-1.2994 -1.36201,-2.88076 -0.3353,-1.58136 0.30624,-3.62538 1.17021,-3.72845 4.3408,-5.02029 3.17653,-1.31076 7.87021,0.1624 6.79448,2.13251 8.1532,7.67342 l -5.06706,1.90246 q -0.55606,-2.00409 -1.67409,-3.14503 -1.11803,-1.14094 -2.97279,-1.72308 -1.85476,-0.58213 -3.24203,-0.26908 -1.3624,0.30006 -1.81385,1.73845 -0.39799,1.26805 0.59944,2.32956 1.00337,1.04259 3.79878,2.66841 1.52887,0.95803 2.99614,1.97989 1.4732,1.00293 2.46206,2.29045 1.00779,1.29346 1.33231,2.97539 0.32452,1.68193 -0.38235,3.93414 z" />
+      <path
+         id="path6295"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 345.58165,756.15262 q -0.45675,2.7428 0.4673,4.18309 0.92405,1.44029 3.4628,1.99462 1.47287,0.3216 2.65792,0.19458 1.20443,-0.12279 2.26626,-0.98735 l 3.14122,3.46749 q -1.606,1.49698 -3.75378,1.94169 -2.1284,0.44894 -5.5005,-0.28734 -5.01937,-1.09597 -6.92451,-4.27326 -1.88575,-3.17306 -0.72208,-8.50251 2.38234,-10.91085 12.14978,-8.77817 4.34108,0.94786 6.07112,3.90419 1.75365,2.94118 0.72962,7.6311 l -0.5374,2.46124 -13.50775,-2.94937 z m 9.29972,-1.58351 q 1.01133,-4.63178 -3.03905,-5.51617 -1.33721,-0.29197 -2.29148,-0.013 -0.95004,0.25954 -1.67218,1.05615 -0.69852,0.78145 -1.40814,2.63658 l 8.41085,1.83648 z" />
+      <path
+         id="path6297"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 376.46922,754.81773 q -0.7276,-0.5075 -2.02299,-0.69719 -1.41315,-0.20693 -2.78951,0.29321 -1.35385,0.48338 -2.87818,1.58334 l -1.96009,13.38569 -5.0638,-0.7415 3.01487,-20.58884 5.06379,0.7415 -0.4311,2.94407 q 1.50232,-1.22347 3.12906,-1.92752 1.62674,-0.70405 3.47169,-0.43389 1.57017,0.22993 2.17713,0.73981 l -1.71087,4.70132 z" />
+      <path
+         id="path6299"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 387.98815,771.73629 -4.70488,-0.39056 -5.63246,-21.34753 5.21887,0.43322 3.47211,14.04234 5.72021,-13.27928 5.10025,0.42338 -9.1741,20.11843 z" />
+      <path
+         id="path6301"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 402.77028,763.4234 q 0.1074,2.77849 1.30365,4.00214 1.19624,1.22364 3.79464,1.25307 1.50748,0.0171 2.64235,-0.347 1.1547,-0.36384 2.01974,-1.42528 l 3.77758,2.76054 q -1.27005,1.79085 -3.28351,2.66075 -1.99362,0.87012 -5.44494,0.83104 -5.1373,-0.0582 -7.64566,-2.78451 -2.48851,-2.7261 -2.42675,-8.18077 0.12646,-11.16719 10.12337,-11.05399 4.44308,0.0503 6.73527,2.59565 2.31224,2.52574 2.25789,7.32585 l -0.0285,2.51906 -13.8251,-0.15655 z m 8.78728,-3.43161 q 0.0537,-4.7406 -4.09186,-4.78754 -1.36863,-0.0155 -2.24676,0.45066 -0.87792,0.44633 -1.42402,1.37251 -0.52605,0.90658 -0.84581,2.86689 l 8.60845,0.0975 z" />
+      <path
+         id="path6303"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.625px;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+         d="m 432.82326,755.9456 q -0.81364,-0.35349 -2.12095,-0.2831 -1.42616,0.0768 -2.67633,0.83938 -1.23144,0.74173 -2.50797,2.12156 l 0.72738,13.50888 -5.11039,0.27516 -1.11881,-20.77831 5.1104,-0.27517 0.15998,2.97116 q 1.23052,-1.49654 2.68578,-2.50857 1.45526,-1.01202 3.31719,-1.11227 1.58461,-0.0853 2.28047,0.29437 l -0.74675,4.94691 z" />
+      <path
+         id="path6305"

(fichier de différences tronqué)
test
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 90b67dda6d..e69de29bb2 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +0,0 @@
-Test.

Merge branch 'master' of git://apssa.wiki.orangeseeds.org
restore english version after laborious translation attempt
diff --git a/index.mdwn b/index.mdwn
index a92a9ebc01..74f58e71a7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,45 +1,39 @@
 [[!toc levels=2]]
 
-# Objectif
+# Goal
 
-L'objectif de l'alliance est de supporter et de faire la promotion des
-services libres auto-hébergés.
+The goal of the Alliance is to support and promote self-hosted free software web services.
 
-# Projets
+# Projects
 
-L'objectif de l'alliance est accompli par les projets suivants:
+The goal of the Alliance is accomplished through the following projects:
 
- * **Outils partagés**: nous mettons en commun nos outils de sysadmin
-   tel que des systèmes de monitoring
- * **Services**: les membres de l'alliance bénéficient des services
-   gérés par les autres membres
- * **[[Principes]]**: nous sommes d'accords sur un ensemble de principes
-   que les membres doivent suivre
- * **Documentation**: nous partageons l'information et les compétences
-   sur les pratiques de l'auto-hébergement
+ * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
+ * __Services__ : members of the Alliance can benefit from services run by other members
+ * __[[Guidelines]]__ : we agree on a number of guidelines that all members of the Alliance must follow
+ * __Documentation__ : we share information and skills about the practice of self-hosting
 
-# À discuter
+# Needs discussion
 
-## Processus décisionnel
+## Decision-making process
 
-Il faut un processus pour prendre des décisions. Expériences passées:
+We need a process to make decisions. Prior art:
 
  * réseaulibre: initialement meetings, ensuite proposition "+7 jours par email", puis finalement Loomio
  * koumbit: meetings + "propositions 48h ouvrables"
 
-## Critères d'adhésion
+## Membership
 
-Qui peut joindre le réseau? Doit-on définir ce qu'est un petit
-serveur?
+Who can join? Do we define what is a small server?
 
 # Services
 
-Les services présentement offerts:
+What services we currently offer:
 
  * <https://anarc.at/services>
 
-# Qui
+# Who
 
-Serveurs et personnes impliquées:
+People involved:
 
  * <https://anarc.at/>

Add proposed logo
finish
diff --git a/index.en.po b/index.en.po
index 5580a60062..c620bc0847 100644
--- a/index.en.po
+++ b/index.en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-05-15 22:55-0400\n"
-"PO-Revision-Date: 2016-05-15 23:05-0400\n"
+"PO-Revision-Date: 2016-05-15 23:07-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -19,7 +19,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
 
 #. type: Title #
 #, no-wrap

try to unfuzz
diff --git a/index.en.po b/index.en.po
index df6e32ccb5..5580a60062 100644
--- a/index.en.po
+++ b/index.en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-05-15 22:55-0400\n"
-"PO-Revision-Date: 2016-05-15 23:03-0400\n"
+"PO-Revision-Date: 2016-05-15 23:05-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -35,8 +35,7 @@ msgstr ""
 "software web services."
 
 #. type: Title #
-#, fuzzy, no-wrap
-#| msgid "Projects"
+#, no-wrap
 msgid "Projets"
 msgstr "Projects"
 
@@ -54,10 +53,6 @@ msgstr ""
 "administration tools such as monitoring services"
 
 #. type: Bullet: ' * '
-#, fuzzy
-#| msgid ""
-#| "__Services__ : members of the Alliance can benefit from services run by "
-#| "other members"
 msgid ""
 "**Services**: les membres de l'alliance bénéficient des services gérés par "
 "les autres membres"
@@ -124,8 +119,6 @@ msgid "Services"
 msgstr "Services"
 
 #. type: Plain text
-#, fuzzy
-#| msgid "What services we currently offer:"
 msgid "Les services présentement offerts:"
 msgstr "What services we currently offer:"
 

restore english
diff --git a/index.en.po b/index.en.po
index e8247c01d4..df6e32ccb5 100644
--- a/index.en.po
+++ b/index.en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-05-15 22:55-0400\n"
-"PO-Revision-Date: 2016-05-15 22:48-0400\n"
+"PO-Revision-Date: 2016-05-15 23:03-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -24,13 +24,15 @@ msgstr ""
 #. type: Title #
 #, no-wrap
 msgid "Objectif"
-msgstr ""
+msgstr "Goal"
 
 #. type: Plain text
 msgid ""
 "L'objectif de l'alliance est de supporter et de faire la promotion des "
 "services libres auto-hébergés."
 msgstr ""
+"The goal of the Alliance is to support and promote self-hosted free "
+"software web services."
 
 #. type: Title #
 #, fuzzy, no-wrap
@@ -41,12 +43,15 @@ msgstr "Projects"
 #. type: Plain text
 msgid "L'objectif de l'alliance est accompli par les projets suivants:"
 msgstr ""
+"The goal of the Alliance is accomplished through the following projects:"
 
 #. type: Bullet: ' * '
 msgid ""
 "**Outils partagés**: nous mettons en commun nos outils de sysadmin tel que "
 "des systèmes de monitoring"
 msgstr ""
+"__Shared tools__ : we pool ressources to maintain common system "
+"administration tools such as monitoring services"
 
 #. type: Bullet: ' * '
 #, fuzzy
@@ -65,26 +70,32 @@ msgid ""
 "**[[Principes]]**: nous sommes d'accords sur un ensemble de principes que "
 "les membres doivent suivre"
 msgstr ""
+"__[[Guidelines]]__ : we agree on a number of guidelines that all members of "
+"the Alliance must meet"
 
 #. type: Bullet: ' * '
 msgid ""
 "**Documentation**: nous partageons l'information et les compétences sur les "
 "pratiques de l'auto-hébergement"
 msgstr ""
+"__Documentation__ : we share information and skills about the practice of "
+"self-hosting"
 
 #. type: Title #
 #, no-wrap
 msgid "À discuter"
-msgstr ""
+msgstr "To discuss"
 
 #. type: Title ##
 #, no-wrap
 msgid "Processus décisionnel"
-msgstr ""
+msgstr "Decision-making process"
 
 #. type: Plain text
 msgid "Il faut un processus pour prendre des décisions. Expériences passées:"
 msgstr ""
+"We need a process to make decisions: principles/charter, membership, "
+"ressource allocation, etc. Prior art:"
 
 #. type: Bullet: ' * '
 msgid ""
@@ -101,11 +112,11 @@ msgstr "koumbit: meetings + \"propositions 48h ouvrables\""
 #. type: Title ##
 #, no-wrap
 msgid "Critères d'adhésion"
-msgstr ""
+msgstr "Membership"
 
 #. type: Plain text
 msgid "Qui peut joindre le réseau? Doit-on définir ce qu'est un petit serveur?"
-msgstr ""
+msgstr "Who can join? Do we define what is a small server?"
 
 #. type: Title #
 #, no-wrap
@@ -125,140 +136,12 @@ msgstr "<https://anarc.at/services>"
 #. type: Title #
 #, no-wrap
 msgid "Qui"
-msgstr ""
+msgstr "Who"
 
 #. type: Plain text
 msgid "Serveurs et personnes impliquées:"
-msgstr ""
+msgstr "People involved:"
 
 #. type: Bullet: ' * '
 msgid "<https://anarc.at/>"
 msgstr "<https://anarc.at/>"
-
-#~ msgid "Goal"
-#~ msgstr "Goal"
-
-#~ msgid ""
-#~ "The goal of the Alliance is to support and promote self-hosted free "
-#~ "software web services."
-#~ msgstr ""
-#~ "The goal of the Alliance is to support and promote self-hosted free "
-#~ "software web services."
-
-#~ msgid ""
-#~ "The goal of the Alliance is accomplished through the following projects:"
-#~ msgstr ""
-#~ "The goal of the Alliance is accomplished through the following projects:"
-
-#~ msgid ""
-#~ "__Shared tools__ : we pool ressources to maintain common system "
-#~ "administration tools such as monitoring services"
-#~ msgstr ""
-#~ "__Shared tools__ : we pool ressources to maintain common system "
-#~ "administration tools such as monitoring services"
-
-#~ msgid ""
-#~ "__Guidelines__ : we agree on a number of guidelines that all members of "
-#~ "the Alliance must meet"
-#~ msgstr ""
-#~ "__Guidelines__ : we agree on a number of guidelines that all members of "
-#~ "the Alliance must meet"
-
-#~ msgid ""
-#~ "__Documentation__ : we share information and skills about the practice of "
-#~ "self-hosting"
-#~ msgstr ""
-#~ "__Documentation__ : we share information and skills about the practice of "
-#~ "self-hosting"
-
-#~ msgid "Process"
-#~ msgstr "Process"
-
-#~ msgid ""
-#~ "We need a process to make decisions: principles/charter, membership, "
-#~ "ressource allocation, etc. Prior art:"
-#~ msgstr ""
-#~ "We need a process to make decisions: principles/charter, membership, "
-#~ "ressource allocation, etc. Prior art:"
-
-#~ msgid "Principles"
-#~ msgstr "Principles"
-
-#~ msgid "What is APSSA?"
-#~ msgstr "What is APSSA?"
-
-#~ msgid "Free software"
-#~ msgstr "Free software"
-
-#~ msgid "We should only use [FLOSS][]."
-#~ msgstr "We should only use [FLOSS][]."
-
-#~ msgid ""
-#~ "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
-#~ msgstr ""
-#~ "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
-
-#~ msgid "Privacy"
-#~ msgstr "Privacy"
-
-#~ msgid ""
-#~ "No logs or fast log expiration. The goal is not to police and surveil our "
-#~ "users but provide good services."
-#~ msgstr ""
-#~ "No logs or fast log expiration. The goal is not to police and surveil our "
-#~ "users but provide good services."
-
-#~ msgid "User data is theirs and they can leave with it when they want to."
-#~ msgstr "User data is theirs and they can leave with it when they want to."
-
-#~ msgid "DIY"
-#~ msgstr "DIY"
-
-#~ msgid ""
-#~ "As much as possible, we run services ourselves, on our own machines, in "
-#~ "our own premises. This is *not* a federation of commercially hosted "
-#~ "servers: while we may use \"the cloud\" and such resources for load "
-#~ "distribution in case we get [slashdotted][] or for redundancy, this is "
-#~ "not the norm."
-#~ msgstr ""
-#~ "As much as possible, we run services ourselves, on our own machines, in "
-#~ "our own premises. This is *not* a federation of commercially hosted "
-#~ "servers: while we may use \"the cloud\" and such resources for load "

(fichier de différences tronqué)
Merge branch 'master' of git://apssa.wiki.orangeseeds.org
updated PO files
diff --git a/index.en.po b/index.en.po
index 38a25a9632..e8247c01d4 100644
--- a/index.en.po
+++ b/index.en.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-15 22:40-0400\n"
+"POT-Creation-Date: 2016-05-15 22:55-0400\n"
 "PO-Revision-Date: 2016-05-15 22:48-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,150 +23,89 @@ msgstr ""
 
 #. type: Title #
 #, no-wrap
-msgid "Goal"
-msgstr "Goal"
+msgid "Objectif"
+msgstr ""
 
 #. type: Plain text
 msgid ""
-"The goal of the Alliance is to support and promote self-hosted free software "
-"web services."
-msgstr "The goal of the Alliance is to support and promote self-hosted free software web services."
+"L'objectif de l'alliance est de supporter et de faire la promotion des "
+"services libres auto-hébergés."
+msgstr ""
 
 #. type: Title #
-#, no-wrap
-msgid "Projects"
+#, fuzzy, no-wrap
+#| msgid "Projects"
+msgid "Projets"
 msgstr "Projects"
 
 #. type: Plain text
-msgid "The goal of the Alliance is accomplished through the following projects:"
-msgstr "The goal of the Alliance is accomplished through the following projects:"
-
-#. type: Bullet: ' * '
-msgid ""
-"__Shared tools__ : we pool ressources to maintain common system "
-"administration tools such as monitoring services"
-msgstr "__Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services"
-
-#. type: Bullet: ' * '
-msgid ""
-"__Guidelines__ : we agree on a number of guidelines that all members of the "
-"Alliance must meet"
-msgstr "__Guidelines__ : we agree on a number of guidelines that all members of the Alliance must meet"
+msgid "L'objectif de l'alliance est accompli par les projets suivants:"
+msgstr ""
 
 #. type: Bullet: ' * '
 msgid ""
-"__Documentation__ : we share information and skills about the practice of "
-"self-hosting"
-msgstr "__Documentation__ : we share information and skills about the practice of self-hosting"
+"**Outils partagés**: nous mettons en commun nos outils de sysadmin tel que "
+"des systèmes de monitoring"
+msgstr ""
 
 #. type: Bullet: ' * '
+#, fuzzy
+#| msgid ""
+#| "__Services__ : members of the Alliance can benefit from services run by "
+#| "other members"
 msgid ""
+"**Services**: les membres de l'alliance bénéficient des services gérés par "
+"les autres membres"
+msgstr ""
 "__Services__ : members of the Alliance can benefit from services run by "
 "other members"
-msgstr "__Services__ : members of the Alliance can benefit from services run by other members"
-
-#. type: Title #
-#, no-wrap
-msgid "Process"
-msgstr "Process"
-
-#. type: Plain text
-msgid ""
-"We need a process to make decisions: principles/charter, membership, "
-"ressource allocation, etc. Prior art:"
-msgstr "We need a process to make decisions: principles/charter, membership, ressource allocation, etc. Prior art:"
 
 #. type: Bullet: ' * '
 msgid ""
-"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par "
-"email\", puis finalement Loomio"
-msgstr "réseaulibre: initialement meetings, ensuite proposition \"+7 jours par email\", puis finalement Loomio"
+"**[[Principes]]**: nous sommes d'accords sur un ensemble de principes que "
+"les membres doivent suivre"
+msgstr ""
 
 #. type: Bullet: ' * '
-msgid "koumbit: meetings + \"propositions 48h ouvrables\""
-msgstr "koumbit: meetings + \"propositions 48h ouvrables\""
+msgid ""
+"**Documentation**: nous partageons l'information et les compétences sur les "
+"pratiques de l'auto-hébergement"
+msgstr ""
 
 #. type: Title #
 #, no-wrap
-msgid "Principles"
-msgstr "Principles"
-
-#. type: Plain text
-msgid "What is APSSA?"
-msgstr "What is APSSA?"
-
-#. type: Title ##
-#, no-wrap
-msgid "Free software"
-msgstr "Free software"
-
-#. type: Plain text
-msgid "We should only use [FLOSS][]."
-msgstr "We should only use [FLOSS][]."
-
-#. type: Plain text
-msgid "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
-msgstr "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
-
-#. type: Title ##
-#, no-wrap
-msgid "Privacy"
-msgstr "Privacy"
-
-#. type: Plain text
-msgid ""
-"No logs or fast log expiration. The goal is not to police and surveil our "
-"users but provide good services."
-msgstr "No logs or fast log expiration. The goal is not to police and surveil our users but provide good services."
-
-#. type: Plain text
-msgid "User data is theirs and they can leave with it when they want to."
-msgstr "User data is theirs and they can leave with it when they want to."
+msgid "À discuter"
+msgstr ""
 
 #. type: Title ##
 #, no-wrap
-msgid "DIY"
-msgstr "DIY"
-
-#. type: Plain text
-msgid ""
-"As much as possible, we run services ourselves, on our own machines, in our "
-"own premises. This is *not* a federation of commercially hosted servers: "
-"while we may use \"the cloud\" and such resources for load distribution in "
-"case we get [slashdotted][] or for redundancy, this is not the norm."
-msgstr "As much as possible, we run services ourselves, on our own machines, in our own premises. This is *not* a federation of commercially hosted servers: while we may use \"the cloud\" and such resources for load distribution in case we get [slashdotted][] or for redundancy, this is not the norm."
-
-#. type: Plain text
-msgid "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
-msgstr "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
+msgid "Processus décisionnel"
+msgstr ""
 
 #. type: Plain text
-msgid ""
-"As they say elsewhere, \"[there is no cloud, it's just someone else's "
-"computer][]\"."
-msgstr "As they say elsewhere, \"[there is no cloud, it's just someone else's computer][]\"."
+msgid "Il faut un processus pour prendre des décisions. Expériences passées:"
+msgstr ""
 
-#. type: Plain text
+#. type: Bullet: ' * '
 msgid ""
-"[there is no cloud, it's just someone else's computer]: "
-"https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
-msgstr "[there is no cloud, it's just someone else's computer]: https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
+"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par email"
+"\", puis finalement Loomio"
+msgstr ""
+"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par email"
+"\", puis finalement Loomio"
 
-#. type: Title #
-#, no-wrap
-msgid "Other ideas"
-msgstr "Other ideas"
+#. type: Bullet: ' * '
+msgid "koumbit: meetings + \"propositions 48h ouvrables\""
+msgstr "koumbit: meetings + \"propositions 48h ouvrables\""
 
 #. type: Title ##
 #, no-wrap
-msgid "Automation"
-msgstr "Automation"
+msgid "Critères d'adhésion"
+msgstr ""
 

(fichier de différences tronqué)
rekick translation
diff --git a/index.en.po b/index.en.po
index d392ac389b..38a25a9632 100644
--- a/index.en.po
+++ b/index.en.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-15 22:43-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2016-05-15 22:40-0400\n"
+"PO-Revision-Date: 2016-05-15 22:48-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -24,103 +24,172 @@ msgstr ""
 #. type: Title #
 #, no-wrap
 msgid "Goal"
-msgstr ""
+msgstr "Goal"
 
 #. type: Plain text
 msgid ""
 "The goal of the Alliance is to support and promote self-hosted free software "
 "web services."
-msgstr ""
+msgstr "The goal of the Alliance is to support and promote self-hosted free software web services."
 
 #. type: Title #
 #, no-wrap
 msgid "Projects"
-msgstr ""
+msgstr "Projects"
 
 #. type: Plain text
-msgid ""
-"The goal of the Alliance is accomplished through the following projects:"
-msgstr ""
+msgid "The goal of the Alliance is accomplished through the following projects:"
+msgstr "The goal of the Alliance is accomplished through the following projects:"
 
 #. type: Bullet: ' * '
 msgid ""
 "__Shared tools__ : we pool ressources to maintain common system "
 "administration tools such as monitoring services"
-msgstr ""
+msgstr "__Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services"
+
+#. type: Bullet: ' * '
+msgid ""
+"__Guidelines__ : we agree on a number of guidelines that all members of the "
+"Alliance must meet"
+msgstr "__Guidelines__ : we agree on a number of guidelines that all members of the Alliance must meet"
+
+#. type: Bullet: ' * '
+msgid ""
+"__Documentation__ : we share information and skills about the practice of "
+"self-hosting"
+msgstr "__Documentation__ : we share information and skills about the practice of self-hosting"
 
 #. type: Bullet: ' * '
 msgid ""
 "__Services__ : members of the Alliance can benefit from services run by "
 "other members"
-msgstr ""
+msgstr "__Services__ : members of the Alliance can benefit from services run by other members"
 
-#. type: Bullet: ' * '
+#. type: Title #
+#, no-wrap
+msgid "Process"
+msgstr "Process"
+
+#. type: Plain text
 msgid ""
-"__[[Guidelines]]__ : we agree on a number of guidelines that all members of "
-"the Alliance must follow"
-msgstr ""
+"We need a process to make decisions: principles/charter, membership, "
+"ressource allocation, etc. Prior art:"
+msgstr "We need a process to make decisions: principles/charter, membership, ressource allocation, etc. Prior art:"
 
 #. type: Bullet: ' * '
 msgid ""
-"__Documentation__ : we share information and skills about the practice of "
-"self-hosting"
-msgstr ""
+"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par "
+"email\", puis finalement Loomio"
+msgstr "réseaulibre: initialement meetings, ensuite proposition \"+7 jours par email\", puis finalement Loomio"
+
+#. type: Bullet: ' * '
+msgid "koumbit: meetings + \"propositions 48h ouvrables\""
+msgstr "koumbit: meetings + \"propositions 48h ouvrables\""
 
 #. type: Title #
 #, no-wrap
-msgid "Needs discussion"
-msgstr ""
+msgid "Principles"
+msgstr "Principles"
+
+#. type: Plain text
+msgid "What is APSSA?"
+msgstr "What is APSSA?"
 
 #. type: Title ##
 #, no-wrap
-msgid "Decision-making process"
-msgstr ""
+msgid "Free software"
+msgstr "Free software"
 
 #. type: Plain text
-msgid "We need a process to make decisions. Prior art:"
-msgstr ""
+msgid "We should only use [FLOSS][]."
+msgstr "We should only use [FLOSS][]."
 
-#. type: Bullet: ' * '
+#. type: Plain text
+msgid "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
+msgstr "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
+
+#. type: Title ##
+#, no-wrap
+msgid "Privacy"
+msgstr "Privacy"
+
+#. type: Plain text
 msgid ""
-"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par email"
-"\", puis finalement Loomio"
-msgstr ""
+"No logs or fast log expiration. The goal is not to police and surveil our "
+"users but provide good services."
+msgstr "No logs or fast log expiration. The goal is not to police and surveil our users but provide good services."
 
-#. type: Bullet: ' * '
-msgid "koumbit: meetings + \"propositions 48h ouvrables\""
-msgstr ""
+#. type: Plain text
+msgid "User data is theirs and they can leave with it when they want to."
+msgstr "User data is theirs and they can leave with it when they want to."
 
 #. type: Title ##
 #, no-wrap
-msgid "Membership"
-msgstr ""
+msgid "DIY"
+msgstr "DIY"
 
 #. type: Plain text
-msgid "Who can join? Do we define what is a small server?"
-msgstr ""
+msgid ""
+"As much as possible, we run services ourselves, on our own machines, in our "
+"own premises. This is *not* a federation of commercially hosted servers: "
+"while we may use \"the cloud\" and such resources for load distribution in "
+"case we get [slashdotted][] or for redundancy, this is not the norm."
+msgstr "As much as possible, we run services ourselves, on our own machines, in our own premises. This is *not* a federation of commercially hosted servers: while we may use \"the cloud\" and such resources for load distribution in case we get [slashdotted][] or for redundancy, this is not the norm."
+
+#. type: Plain text
+msgid "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
+msgstr "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
+
+#. type: Plain text
+msgid ""
+"As they say elsewhere, \"[there is no cloud, it's just someone else's "
+"computer][]\"."
+msgstr "As they say elsewhere, \"[there is no cloud, it's just someone else's computer][]\"."
+
+#. type: Plain text
+msgid ""
+"[there is no cloud, it's just someone else's computer]: "
+"https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
+msgstr "[there is no cloud, it's just someone else's computer]: https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
+
+#. type: Title #
+#, no-wrap
+msgid "Other ideas"
+msgstr "Other ideas"
+
+#. type: Title ##
+#, no-wrap
+msgid "Automation"
+msgstr "Automation"
+
+#. type: Plain text
+msgid ""
+"Hard parts should be automated (puppet?) so people can simply run recipes "
+"(and so we can have something uniform across servers too)"
+msgstr "Hard parts should be automated (puppet?) so people can simply run recipes (and so we can have something uniform across servers too)"
 
 #. type: Title #
 #, no-wrap
 msgid "Services"
-msgstr ""
+msgstr "Services"

(fichier de différences tronqué)
Add proposed logo
diff --git a/index.mdwn b/index.mdwn
index 74f58e71a7..829ca4a026 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -26,6 +26,12 @@ We need a process to make decisions. Prior art:
 
 Who can join? Do we define what is a small server?
 
+## Logo
+
+Just a logo idea:
+
+[[!img logo_proposed.svg]]
+
 # Services
 
 What services we currently offer:
diff --git a/logo_proposed.svg b/logo_proposed.svg
new file mode 100644
index 0000000000..6579074f02
--- /dev/null
+++ b/logo_proposed.svg
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 461.63632 507.71169"
+   height="143.28752mm"
+   width="130.28403mm">
+  <defs
+     id="defs4">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient5666">
+      <stop
+         id="stop5668"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <path
+       id="path5680-0"
+       d="m 202.33483,450.76776 c 95.32119,-216.40041 375.6581,-173.47522 424.14571,-1e-5"
+       style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-172.25474,-267.84311)"
+     id="layer1">
+    <rect
+       ry="13.733209"
+       y="337.00058"
+       x="327.45959"
+       height="308.33234"
+       width="166.79022"
+       id="rect3336"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.49491137;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.48473416, 0.49491139;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4147"
+       width="146.6378"
+       height="85.90107"
+       x="337.15323"
+       y="346.69418"
+       ry="7.7722239" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.29250762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:0.87752287, 0.29250762;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4147-1"
+       width="133.98083"
+       height="32.841373"
+       x="343.14554"
+       y="353.16199"
+       ry="6.7575607" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.29250762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:0.87752287, 0.29250762;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4147-1-2"
+       width="133.98083"
+       height="32.841373"
+       x="343.05075"
+       y="391.06689"
+       ry="6.7575607" />
+    <circle
+       r="10.711297"
+       cy="531.44165"
+       cx="409.79431"
+       id="path4181"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="4.4998088"
+       y="647.35822"
+       x="406.46387"
+       height="30.819038"
+       width="12.016531"
+       id="rect4183"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.45985699;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.37957103, 0.45985701;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="3.384342"
+       y="683.58344"
+       x="430.198"
+       height="9.9544172"
+       width="78.263733"
+       id="rect4183-9"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66697854;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:2.00093562, 0.66697854;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="3.3754187"
+       y="683.21405"
+       x="309.8779"
+       height="9.9281702"
+       width="84.76796"
+       id="rect4183-9-7"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.69322491;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:2.07967467, 0.6932249;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="5.2652097"
+       y="680.56989"
+       x="396.96332"
+       height="15.98142"
+       width="30.843008"
+       id="rect4183-9-7-9"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.76066589;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:2.28199772, 0.76066591;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="214.22594"
+       cy="520.91809"
+       cx="411.9151"
+       id="path4230"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15.49999905;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path5680"
+       d="m 202.33483,450.76776 c 95.32119,-216.40041 375.6581,-173.47522 424.14571,-1e-5"
+       style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <text
+       transform="translate(-5.410022,-8.6560352)"
+       id="text5682"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.67778778px;line-height:125%;font-family:'Droid Sans Mono';-inkscape-font-specification:'Droid Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><textPath
+         id="textPath5688"
+         xlink:href="#path5680"><tspan
+   id="tspan5684"><tspan
+     x="146.37492"
+     y="240.70296"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Clear Sans';-inkscape-font-specification:'Clear Sans Bold'"
+     id="tspan5686">Alliance des Petits Serveurs</tspan></tspan></textPath></text>
+    <rect
+       ry="10.272203"
+       y="415.27985"
+       x="502.48425"
+       height="198.11125"
+       width="41.143734"
+       id="rect3336-7-8-9"
+       style="opacity:1;fill:#343434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69691795;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:2.09075381, 0.69691794;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="3.729677"
+       cy="454.40585"
+       cx="525.15015"
+       id="path4181-1"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34820032;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.04460092, 0.3482003;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="3.729677"
+       cy="471.24451"
+       cx="525.15015"
+       id="path4181-1-7"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34820032;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.04460092, 0.3482003;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="3.729677"
+       cy="488.08316"
+       cx="525.15015"
+       id="path4181-1-7-0"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34820032;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.04460092, 0.3482003;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       r="3.729677"
+       cy="505.32642"
+       cx="525.15015"
+       id="path4181-1-7-0-7"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.34820032;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.04460092, 0.3482003;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="rect3336-7-8-9-9"
+       d="m 531.32341,420.80106 c 2.89164,-0.79771 6.17763,2.38932 7.36771,7.14579 l 18.30237,74.91955 16.34272,72.04234 c 1.08526,4.78405 1.72213,6.98431 -1.16949,7.78202 -2.89163,0.7977 -3.46307,-1.07451 -4.84577,-5.7732 l -20.39842,-70.45865 -18.67048,-75.63228 c -1.17514,-4.76056 0.17974,-9.22787 3.07136,-10.02557 z"
+       style="opacity:1;fill:#343434;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34002557;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1.02007669, 0.34002557;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="10.272203"
+       y="448.81525"
+       x="269.10297"
+       height="136.13873"

(fichier de différences tronqué)
traduire
diff --git a/index.mdwn b/index.mdwn
index 74f58e71a7..a92a9ebc01 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,39 +1,45 @@
 [[!toc levels=2]]
 
-# Goal
+# Objectif
 
-The goal of the Alliance is to support and promote self-hosted free software web services.
+L'objectif de l'alliance est de supporter et de faire la promotion des
+services libres auto-hébergés.
 
-# Projects
+# Projets
 
-The goal of the Alliance is accomplished through the following projects:
+L'objectif de l'alliance est accompli par les projets suivants:
 
- * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
- * __Services__ : members of the Alliance can benefit from services run by other members
- * __[[Guidelines]]__ : we agree on a number of guidelines that all members of the Alliance must follow
- * __Documentation__ : we share information and skills about the practice of self-hosting
+ * **Outils partagés**: nous mettons en commun nos outils de sysadmin
+   tel que des systèmes de monitoring
+ * **Services**: les membres de l'alliance bénéficient des services
+   gérés par les autres membres
+ * **[[Principes]]**: nous sommes d'accords sur un ensemble de principes
+   que les membres doivent suivre
+ * **Documentation**: nous partageons l'information et les compétences
+   sur les pratiques de l'auto-hébergement
 
-# Needs discussion
+# À discuter
 
-## Decision-making process
+## Processus décisionnel
 
-We need a process to make decisions. Prior art:
+Il faut un processus pour prendre des décisions. Expériences passées:
 
  * réseaulibre: initialement meetings, ensuite proposition "+7 jours par email", puis finalement Loomio
  * koumbit: meetings + "propositions 48h ouvrables"
 
-## Membership
+## Critères d'adhésion
 
-Who can join? Do we define what is a small server?
+Qui peut joindre le réseau? Doit-on définir ce qu'est un petit
+serveur?
 
 # Services
 
-What services we currently offer:
+Les services présentement offerts:
 
  * <https://anarc.at/services>
 
-# Who
+# Qui
 
-People involved:
+Serveurs et personnes impliquées:
 
  * <https://anarc.at/>

updated PO files
diff --git a/index.en.po b/index.en.po
index c3d8efc109..d392ac389b 100644
--- a/index.en.po
+++ b/index.en.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-15 22:40-0400\n"
+"POT-Creation-Date: 2016-05-15 22:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 
 #. type: Bullet: ' * '
 msgid ""
-"__Guidelines__ : we agree on a number of guidelines that all members of the "
-"Alliance must follow"
+"__[[Guidelines]]__ : we agree on a number of guidelines that all members of "
+"the Alliance must follow"
 msgstr ""
 
 #. type: Bullet: ' * '

Add link to guidelines
diff --git a/index.mdwn b/index.mdwn
index 4cd7b704f2..74f58e71a7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -10,7 +10,7 @@ The goal of the Alliance is accomplished through the following projects:
 
  * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
  * __Services__ : members of the Alliance can benefit from services run by other members
- * __Guidelines__ : we agree on a number of guidelines that all members of the Alliance must follow
+ * __[[Guidelines]]__ : we agree on a number of guidelines that all members of the Alliance must follow
  * __Documentation__ : we share information and skills about the practice of self-hosting
 
 # Needs discussion

updated PO files
diff --git a/guidelines.en.po b/guidelines.en.po
new file mode 100644
index 0000000000..88271dd62f
--- /dev/null
+++ b/guidelines.en.po
@@ -0,0 +1,133 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-15 22:40-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Title #
+#, no-wrap
+msgid "Guidelines"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"APSSA membres strive to apply the following guidelines in their self-hosting "
+"operations:"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Free software"
+msgstr ""
+
+#. type: Plain text
+msgid "We only use [FLOSS][]."
+msgstr ""
+
+#. type: Plain text
+msgid "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Privacy & security"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We value our user's privacy and will never hand over any user information, "
+"not even to other alliance members, without the user's consent. The goal is "
+"not to police and surveil our users but only provide good services. As such, "
+"we:"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "Only provide access to our services through encrypted channels (eg. TLS)"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "Only store data on encrypted disks"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "Keep our software up-to-date"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "Keep no or very little logs"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If our users wish to close an account, we delete all data associated with it "
+"as soon as possible."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Data ownership"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"User data is theirs and they can leave with it when they want to. At their "
+"request, we will hand out copies of their user's data within a reasonable "
+"timeframe."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "DIY"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"As much as possible, we run services ourselves, on our own machines, in our "
+"own premises. This is *not* a federation of commercially hosted servers: "
+"while we may use \"the cloud\" and such resources for load distribution in "
+"case we get [slashdotted][] or for redundancy, this is not the norm."
+msgstr ""
+
+#. type: Plain text
+msgid "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"As they say elsewhere, \"[there is no cloud, it's just someone else's "
+"computer][]\"."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[there is no cloud, it's just someone else's computer]: "
+"https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Other ideas"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Automation"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Hard parts should be automated (puppet?) so people can simply run recipes "
+"(and so we can have something uniform across servers too)"
+msgstr ""
diff --git a/index.en.po b/index.en.po
index 2db03ab896..c3d8efc109 100644
--- a/index.en.po
+++ b/index.en.po
@@ -38,7 +38,8 @@ msgid "Projects"
 msgstr ""
 
 #. type: Plain text
-msgid "The goal of the Alliance is accomplished through the following projects:"
+msgid ""
+"The goal of the Alliance is accomplished through the following projects:"
 msgstr ""
 
 #. type: Bullet: ' * '
@@ -47,125 +48,55 @@ msgid ""
 "administration tools such as monitoring services"
 msgstr ""
 
-#. type: Bullet: ' * '
-msgid ""
-"__Guidelines__ : we agree on a number of guidelines that all members of the "
-"Alliance must meet"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"__Documentation__ : we share information and skills about the practice of "
-"self-hosting"
-msgstr ""
-
 #. type: Bullet: ' * '
 msgid ""
 "__Services__ : members of the Alliance can benefit from services run by "
 "other members"
 msgstr ""
 
-#. type: Title #
-#, no-wrap
-msgid "Process"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"We need a process to make decisions: principles/charter, membership, "
-"ressource allocation, etc. Prior art:"
-msgstr ""
-
 #. type: Bullet: ' * '
 msgid ""
-"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par "
-"email\", puis finalement Loomio"
+"__Guidelines__ : we agree on a number of guidelines that all members of the "
+"Alliance must follow"
 msgstr ""
 
 #. type: Bullet: ' * '
-msgid "koumbit: meetings + \"propositions 48h ouvrables\""
+msgid ""
+"__Documentation__ : we share information and skills about the practice of "
+"self-hosting"
 msgstr ""

(fichier de différences tronqué)
updated PO files
diff --git a/index.en.po b/index.en.po
new file mode 100644
index 0000000000..2db03ab896
--- /dev/null
+++ b/index.en.po
@@ -0,0 +1,195 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-15 22:40-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Goal"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The goal of the Alliance is to support and promote self-hosted free software "
+"web services."
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Projects"
+msgstr ""
+
+#. type: Plain text
+msgid "The goal of the Alliance is accomplished through the following projects:"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"__Shared tools__ : we pool ressources to maintain common system "
+"administration tools such as monitoring services"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"__Guidelines__ : we agree on a number of guidelines that all members of the "
+"Alliance must meet"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"__Documentation__ : we share information and skills about the practice of "
+"self-hosting"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"__Services__ : members of the Alliance can benefit from services run by "
+"other members"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Process"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We need a process to make decisions: principles/charter, membership, "
+"ressource allocation, etc. Prior art:"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid ""
+"réseaulibre: initialement meetings, ensuite proposition \"+7 jours par "
+"email\", puis finalement Loomio"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "koumbit: meetings + \"propositions 48h ouvrables\""
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Principles"
+msgstr ""
+
+#. type: Plain text
+msgid "What is APSSA?"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Free software"
+msgstr ""
+
+#. type: Plain text
+msgid "We should only use [FLOSS][]."
+msgstr ""
+
+#. type: Plain text
+msgid "[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Privacy"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"No logs or fast log expiration. The goal is not to police and surveil our "
+"users but provide good services."
+msgstr ""
+
+#. type: Plain text
+msgid "User data is theirs and they can leave with it when they want to."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "DIY"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"As much as possible, we run services ourselves, on our own machines, in our "
+"own premises. This is *not* a federation of commercially hosted servers: "
+"while we may use \"the cloud\" and such resources for load distribution in "
+"case we get [slashdotted][] or for redundancy, this is not the norm."
+msgstr ""
+
+#. type: Plain text
+msgid "[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"As they say elsewhere, \"[there is no cloud, it's just someone else's "
+"computer][]\"."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[there is no cloud, it's just someone else's computer]: "
+"https://www.chriswatterston.com/blog/my-there-no-cloud-sticker"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Other ideas"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Automation"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Hard parts should be automated (puppet?) so people can simply run recipes "
+"(and so we can have something uniform across servers too)"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Services"
+msgstr ""
+
+#. type: Plain text
+msgid "What services we currently offer:"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "<https://anarc.at/services>"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Who"
+msgstr ""
+
+#. type: Plain text
+msgid "People involved:"
+msgstr ""
+
+#. type: Bullet: ' * '
+msgid "<https://anarc.at/>"

(fichier de différences tronqué)
Add guidelines (formerly Principles)
diff --git a/guidelines.mdwn b/guidelines.mdwn
new file mode 100644
index 0000000000..ae6877226b
--- /dev/null
+++ b/guidelines.mdwn
@@ -0,0 +1,54 @@
+# Guidelines
+
+APSSA membres strive to apply the following guidelines in their self-hosting
+operations:
+
+## Free software
+
+We only use [FLOSS][].
+
+[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS
+
+## Privacy & security
+
+We value our user's privacy and will never hand over any user information, not
+even to other alliance members, without the user's consent. The goal is not to
+police and surveil our users but only provide good services. As such, we:
+
+ * Only provide access to our services through encrypted channels (eg. TLS)
+ * Only store data on encrypted disks
+ * Keep our software up-to-date
+ * Keep no or very little logs
+
+If our users wish to close an account, we delete all data associated with it
+as soon as possible.
+
+## Data ownership
+
+User data is theirs and they can leave with it when they want to. At their
+request, we will hand out copies of their user's data within a reasonable
+timeframe.
+
+## DIY
+
+As much as possible, we run services ourselves, on our own machines,
+in our own premises. This is *not* a federation of commercially hosted
+servers: while we may use "the cloud" and such resources for load
+distribution in case we get [slashdotted][] or for redundancy, this is
+not the norm.
+
+[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted
+
+As they say elsewhere,
+"[there is no cloud, it's just someone else's computer][]". 
+
+[there is no cloud, it's just someone else's computer]: https://www.chriswatterston.com/blog/my-there-no-cloud-sticker
+
+# Other ideas
+
+## Automation
+
+Hard parts should be automated (puppet?) so people can simply run
+recipes (and so we can have something uniform across servers too)
+
+
diff --git a/index.mdwn b/index.mdwn
index 13387c2390..4cd7b704f2 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,55 +9,22 @@ The goal of the Alliance is to support and promote self-hosted free software web
 The goal of the Alliance is accomplished through the following projects:
 
  * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
- * __Guidelines__ : we agree on a number of guidelines that all members of the Alliance must meet
- * __Documentation__ : we share information and skills about the practice of self-hosting
  * __Services__ : members of the Alliance can benefit from services run by other members
+ * __Guidelines__ : we agree on a number of guidelines that all members of the Alliance must follow
+ * __Documentation__ : we share information and skills about the practice of self-hosting
+
+# Needs discussion
 
-# Process
+## Decision-making process
 
-We need a process to make decisions: principles/charter, membership, ressource allocation, etc. Prior art:
+We need a process to make decisions. Prior art:
 
  * réseaulibre: initialement meetings, ensuite proposition "+7 jours par email", puis finalement Loomio
  * koumbit: meetings + "propositions 48h ouvrables"
 
-# Principles
-
-What is APSSA?
-
-## Free software
-
-We should only use [FLOSS][].
-
-[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS
-
-## Privacy
-
-No logs or fast log expiration. The goal is not to police and surveil
-our users but provide good services.
-
-User data is theirs and they can leave with it when they want to.
-
-## DIY
-
-As much as possible, we run services ourselves, on our own machines,
-in our own premises. This is *not* a federation of commercially hosted
-servers: while we may use "the cloud" and such resources for load
-distribution in case we get [slashdotted][] or for redundancy, this is
-not the norm.
-
-[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted
-
-As they say elsewhere,
-"[there is no cloud, it's just someone else's computer][]". 
-
-[there is no cloud, it's just someone else's computer]: https://www.chriswatterston.com/blog/my-there-no-cloud-sticker
-
-# Other ideas
-
-## Automation
+## Membership
 
-Hard parts should be automated (puppet?) so people can simply run
-recipes (and so we can have something uniform across servers too)
+Who can join? Do we define what is a small server?
 
 # Services
 

test
diff --git a/sandbox.mdwn b/sandbox.mdwn
new file mode 100644
index 0000000000..90b67dda6d
--- /dev/null
+++ b/sandbox.mdwn
@@ -0,0 +1 @@
+Test.

style
diff --git a/index.mdwn b/index.mdwn
index 84c78ca786..13387c2390 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,10 +6,12 @@ The goal of the Alliance is to support and promote self-hosted free software web
 
 # Projects
 
- * Shared tools : we pool ressources to maintain common system administration tools such as monitoring services
- * Guidelines : we agree on a number of guidelines that all members of the Alliance must meet
- * Documentation : we share information and skills about the practice of self-hosting
- * Services : members of the Alliance can benefit from services run by other members
+The goal of the Alliance is accomplished through the following projects:
+
+ * __Shared tools__ : we pool ressources to maintain common system administration tools such as monitoring services
+ * __Guidelines__ : we agree on a number of guidelines that all members of the Alliance must meet
+ * __Documentation__ : we share information and skills about the practice of self-hosting
+ * __Services__ : members of the Alliance can benefit from services run by other members
 
 # Process
 

toc, projects, goal, process
diff --git a/index.mdwn b/index.mdwn
index e24b3f3506..84c78ca786 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,10 +1,26 @@
+[[!toc levels=2]]
+
 # Goal
 
 The goal of the Alliance is to support and promote self-hosted free software web services.
 
-# Guidelines
+# Projects
+
+ * Shared tools : we pool ressources to maintain common system administration tools such as monitoring services
+ * Guidelines : we agree on a number of guidelines that all members of the Alliance must meet
+ * Documentation : we share information and skills about the practice of self-hosting
+ * Services : members of the Alliance can benefit from services run by other members
+
+# Process
+
+We need a process to make decisions: principles/charter, membership, ressource allocation, etc. Prior art:
+
+ * réseaulibre: initialement meetings, ensuite proposition "+7 jours par email", puis finalement Loomio
+ * koumbit: meetings + "propositions 48h ouvrables"
+
+# Principles
 
-What we want APSSA to be
+What is APSSA?
 
 ## Free software
 

State goal.
diff --git a/index.mdwn b/index.mdwn
index bee89008aa..e24b3f3506 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,7 @@
+# Goal
+
+The goal of the Alliance is to support and promote self-hosted free software web services.
+
 # Guidelines
 
 What we want APSSA to be

fix links
diff --git a/index.mdwn b/index.mdwn
index 35c666984e..bee89008aa 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -41,10 +41,10 @@ recipes (and so we can have something uniform across servers too)
 
 What services we currently offer:
 
- * https://anarc.at/services
+ * <https://anarc.at/services>
 
 # Who
 
 People involved:
 
- * https://anarc.at/
+ * <https://anarc.at/>

review and change
diff --git a/index.mdwn b/index.mdwn
index 20b3888ea9..35c666984e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,24 +1,50 @@
 # Guidelines
 
-What we want apssa to be
+What we want APSSA to be
 
 ## Free software
 
-We should only use FOSS.
+We should only use [FLOSS][].
 
-## Respect for people's privacy
+[FLOSS]: https://en.wikipedia.org/wiki/Free_and_open-source_software#FLOSS
 
-No logs on sensitive parts, confidential logs for the rest
-Your data is yours and you can leave with it when you want to
+## Privacy
 
-## Server automation
+No logs or fast log expiration. The goal is not to police and surveil
+our users but provide good services.
 
-Hard parts should be automated (puppet?) so people can simply run recipes (and so we can have something uniform across servers too)
+User data is theirs and they can leave with it when they want to.
+
+## DIY
+
+As much as possible, we run services ourselves, on our own machines,
+in our own premises. This is *not* a federation of commercially hosted
+servers: while we may use "the cloud" and such resources for load
+distribution in case we get [slashdotted][] or for redundancy, this is
+not the norm.
+
+[slashdotted]: https://en.wikipedia.org/wiki/Slashdotted
+
+As they say elsewhere,
+"[there is no cloud, it's just someone else's computer][]". 
+
+[there is no cloud, it's just someone else's computer]: https://www.chriswatterston.com/blog/my-there-no-cloud-sticker
+
+# Other ideas
+
+## Automation
+
+Hard parts should be automated (puppet?) so people can simply run
+recipes (and so we can have something uniform across servers too)
 
 # Services
 
-What services should we / can we offer
+What services we currently offer:
+
+ * https://anarc.at/services
 
 # Who
 
-People involved
+People involved:
+
+ * https://anarc.at/

first jolt of ideas
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000000..20b3888ea9
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,24 @@
+# Guidelines
+
+What we want apssa to be
+
+## Free software
+
+We should only use FOSS.
+
+## Respect for people's privacy
+
+No logs on sensitive parts, confidential logs for the rest
+Your data is yours and you can leave with it when you want to
+
+## Server automation
+
+Hard parts should be automated (puppet?) so people can simply run recipes (and so we can have something uniform across servers too)
+
+# Services
+
+What services should we / can we offer
+
+# Who
+
+People involved

initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..eecda60245
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki