[gentoo-commits] proj/devmanual:master commit in: general-concepts/git-to-rsync/, general-concepts/mirrors/, ...

[Ulrich Müller]

commit:     a79753c392d0b2a66402a1f11ef02cf131efe080
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 15:37:04 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 19:56:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a79753c3

*.svg: specify Open Sans instead of generic "sans-serif" font.

The text in most of our diagrams was left to use the generic
"sans-serif" font face, which depends on both the local machine and
the program used to edit/convert the SVG image. This isn't the best
situation, because we want the output PNGs to be predictable.

The Tyrian layout used for devmanual.gentoo.org makes heavy use of the
"Open Sans" font, so this commit updates each SVG in the devmanual to
use that face for all text elements that were previously "sans-serif".

Bug: https://bugs.gentoo.org/700904
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
[Fonts in ebuild-writing/functions/diagram.svg fixed]
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ebuild-writing/functions/diagram.svg           | 477 ++++++++--------
 general-concepts/autotools/diagram.svg         | 515 ++++++++++++++----
 general-concepts/emerge-and-ebuild/diagram.svg | 294 ++++++++--
 general-concepts/git-to-rsync/diagram.svg      | 644 +++++++++++++++++-----
 general-concepts/mirrors/diagram.svg           | 717 ++++++++++++-------------
 5 files changed, 1727 insertions(+), 920 deletions(-)

diff --git a/ebuild-writing/functions/diagram.svg b/ebuild-writing/functions/diagram.svg
index 43bf26e..9547fc7 100644
--- a/ebuild-writing/functions/diagram.svg
+++ b/ebuild-writing/functions/diagram.svg
@@ -5,17 +5,11 @@
    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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:version="1.0beta1 (fe3e306978, 2019-09-17)"
-   sodipodi:docname="diagram.svg"
-   id="svg2503"
-   viewBox="-130 100 1100 80"
-   height="80"
+   version="1.0"
    width="1100"
-   version="1.0">
+   height="80"
+   viewBox="-130 100 1100 80"
+   id="svg2503">
   <metadata
      id="metadata55">
     <rdf:RDF>
@@ -28,389 +22,366 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:current-layer="svg2503"
-     inkscape:window-maximized="0"
-     inkscape:window-y="29"
-     inkscape:window-x="0"
-     inkscape:cy="-42.598355"
-     inkscape:cx="920.06029"
-     inkscape:zoom="3.7798071"
-     showgrid="false"
-     id="namedview53"
-     inkscape:window-height="1423"
-     inkscape:window-width="1929"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     inkscape:document-rotation="0"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
   <defs
      id="defs2577" />
   <desc
      id="desc2505">Ebuild Function Order</desc>
   <rect
-     style="fill:#eeeeee;stroke-width:0.293003"
-     id="background"
-     y="96.698219"
-     x="-129.33987"
+     width="1101.323"
      height="85.745827"
-     width="1101.323" />
+     x="-129.33987"
+     y="96.698219"
+     id="background"
+     style="fill:#eeeeee;stroke-width:0.293003" />
   <rect
-     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2508"
-     y="115.12637"
-     x="-7.6246438"
+     width="80"
      height="30"
-     width="80" />
+     x="-7.6246438"
+     y="115.12637"
+     id="rect2508"
+     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2510"
+     x="32.375347"
      y="135.12637"
-     x="32.375347">pkg_setup</text>
+     id="text2510"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">pkg_setup</text>
   <rect
-     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2518"
-     y="115.12637"
-     x="109.90766"
+     width="80"
      height="30"
-     width="80" />
+     x="109.90766"
+     y="115.12637"
+     id="rect2518"
+     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2520"
+     x="149.90767"
      y="135.12637"
-     x="149.90767">src_unpack</text>
+     id="text2520"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_unpack</text>
   <rect
-     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2528"
-     y="115.12637"
-     x="428.4689"
+     width="80"
      height="30"
-     width="80" />
+     x="428.4689"
+     y="115.12637"
+     id="rect2528"
+     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2530"
+     x="468.4689"
      y="135.12637"
-     x="468.4689">src_compile</text>
+     id="text2530"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_compile</text>
   <path
-     inkscape:connector-curvature="0"
-     style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
+     d="m 509.22566,130.12637 c 11.55683,0 17.33525,4 17.33525,12 0,8.66667 5.77842,13 17.33525,13 h 69.34101 c 11.55683,0 17.33525,-4.33333 17.33525,-13 0,-8 5.77842,-12 17.33525,-12"
      id="path2538"
-     d="m 509.22566,130.12637 c 11.55683,0 17.33525,4 17.33525,12 0,8.66667 5.77842,13 17.33525,13 h 69.34101 c 11.55683,0 17.33525,-4.33333 17.33525,-13 0,-8 5.77842,-12 17.33525,-12" />
+     style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   <rect
-     style="opacity:1;fill:#ccffcc;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2540"
-     y="115.12637"
-     x="538.37067"
+     width="80"
      height="30"
-     width="80" />
+     x="538.37067"
+     y="115.12637"
+     id="rect2540"
+     style="opacity:1;fill:#ccffcc;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2542"
+     x="578.37061"
      y="135.12637"
-     x="578.37061">src_test</text>
+     id="text2542"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_test</text>
   <g
      id="g915">
     <line
-       x1="619.22565"
-       y1="130.12637"
-       x2="647.90759"
-       y2="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
        id="line2544"
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
-    <line
-       x1="647.90759"
+       y2="130.12637"
+       x2="647.90759"
        y1="130.12637"
-       x2="639.90759"
-       y2="125.12637"
-       id="line2546"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       x1="619.22565" />
     <line
-       x1="647.90759"
-       y1="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2546"
+       y2="125.12637"
        x2="639.90759"
-       y2="135.12637"
+       y1="130.12637"
+       x1="647.90759" />
+    <line
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
        id="line2548"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       y2="135.12637"
+       x2="639.90759"
+       y1="130.12637"
+       x1="647.90759" />
   </g>
   <rect
-     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2550"
-     y="115.12637"
-     x="649.09814"
+     width="80"
      height="30"
-     width="80" />
+     x="649.09814"
+     y="115.12637"
+     id="rect2550"
+     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2552"
+     x="687.09814"
      y="135.12637"
-     x="687.09814">src_install</text>
+     id="text2552"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_install</text>
   <g
      id="g920">
     <line
-       x1="729.9978"
-       y1="130.12637"
-       x2="767.09814"
-       y2="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
        id="line2554"
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
-    <line
-       x1="767.09814"
+       y2="130.12637"
+       x2="767.09814"
        y1="130.12637"
-       x2="759.09814"
-       y2="125.12637"
-       id="line2556"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       x1="729.9978" />
     <line
-       x1="767.09814"
-       y1="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2556"
+       y2="125.12637"
        x2="759.09814"
-       y2="135.12637"
+       y1="130.12637"
+       x1="767.09814" />
+    <line
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
        id="line2558"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       y2="135.12637"
+       x2="759.09814"
+       y1="130.12637"
+       x1="767.09814" />
   </g>
   <rect
-     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2560"
-     y="115.12637"
-     x="767.90759"
+     width="80"
      height="30"
-     width="80" />
+     x="767.90759"
+     y="115.12637"
+     id="rect2560"
+     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2562"
+     x="807.90759"
      y="135.12637"
-     x="807.90759">pkg_preinst</text>
+     id="text2562"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">pkg_preinst</text>
   <g
      id="g925">
     <line
-       x1="848.47461"
-       y1="130.12637"
-       x2="873.90759"
-       y2="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
        id="line2564"
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
-    <line
-       x1="873.90759"
+       y2="130.12637"
+       x2="873.90759"
        y1="130.12637"
-       x2="865.90759"
-       y2="125.12637"
-       id="line2566"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       x1="848.47461" />
     <line
-       x1="873.90759"
-       y1="130.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2566"
+       y2="125.12637"
        x2="865.90759"
-       y2="135.12637"
+       y1="130.12637"
+       x1="873.90759" />
+    <line
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
        id="line2568"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       y2="135.12637"
+       x2="865.90759"
+       y1="130.12637"
+       x1="873.90759" />
   </g>
   <rect
-     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2570"
-     y="115.12637"
-     x="873.90759"
+     width="80"
      height="30"
-     width="80" />
+     x="873.90759"
+     y="115.12637"
+     id="rect2570"
+     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
-     id="text2572"
+     x="913.90759"
      y="135.12637"
-     x="913.90759">pkg_postinst</text>
+     id="text2572"
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">pkg_postinst</text>
   <path
-     inkscape:connector-curvature="0"
-     style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
+     d="m 71.583477,130.33234 c 17.871085,0 26.806636,5.59997 26.806636,16.79991 0,11.85877 8.935547,17.78815 26.806617,17.78815 h 589.74589 c 17.87109,0 26.80666,-5.92938 26.80666,-17.78815 0,-11.19994 8.93553,-16.79991 26.80662,-16.79991"
      id="path2574"
-     d="m 71.583477,130.33234 c 17.871085,0 26.806636,5.59997 26.806636,16.79991 0,11.85877 8.935547,17.78815 26.806617,17.78815 h 589.74589 c 17.87109,0 26.80666,-5.92938 26.80666,-17.78815 0,-11.19994 8.93553,-16.79991 26.80662,-16.79991" />
+     style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   <rect
-     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2583"
-     y="115.12637"
-     x="322.2374"
+     width="80"
      height="30"
-     width="80" />
+     x="322.2374"
+     y="115.12637"
+     id="rect2583"
+     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
+     x="363.37662"
+     y="135.12637"
      id="text2585"
-     y="135.1263"
-     x="363.37662">src_configure</text>
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_configure</text>
   <rect
-     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
-     id="rect2587"
-     y="115.12637"
-     x="215.93536"
+     width="80"
      height="30"
-     width="80" />
+     x="215.93536"
+     y="115.12637"
+     id="rect2587"
+     style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
   <text
-     style="text-anchor:middle;opacity:1;stop-opacity:1"
+     x="258.45276"
+     y="135.12637"
      id="text2589"
-     y="135.1263"
-     x="258.45276">src_prepare</text>
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">src_prepare</text>
   <rect
-     width="80"
-     height="30"
-     x="-113.90761"
-     y="115.0796"
+     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
      id="rect880"
-     style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
+     y="115.0796"
+     x="-113.90761"
+     height="30"
+     width="80" />
   <text
      x="-73.904678"
-     y="133.18214"
+     y="135.12637"
      id="text890"
-     style="text-anchor:middle;opacity:1;stop-opacity:1">pkg_pretend</text>
+     style="text-anchor:middle;opacity:1;stop-opacity:1;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">pkg_pretend</text>
   <g
      id="g910">
     <line
-       x1="537.90765"
-       y1="130.12637"
-       x2="529.90765"
-       y2="125.12637"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
        id="line2534"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
-    <line
-       x1="537.90765"
-       y1="130.12637"
+       y2="125.12637"
        x2="529.90765"
-       y2="135.12637"
-       id="line2536"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
-    <line
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
-       id="line890"
-       y2="130.12637"
-       x2="537.90759"
        y1="130.12637"
-       x1="512.47461" />
+       x1="537.90765" />
     <line
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
-       id="line894"
-       y2="130.12637"
-       x2="537.90759"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2536"
+       y2="135.12637"
+       x2="529.90765"
        y1="130.12637"
-       x1="509.22568" />
-  </g>
-  <g
-     id="g904">
+       x1="537.90765" />
     <line
-       x1="428.4689"
+       x1="512.47461"
        y1="130.12637"
-       x2="420.4689"
-       y2="125.12637"
-       id="line2524"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       x2="537.90759"
+       y2="130.12637"
+       id="line890"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
     <line
-       x1="428.4689"
+       x1="509.22568"
        y1="130.12637"
-       x2="420.4689"
-       y2="135.12637"
-       id="line2526"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
-    <line
-       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
-       id="line902"
+       x2="537.90759"
        y2="130.12637"
-       x2="428.4689"
-       y1="130.12637"
-       x1="403.03592" />
+       id="line894"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   </g>
   <g
-     id="g899">
+     id="g904">
     <line
-       x1="322.2374"
-       y1="130.12637"
-       x2="314.2374"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2524"
        y2="125.12637"
-       id="line2616"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
-    <line
-       x1="322.2374"
+       x2="420.4689"
        y1="130.12637"
-       x2="314.2374"
+       x1="428.4689" />
+    <line
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
+       id="line2526"
        y2="135.12637"
-       id="line2618"
-       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+       x2="420.4689"
+       y1="130.12637"
+       x1="428.4689" />
     <line
-       x1="296.80441"
+       x1="403.03592"
        y1="130.12637"
-       x2="322.2374"
+       x2="428.4689"
        y2="130.12637"
-       id="line904"
+       id="line902"
        style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   </g>
   <g
-     id="g894">
+     id="g899">
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
-       id="line2608"
+       id="line2616"
        y2="125.12637"
-       x2="207.93535"
+       x2="314.2374"
        y1="130.12637"
-       x1="215.93535" />
+       x1="322.2374" />
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
-       id="line2610"
+       id="line2618"
        y2="135.12637"
-       x2="207.93535"
+       x2="314.2374"
        y1="130.12637"
-       x1="215.93535" />
+       x1="322.2374" />
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
-       id="line906"
+       id="line904"
        y2="130.12637"
-       x2="215.93535"
+       x2="322.2374"
        y1="130.12637"
-       x1="190.50237" />
+       x1="296.80441" />
   </g>
   <g
-     id="g884">
+     id="g894">
     <line
-       x1="-7.6246533"
+       x1="215.93535"
        y1="130.12637"
-       x2="-15.624653"
+       x2="207.93535"
        y2="125.12637"
-       id="line884"
+       id="line2608"
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
     <line
-       x1="-7.6246533"
+       x1="215.93535"
        y1="130.12637"
-       x2="-15.624653"
+       x2="207.93535"
        y2="135.12637"
-       id="line886"
+       id="line2610"
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
     <line
-       x1="-33.057636"
+       x1="190.50237"
        y1="130.12637"
-       x2="-7.6246533"
+       x2="215.93535"
        y2="130.12637"
-       id="line916"
+       id="line906"
        style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   </g>
   <g
-     id="g889">
+     id="g884">
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
-       x1="109.90767"
-       y1="130.12637"
-       x2="101.90767"
+       id="line884"
        y2="125.12637"
-       id="line2514" />
+       x2="-15.624653"
+       y1="130.12637"
+       x1="-7.6246533" />
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
-       x1="109.90767"
-       y1="130.12637"
-       x2="101.90767"
+       id="line886"
        y2="135.12637"
-       id="line2516" />
+       x2="-15.624653"
+       y1="130.12637"
+       x1="-7.6246533" />
     <line
        style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
-       id="line920"
+       id="line916"
        y2="130.12637"
-       x2="109.90767"
+       x2="-7.6246533"
+       y1="130.12637"
+       x1="-33.057636" />
+  </g>
+  <g
+     id="g889">
+    <line
+       id="line2514"
+       y2="125.12637"
+       x2="101.90767"
+       y1="130.12637"
+       x1="109.90767"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+    <line
+       id="line2516"
+       y2="135.12637"
+       x2="101.90767"
+       y1="130.12637"
+       x1="109.90767"
+       style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
+    <line
+       x1="72.807327"
        y1="130.12637"
-       x1="72.807327" />
+       x2="109.90767"
+       y2="130.12637"
+       id="line920"
+       style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
   </g>
 </svg>

diff --git a/general-concepts/autotools/diagram.svg b/general-concepts/autotools/diagram.svg
index 7e205e1..37e5a93 100644
--- a/general-concepts/autotools/diagram.svg
+++ b/general-concepts/autotools/diagram.svg
@@ -1,102 +1,415 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg viewBox="0 50 510 360" width="510" height="360" xmlns="http://www.w3.org/2000/svg" version="1.1">
-    <desc>Autotools Build Process</desc>
-    <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
-
-    <rect x="0" y="70" width="470" height="122"
-        stroke-width="1" stroke="black" fill="none"
-        stroke-dasharray="5,5" rx="10" ry="10" />
-    <text style="text-anchor: middle; font-style: italic;"
-        x="400" y="150">Usually handled</text>
-    <text style="text-anchor: middle; font-style: italic;"
-        x="400" y="164">by upstream</text>
-
-    <rect x="130" y="197" width="330" height="63"
-        stroke-width="1" stroke="black" fill="none"
-        stroke-dasharray="5,5" rx="10" ry="10" />
-    <text style="text-anchor: middle; font-style: italic;"
-        x="410" y="225">Shipped with</text>
-    <text style="text-anchor: middle; font-style: italic;"
-        x="410" y="239">the package</text>
-
-    <rect x="10" y="150" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="50" y="170">Makefile.am</text>
-
-    <line x1="90"  y1="165" x2="130" y2="165" stroke-width="2" stroke="black" />
-    <line x1="130" y1="165" x2="122" y2="160" stroke-width="2" stroke="black" />
-    <line x1="130" y1="165" x2="122" y2="170" stroke-width="2" stroke="black" />
-
-    <polygon points="130,165 180,145 230,165 180,185" fill="#ffffff"
-        stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="180" y="169">automake</text>
-
-    <line x1="180" y1="185" x2="180" y2="215" stroke-width="2" stroke="black" />
-    <line x1="185" y1="207" x2="180" y2="215" stroke-width="2" stroke="black" />
-    <line x1="175" y1="207" x2="180" y2="215" stroke-width="2" stroke="black" />
-
-    <rect x="140" y="215" width="80" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="180" y="235">Makefile.in</text>
-
-    <line x1="220" y1="230" x2="260" y2="230" stroke-width="2" stroke="black" />
-    <line x1="260" y1="230" x2="252" y2="235" stroke-width="2" stroke="black" />
-    <line x1="260" y1="230" x2="252" y2="225" stroke-width="2" stroke="black" />
-
-    <polygon points="260,230 310,210 360,230 310,250" fill="#ccffcc"
-        stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="310" y="234">configure</text>
-
-    <line x1="310" y1="115"  x2="310" y2="210" stroke-width="2" stroke="black" />
-    <line x1="315" y1="202"  x2="310" y2="210" stroke-width="2" stroke="black" />
-    <line x1="305" y1="202"  x2="310" y2="210" stroke-width="2" stroke="black" />
-
-    <polygon points="260,95 310,75 360,95 310,115" fill="#ffffff"
-        stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="310" y="99">autoconf</text>
-
-
-    <line x1="220" y1="95" x2="260" y2="95" stroke-width="2" stroke="black" />
-    <line x1="260" y1="95" x2="252" y2="90" stroke-width="2" stroke="black" />
-    <line x1="260" y1="95" x2="252" y2="100" stroke-width="2" stroke="black" />
-
-
-    <rect x="140" y="80" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="180" y="93" >configure.in /</text>
-    <text style="text-anchor: middle;" x="180" y="105">configure.ac</text>
-
-    <line x1="90"  y1="165" x2="130" y2="165" stroke-width="2" stroke="black" />
-    <line x1="130" y1="165" x2="122" y2="160" stroke-width="2" stroke="black" />
-    <line x1="130" y1="165" x2="122" y2="170" stroke-width="2" stroke="black" />
-
-    <line x1="310" y1="250"  x2="310" y2="285" stroke-width="2" stroke="black" />
-    <line x1="315" y1="278"  x2="310" y2="285" stroke-width="2" stroke="black" />
-    <line x1="305" y1="278"  x2="310" y2="285" stroke-width="2" stroke="black" />
-
-    <rect x="270" y="285" width="80" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="310" y="305">Makefile</text>
-
-    <line x1="350"  y1="300" x2="390" y2="300" stroke-width="2" stroke="black" />
-    <line x1="390"  y1="300" x2="382" y2="295" stroke-width="2" stroke="black" />
-    <line x1="390"  y1="300" x2="382" y2="305" stroke-width="2" stroke="black" />
-
-    <polygon points="390,300 440,280 490,300 440,320" fill="#ffffff"
-        stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="440" y="304">make</text>
-
-    <line x1="440" y1="320"  x2="440" y2="355" stroke-width="2" stroke="black" />
-    <line x1="435" y1="348"  x2="440" y2="355" stroke-width="2" stroke="black" />
-    <line x1="445" y1="348"  x2="440" y2="355" stroke-width="2" stroke="black" />
-
-    <ellipse cx="440" cy="375" rx="50" ry="20" stroke-width="2" stroke="black"
-        fill="#ffcccc" />
-    <text style="text-anchor: middle;" x="440" y="378">program</text>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   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"
+   id="svg109"
+   version="1.1"
+   height="360"
+   width="510"
+   viewBox="0 50 510 360">
+  <metadata
+     id="metadata115">
+    <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>
+  <defs
+     id="defs113" />
+  <desc
+     id="desc2">Autotools Build Process</desc>
+  <rect
+     id="background"
+     fill="#eeeeee"
+     height="1000"
+     width="1000"
+     y="-10"
+     x="-10" />
+  <rect
+     id="rect5"
+     ry="10"
+     rx="10"
+     stroke-dasharray="5,5"
+     fill="none"
+     stroke="black"
+     stroke-width="1"
+     height="122"
+     width="470"
+     y="70"
+     x="0" />
+  <text
+     id="text7"
+     y="150"
+     x="400"
+     style="text-anchor:middle;font-style:italic;-inkscape-font-specification:'Open Sans Italic';font-family:'Open Sans';font-weight:normal;font-stretch:normal;font-variant:normal;">Usually handled</text>
+  <text
+     id="text9"
+     y="164"
+     x="400"
+     style="text-anchor:middle;font-style:italic;-inkscape-font-specification:'Open Sans Italic';font-family:'Open Sans';font-weight:normal;font-stretch:normal;font-variant:normal;">by upstream</text>
+  <rect
+     id="rect11"
+     ry="10"
+     rx="10"
+     stroke-dasharray="5,5"
+     fill="none"
+     stroke="black"
+     stroke-width="1"
+     height="63"
+     width="330"
+     y="197"
+     x="130" />
+  <text
+     id="text13"
+     y="225"
+     x="410"
+     style="text-anchor:middle;font-style:italic;-inkscape-font-specification:'Open Sans Italic';font-family:'Open Sans';font-weight:normal;font-stretch:normal;font-variant:normal;">Shipped with</text>
+  <text
+     id="text15"
+     y="239"
+     x="410"
+     style="text-anchor:middle;font-style:italic;-inkscape-font-specification:'Open Sans Italic';font-family:'Open Sans';font-weight:normal;font-stretch:normal;font-variant:normal;">the package</text>
+  <rect
+     id="rect17"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="150"
+     x="10" />
+  <text
+     id="text19"
+     y="170"
+     x="50"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Makefile.am</text>
+  <line
+     id="line21"
+     stroke="black"
+     stroke-width="2"
+     y2="165"
+     x2="130"
+     y1="165"
+     x1="90" />
+  <line
+     id="line23"
+     stroke="black"
+     stroke-width="2"
+     y2="160"
+     x2="122"
+     y1="165"
+     x1="130" />
+  <line
+     id="line25"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="122"
+     y1="165"
+     x1="130" />
+  <polygon
+     id="polygon27"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     points="130,165 180,145 230,165 180,185" />
+  <text
+     id="text29"
+     y="169"
+     x="180"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">automake</text>
+  <line
+     id="line31"
+     stroke="black"
+     stroke-width="2"
+     y2="215"
+     x2="180"
+     y1="185"
+     x1="180" />
+  <line
+     id="line33"
+     stroke="black"
+     stroke-width="2"
+     y2="215"
+     x2="180"
+     y1="207"
+     x1="185" />
+  <line
+     id="line35"
+     stroke="black"
+     stroke-width="2"
+     y2="215"
+     x2="180"
+     y1="207"
+     x1="175" />
+  <rect
+     id="rect37"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="80"
+     y="215"
+     x="140" />
+  <text
+     id="text39"
+     y="235"
+     x="180"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Makefile.in</text>
+  <line
+     id="line41"
+     stroke="black"
+     stroke-width="2"
+     y2="230"
+     x2="260"
+     y1="230"
+     x1="220" />
+  <line
+     id="line43"
+     stroke="black"
+     stroke-width="2"
+     y2="235"
+     x2="252"
+     y1="230"
+     x1="260" />
+  <line
+     id="line45"
+     stroke="black"
+     stroke-width="2"
+     y2="225"
+     x2="252"
+     y1="230"
+     x1="260" />
+  <polygon
+     id="polygon47"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     points="260,230 310,210 360,230 310,250" />
+  <text
+     id="text49"
+     y="234"
+     x="310"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">configure</text>
+  <line
+     id="line51"
+     stroke="black"
+     stroke-width="2"
+     y2="210"
+     x2="310"
+     y1="115"
+     x1="310" />
+  <line
+     id="line53"
+     stroke="black"
+     stroke-width="2"
+     y2="210"
+     x2="310"
+     y1="202"
+     x1="315" />
+  <line
+     id="line55"
+     stroke="black"
+     stroke-width="2"
+     y2="210"
+     x2="310"
+     y1="202"
+     x1="305" />
+  <polygon
+     id="polygon57"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     points="260,95 310,75 360,95 310,115" />
+  <text
+     id="text59"
+     y="99"
+     x="310"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">autoconf</text>
+  <line
+     id="line61"
+     stroke="black"
+     stroke-width="2"
+     y2="95"
+     x2="260"
+     y1="95"
+     x1="220" />
+  <line
+     id="line63"
+     stroke="black"
+     stroke-width="2"
+     y2="90"
+     x2="252"
+     y1="95"
+     x1="260" />
+  <line
+     id="line65"
+     stroke="black"
+     stroke-width="2"
+     y2="100"
+     x2="252"
+     y1="95"
+     x1="260" />
+  <rect
+     id="rect67"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="80"
+     x="140" />
+  <text
+     id="text69"
+     y="93"
+     x="180"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">configure.in /</text>
+  <text
+     id="text71"
+     y="105"
+     x="180"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">configure.ac</text>
+  <line
+     id="line73"
+     stroke="black"
+     stroke-width="2"
+     y2="165"
+     x2="130"
+     y1="165"
+     x1="90" />
+  <line
+     id="line75"
+     stroke="black"
+     stroke-width="2"
+     y2="160"
+     x2="122"
+     y1="165"
+     x1="130" />
+  <line
+     id="line77"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="122"
+     y1="165"
+     x1="130" />
+  <line
+     id="line79"
+     stroke="black"
+     stroke-width="2"
+     y2="285"
+     x2="310"
+     y1="250"
+     x1="310" />
+  <line
+     id="line81"
+     stroke="black"
+     stroke-width="2"
+     y2="285"
+     x2="310"
+     y1="278"
+     x1="315" />
+  <line
+     id="line83"
+     stroke="black"
+     stroke-width="2"
+     y2="285"
+     x2="310"
+     y1="278"
+     x1="305" />
+  <rect
+     id="rect85"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="80"
+     y="285"
+     x="270" />
+  <text
+     id="text87"
+     y="305"
+     x="310"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Makefile</text>
+  <line
+     id="line89"
+     stroke="black"
+     stroke-width="2"
+     y2="300"
+     x2="390"
+     y1="300"
+     x1="350" />
+  <line
+     id="line91"
+     stroke="black"
+     stroke-width="2"
+     y2="295"
+     x2="382"
+     y1="300"
+     x1="390" />
+  <line
+     id="line93"
+     stroke="black"
+     stroke-width="2"
+     y2="305"
+     x2="382"
+     y1="300"
+     x1="390" />
+  <polygon
+     id="polygon95"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     points="390,300 440,280 490,300 440,320" />
+  <text
+     id="text97"
+     y="304"
+     x="440"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">make</text>
+  <line
+     id="line99"
+     stroke="black"
+     stroke-width="2"
+     y2="355"
+     x2="440"
+     y1="320"
+     x1="440" />
+  <line
+     id="line101"
+     stroke="black"
+     stroke-width="2"
+     y2="355"
+     x2="440"
+     y1="348"
+     x1="435" />
+  <line
+     id="line103"
+     stroke="black"
+     stroke-width="2"
+     y2="355"
+     x2="440"
+     y1="348"
+     x1="445" />
+  <ellipse
+     id="ellipse105"
+     fill="#ffcccc"
+     stroke="black"
+     stroke-width="2"
+     ry="20"
+     rx="50"
+     cy="375"
+     cx="440" />
+  <text
+     id="text107"
+     y="378"
+     x="440"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">program</text>
 </svg>
-
-<!-- vim: set ft=xml sw=4 sts=4 et : -->
-

diff --git a/general-concepts/emerge-and-ebuild/diagram.svg b/general-concepts/emerge-and-ebuild/diagram.svg
index 2e28cb2..42f77ed 100644
--- a/general-concepts/emerge-and-ebuild/diagram.svg
+++ b/general-concepts/emerge-and-ebuild/diagram.svg
@@ -1,55 +1,241 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg viewBox="0 100 500 220" width="500" height="220" xmlns="http://www.w3.org/2000/svg" version="1.1">
-    <desc>Emerge and Ebuild</desc>
-    <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
-
-    <rect x="50" y="150" width="100" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="100" y="170"># emerge foo</text>
-
-    <line x1="150" y1="165" x2="200" y2="165" stroke-width="2" stroke="black" />
-    <line x1="200" y1="165" x2="193" y2="160" stroke-width="2" stroke="black" />
-    <line x1="200" y1="165" x2="193" y2="170" stroke-width="2" stroke="black" />
-
-    <rect x="200" y="150" width="100" height="30"
-        fill="#ffffff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="250" y="170">emerge</text>
-
-    <line x1="220" y1="180" x2="220" y2="250" stroke-width="2" stroke="black" />
-    <line x1="220" y1="250" x2="215" y2="243" stroke-width="2" stroke="black" />
-    <line x1="220" y1="250" x2="225" y2="243" stroke-width="2" stroke="black" />
-    <text style="text-anchor: end;" x="210" y="220">$PN, phases</text>
-
-    <line x1="280" y1="180" x2="280" y2="250" stroke-width="2" stroke="black" />
-    <line x1="280" y1="180" x2="275" y2="187" stroke-width="2" stroke="black" />
-    <line x1="280" y1="180" x2="285" y2="187" stroke-width="2" stroke="black" />
-    <text style="text-anchor: start;" x="290" y="220">Image in $D</text>
-
-    <rect x="200" y="250" width="100" height="30"
-        fill="#ffffff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="250" y="270">ebuild.sh</text>
-
-    <rect x="50" y="250" width="100" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="100" y="270">foo-1.23.ebuild</text>
-
-    <line x1="150" y1="265" x2="200" y2="265" stroke-width="2" stroke="black" />
-    <line x1="200" y1="265" x2="193" y2="260" stroke-width="2" stroke="black" />
-    <line x1="200" y1="265" x2="193" y2="270" stroke-width="2" stroke="black" />
-
-    <line x1="300" y1="165" x2="350" y2="165" stroke-width="2" stroke="black" />
-    <line x1="350" y1="165" x2="343" y2="160" stroke-width="2" stroke="black" />
-    <line x1="350" y1="165" x2="343" y2="170" stroke-width="2" stroke="black" />
-
-    <ellipse cx="400" cy="165" rx="50" ry="20" stroke-width="2" stroke="black"
-        fill="#ffcccc" />
-    <text style="text-anchor: middle;" x="400" y="164">Installed image</text>
-    <text style="text-anchor: middle;" x="400" y="177">in $ROOT</text>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   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"
+   id="svg61"
+   version="1.1"
+   height="220"
+   width="500"
+   viewBox="0 100 500 220">
+  <metadata
+     id="metadata67">
+    <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>
+  <defs
+     id="defs65" />
+  <desc
+     id="desc2">Emerge and Ebuild</desc>
+  <rect
+     id="background"
+     fill="#eeeeee"
+     height="1000"
+     width="1000"
+     y="-10"
+     x="-10" />
+  <rect
+     id="rect5"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="100"
+     y="150"
+     x="50" />
+  <text
+     id="text7"
+     y="170"
+     x="100"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"># emerge foo</text>
+  <line
+     id="line9"
+     stroke="black"
+     stroke-width="2"
+     y2="165"
+     x2="200"
+     y1="165"
+     x1="150" />
+  <line
+     id="line11"
+     stroke="black"
+     stroke-width="2"
+     y2="160"
+     x2="193"
+     y1="165"
+     x1="200" />
+  <line
+     id="line13"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="193"
+     y1="165"
+     x1="200" />
+  <rect
+     id="rect15"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     height="30"
+     width="100"
+     y="150"
+     x="200" />
+  <text
+     id="text17"
+     y="170"
+     x="250"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">emerge</text>
+  <line
+     id="line19"
+     stroke="black"
+     stroke-width="2"
+     y2="250"
+     x2="220"
+     y1="180"
+     x1="220" />
+  <line
+     id="line21"
+     stroke="black"
+     stroke-width="2"
+     y2="243"
+     x2="215"
+     y1="250"
+     x1="220" />
+  <line
+     id="line23"
+     stroke="black"
+     stroke-width="2"
+     y2="243"
+     x2="225"
+     y1="250"
+     x1="220" />
+  <text
+     id="text25"
+     y="220"
+     x="210"
+     style="text-anchor:end;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">$PN, phases</text>
+  <line
+     id="line27"
+     stroke="black"
+     stroke-width="2"
+     y2="250"
+     x2="280"
+     y1="180"
+     x1="280" />
+  <line
+     id="line29"
+     stroke="black"
+     stroke-width="2"
+     y2="187"
+     x2="275"
+     y1="180"
+     x1="280" />
+  <line
+     id="line31"
+     stroke="black"
+     stroke-width="2"
+     y2="187"
+     x2="285"
+     y1="180"
+     x1="280" />
+  <text
+     id="text33"
+     y="220"
+     x="290"
+     style="text-anchor:start;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Image in $D</text>
+  <rect
+     id="rect35"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     height="30"
+     width="100"
+     y="250"
+     x="200" />
+  <text
+     id="text37"
+     y="270"
+     x="250"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">ebuild.sh</text>
+  <rect
+     id="rect39"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="100"
+     y="250"
+     x="50" />
+  <text
+     id="text41"
+     y="270"
+     x="100"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">foo-1.23.ebuild</text>
+  <line
+     id="line43"
+     stroke="black"
+     stroke-width="2"
+     y2="265"
+     x2="200"
+     y1="265"
+     x1="150" />
+  <line
+     id="line45"
+     stroke="black"
+     stroke-width="2"
+     y2="260"
+     x2="193"
+     y1="265"
+     x1="200" />
+  <line
+     id="line47"
+     stroke="black"
+     stroke-width="2"
+     y2="270"
+     x2="193"
+     y1="265"
+     x1="200" />
+  <line
+     id="line49"
+     stroke="black"
+     stroke-width="2"
+     y2="165"
+     x2="350"
+     y1="165"
+     x1="300" />
+  <line
+     id="line51"
+     stroke="black"
+     stroke-width="2"
+     y2="160"
+     x2="343"
+     y1="165"
+     x1="350" />
+  <line
+     id="line53"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="343"
+     y1="165"
+     x1="350" />
+  <ellipse
+     id="ellipse55"
+     fill="#ffcccc"
+     stroke="black"
+     stroke-width="2"
+     ry="20"
+     rx="50"
+     cy="165"
+     cx="400" />
+  <text
+     id="text57"
+     y="164"
+     x="400"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Installed image</text>
+  <text
+     id="text59"
+     y="177"
+     x="400"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">in $ROOT</text>
 </svg>
-
-<!-- vim: set ft=xml sw=4 sts=4 et : -->
-
-

diff --git a/general-concepts/git-to-rsync/diagram.svg b/general-concepts/git-to-rsync/diagram.svg
index 2ee9608..e695dbb 100644
--- a/general-concepts/git-to-rsync/diagram.svg
+++ b/general-concepts/git-to-rsync/diagram.svg
@@ -1,142 +1,504 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="700" height="250" xmlns="http://www.w3.org/2000/svg" version="1.1">
-    <desc>Git to RSYNC Propagation</desc>
-
-    <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
-
-    <rect x="10" y="110" width="80" height="30"
-        fill="#ffcccc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="50" y="130">Developers</text>
-
-    <line x1="90"  y1="125" x2="130" y2="125" stroke-width="2" stroke="black" />
-    <line x1="130" y1="125" x2="122" y2="120" stroke-width="2" stroke="black" />
-    <line x1="130" y1="125" x2="122" y2="130" stroke-width="2" stroke="black" />
-
-
-    <rect x="10" y="60" width="80" height="30"
-        fill="#ffcccc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="50" y="80">Developers</text>
-
-    <path d="M 90 75 Q 110 75 110 100 Q 110 130 130 125"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="10" y="160" width="80" height="30"
-        fill="#ffcccc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="50" y="180">Developers</text>
-
-    <path d="M 90 175 Q 110 175 110 150 Q 110 120 130 125"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="130" y="110" width="80" height="30"
-        fill="#ffffff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="170" y="130">Git Remote</text>
-
-    <line x1="210" y1="125" x2="250" y2="125" stroke-width="2" stroke="black" />
-    <line x1="250" y1="125" x2="242" y2="120" stroke-width="2" stroke="black" />
-    <line x1="250" y1="125" x2="242" y2="130" stroke-width="2" stroke="black" />
-
-
-
-    <rect x="250" y="110" width="80" height="30"
-        fill="#ffffff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="290" y="123">Staging</text>
-    <text style="text-anchor: middle;" x="290" y="135">Box</text>
-
-    <line x1="330" y1="125" x2="370" y2="125" stroke-width="2" stroke="black" />
-    <line x1="370" y1="125" x2="362" y2="120" stroke-width="2" stroke="black" />
-    <line x1="370" y1="125" x2="362" y2="130" stroke-width="2" stroke="black" />
-
-
-
-    <rect x="370" y="110" width="80" height="30"
-        fill="#ffffff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="410" y="130">rsync1</text>
-
-
-
-    <line x1="490" y1="75"  x2="482" y2="70" stroke-width="2" stroke="black" />
-    <line x1="490" y1="75"  x2="482" y2="80" stroke-width="2" stroke="black" />
-    <path d="M 450 125 Q 470 125 470 100 Q 470 70 490 75"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="490" y="60" width="80" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="530" y="80">Public rsync</text>
-
-
-
-    <line x1="450" y1="125" x2="490" y2="125" stroke-width="2" stroke="black" />
-    <line x1="490" y1="125" x2="482" y2="120" stroke-width="2" stroke="black" />
-    <line x1="490" y1="125" x2="482" y2="130" stroke-width="2" stroke="black" />
-
-    <rect x="490" y="110" width="80" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="530" y="130">Public rsync</text>
-
-
-
-    <line x1="490" y1="175" x2="482" y2="170" stroke-width="2" stroke="black" />
-    <line x1="490" y1="175" x2="482" y2="180" stroke-width="2" stroke="black" />
-    <path d="M 450 125 Q 470 125 470 150 Q 470 180 490 175"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="490" y="160" width="80" height="30"
-        fill="#ccffcc" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="530" y="180">Public rsync</text>
-
-
-
-    <line x1="610" y1="25"  x2="602" y2="20" stroke-width="2" stroke="black" />
-    <line x1="610" y1="25"  x2="602" y2="30" stroke-width="2" stroke="black" />
-    <path d="M 570 75 Q 590 75 590 50 Q 590 20 610 25"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="610" y="10" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="650" y="30">Users</text>
-
-
-
-    <line x1="570" y1="75" x2="610" y2="75" stroke-width="2" stroke="black" />
-    <line x1="610" y1="75" x2="602" y2="70" stroke-width="2" stroke="black" />
-    <line x1="610" y1="75" x2="602" y2="80" stroke-width="2" stroke="black" />
-
-    <rect x="610" y="60" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="650" y="80">Users</text>
-
-
-
-    <line x1="570" y1="125" x2="610" y2="125" stroke-width="2" stroke="black" />
-    <line x1="610" y1="125" x2="602" y2="120" stroke-width="2" stroke="black" />
-    <line x1="610" y1="125" x2="602" y2="130" stroke-width="2" stroke="black" />
-
-    <rect x="610" y="110" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="650" y="130">Users</text>
-
-
-    <line x1="570" y1="175" x2="610" y2="175" stroke-width="2" stroke="black" />
-    <line x1="610" y1="175" x2="602" y2="170" stroke-width="2" stroke="black" />
-    <line x1="610" y1="175" x2="602" y2="180" stroke-width="2" stroke="black" />
-
-    <rect x="610" y="160" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="650" y="180">Users</text>
-
-
-
-    <line x1="610" y1="225" x2="602" y2="220" stroke-width="2" stroke="black" />
-    <line x1="610" y1="225" x2="602" y2="230" stroke-width="2" stroke="black" />
-    <path d="M 570 175 Q 590 175 590 200 Q 590 230 610 225"
-        stroke-width="2" stroke="black" fill="none" />
-
-    <rect x="610" y="210" width="80" height="30"
-        fill="#ccccff" stroke="black" stroke-width="2" />
-    <text style="text-anchor: middle;" x="650" y="230">Users</text>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   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"
+   id="svg133"
+   version="1.1"
+   height="250"
+   width="700">
+  <metadata
+     id="metadata139">
+    <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>
+  <defs
+     id="defs137" />
+  <desc
+     id="desc2">Git to RSYNC Propagation</desc>
+  <rect
+     id="background"
+     fill="#eeeeee"
+     height="1000"
+     width="1000"
+     y="-10"
+     x="-10" />
+  <rect
+     id="rect5"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffcccc"
+     height="30"
+     width="80"
+     y="110"
+     x="10" />
+  <text
+     id="text7"
+     y="130"
+     x="50"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Developers</text>
+  <line
+     id="line9"
+     stroke="black"
+     stroke-width="2"
+     y2="125"
+     x2="130"
+     y1="125"
+     x1="90" />
+  <line
+     id="line11"
+     stroke="black"
+     stroke-width="2"
+     y2="120"
+     x2="122"
+     y1="125"
+     x1="130" />
+  <line
+     id="line13"
+     stroke="black"
+     stroke-width="2"
+     y2="130"
+     x2="122"
+     y1="125"
+     x1="130" />
+  <rect
+     id="rect15"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffcccc"
+     height="30"
+     width="80"
+     y="60"
+     x="10" />
+  <text
+     id="text17"
+     y="80"
+     x="50"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Developers</text>
+  <path
+     id="path19"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 90 75 Q 110 75 110 100 Q 110 130 130 125" />
+  <rect
+     id="rect21"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffcccc"
+     height="30"
+     width="80"
+     y="160"
+     x="10" />
+  <text
+     id="text23"
+     y="180"
+     x="50"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Developers</text>
+  <path
+     id="path25"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 90 175 Q 110 175 110 150 Q 110 120 130 125" />
+  <rect
+     id="rect27"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     height="30"
+     width="80"
+     y="110"
+     x="130" />
+  <text
+     id="text29"
+     y="130"
+     x="170"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Git Remote</text>
+  <line
+     id="line31"
+     stroke="black"
+     stroke-width="2"
+     y2="125"
+     x2="250"
+     y1="125"
+     x1="210" />
+  <line
+     id="line33"
+     stroke="black"
+     stroke-width="2"
+     y2="120"
+     x2="242"
+     y1="125"
+     x1="250" />
+  <line
+     id="line35"
+     stroke="black"
+     stroke-width="2"
+     y2="130"
+     x2="242"
+     y1="125"
+     x1="250" />
+  <rect
+     id="rect37"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     height="30"
+     width="80"
+     y="110"
+     x="250" />
+  <text
+     id="text39"
+     y="123"
+     x="290"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Staging</text>
+  <text
+     id="text41"
+     y="135"
+     x="290"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Box</text>
+  <line
+     id="line43"
+     stroke="black"
+     stroke-width="2"
+     y2="125"
+     x2="370"
+     y1="125"
+     x1="330" />
+  <line
+     id="line45"
+     stroke="black"
+     stroke-width="2"
+     y2="120"
+     x2="362"
+     y1="125"
+     x1="370" />
+  <line
+     id="line47"
+     stroke="black"
+     stroke-width="2"
+     y2="130"
+     x2="362"
+     y1="125"
+     x1="370" />
+  <rect
+     id="rect49"
+     stroke-width="2"
+     stroke="black"
+     fill="#ffffff"
+     height="30"
+     width="80"
+     y="110"
+     x="370" />
+  <text
+     id="text51"
+     y="130"
+     x="410"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">rsync1</text>
+  <line
+     id="line53"
+     stroke="black"
+     stroke-width="2"
+     y2="70"
+     x2="482"
+     y1="75"
+     x1="490" />
+  <line
+     id="line55"
+     stroke="black"
+     stroke-width="2"
+     y2="80"
+     x2="482"
+     y1="75"
+     x1="490" />
+  <path
+     id="path57"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 450 125 Q 470 125 470 100 Q 470 70 490 75" />
+  <rect
+     id="rect59"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="80"
+     y="60"
+     x="490" />
+  <text
+     id="text61"
+     y="80"
+     x="530"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Public rsync</text>
+  <line
+     id="line63"
+     stroke="black"
+     stroke-width="2"
+     y2="125"
+     x2="490"
+     y1="125"
+     x1="450" />
+  <line
+     id="line65"
+     stroke="black"
+     stroke-width="2"
+     y2="120"
+     x2="482"
+     y1="125"
+     x1="490" />
+  <line
+     id="line67"
+     stroke="black"
+     stroke-width="2"
+     y2="130"
+     x2="482"
+     y1="125"
+     x1="490" />
+  <rect
+     id="rect69"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="80"
+     y="110"
+     x="490" />
+  <text
+     id="text71"
+     y="130"
+     x="530"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Public rsync</text>
+  <line
+     id="line73"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="482"
+     y1="175"
+     x1="490" />
+  <line
+     id="line75"
+     stroke="black"
+     stroke-width="2"
+     y2="180"
+     x2="482"
+     y1="175"
+     x1="490" />
+  <path
+     id="path77"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 450 125 Q 470 125 470 150 Q 470 180 490 175" />
+  <rect
+     id="rect79"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccffcc"
+     height="30"
+     width="80"
+     y="160"
+     x="490" />
+  <text
+     id="text81"
+     y="180"
+     x="530"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Public rsync</text>
+  <line
+     id="line83"
+     stroke="black"
+     stroke-width="2"
+     y2="20"
+     x2="602"
+     y1="25"
+     x1="610" />
+  <line
+     id="line85"
+     stroke="black"
+     stroke-width="2"
+     y2="30"
+     x2="602"
+     y1="25"
+     x1="610" />
+  <path
+     id="path87"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 570 75 Q 590 75 590 50 Q 590 20 610 25" />
+  <rect
+     id="rect89"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="10"
+     x="610" />
+  <text
+     id="text91"
+     y="30"
+     x="650"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Users</text>
+  <line
+     id="line93"
+     stroke="black"
+     stroke-width="2"
+     y2="75"
+     x2="610"
+     y1="75"
+     x1="570" />
+  <line
+     id="line95"
+     stroke="black"
+     stroke-width="2"
+     y2="70"
+     x2="602"
+     y1="75"
+     x1="610" />
+  <line
+     id="line97"
+     stroke="black"
+     stroke-width="2"
+     y2="80"
+     x2="602"
+     y1="75"
+     x1="610" />
+  <rect
+     id="rect99"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="60"
+     x="610" />
+  <text
+     id="text101"
+     y="80"
+     x="650"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Users</text>
+  <line
+     id="line103"
+     stroke="black"
+     stroke-width="2"
+     y2="125"
+     x2="610"
+     y1="125"
+     x1="570" />
+  <line
+     id="line105"
+     stroke="black"
+     stroke-width="2"
+     y2="120"
+     x2="602"
+     y1="125"
+     x1="610" />
+  <line
+     id="line107"
+     stroke="black"
+     stroke-width="2"
+     y2="130"
+     x2="602"
+     y1="125"
+     x1="610" />
+  <rect
+     id="rect109"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="110"
+     x="610" />
+  <text
+     id="text111"
+     y="130"
+     x="650"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Users</text>
+  <line
+     id="line113"
+     stroke="black"
+     stroke-width="2"
+     y2="175"
+     x2="610"
+     y1="175"
+     x1="570" />
+  <line
+     id="line115"
+     stroke="black"
+     stroke-width="2"
+     y2="170"
+     x2="602"
+     y1="175"
+     x1="610" />
+  <line
+     id="line117"
+     stroke="black"
+     stroke-width="2"
+     y2="180"
+     x2="602"
+     y1="175"
+     x1="610" />
+  <rect
+     id="rect119"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="160"
+     x="610" />
+  <text
+     id="text121"
+     y="180"
+     x="650"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Users</text>
+  <line
+     id="line123"
+     stroke="black"
+     stroke-width="2"
+     y2="220"
+     x2="602"
+     y1="225"
+     x1="610" />
+  <line
+     id="line125"
+     stroke="black"
+     stroke-width="2"
+     y2="230"
+     x2="602"
+     y1="225"
+     x1="610" />
+  <path
+     id="path127"
+     fill="none"
+     stroke="black"
+     stroke-width="2"
+     d="M 570 175 Q 590 175 590 200 Q 590 230 610 225" />
+  <rect
+     id="rect129"
+     stroke-width="2"
+     stroke="black"
+     fill="#ccccff"
+     height="30"
+     width="80"
+     y="210"
+     x="610" />
+  <text
+     id="text131"
+     y="230"
+     x="650"
+     style="text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;">Users</text>
 </svg>
-
-<!-- vim: set ft=xml sw=4 sts=4 et : -->

diff --git a/general-concepts/mirrors/diagram.svg b/general-concepts/mirrors/diagram.svg
index b807e5a..c98b830 100644
--- a/general-concepts/mirrors/diagram.svg
+++ b/general-concepts/mirrors/diagram.svg
@@ -1,521 +1,496 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docbase="/home/plasmaroo"
-   sodipodi:docname="diagram.svg"
-   inkscape:version="0.41"
-   sodipodi:version="0.32"
-   version="1.0"
-   x="0.0000000"
-   y="0.0000000"
-   width="700.00000px"
-   height="250.00000px"
+   id="svg1546"
    viewBox="0 0 700 250"
-   id="svg1546">
+   height="250.00000px"
+   width="700.00000px"
+   y="0.0000000"
+   x="0.0000000"
+   version="1.0">
   <metadata
      id="metadata71">
-    <rdf:RDF
-       id="RDF73">
+    <rdf:RDF>
       <cc:Work
-         id="Work75"
          rdf:about="">
-        <dc:format
-           id="format77">image/svg+xml</dc:format>
+        <dc:format>image/svg+xml</dc:format>
         <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
-           id="type79" />
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:current-layer="svg1546"
-     inkscape:window-y="264"
-     inkscape:window-x="164"
-     inkscape:cy="81.156529"
-     inkscape:cx="343.48587"
-     inkscape:zoom="0.97294509"
-     inkscape:window-height="541"
-     inkscape:window-width="968"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1.0000000"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#eeeeee"
-     id="base" />
   <defs
      id="defs1680" />
   <desc
      id="desc1548">Git to RSYNC Propagation</desc>
   <rect
-     y="0.24284256"
-     x="-2.0556145"
-     height="260.03522"
-     width="710.21484"
+     style="fill:#eeeeee;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
      id="rect1360"
-     style="fill:#eeeeee;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+     width="710.21484"
+     height="260.03522"
+     x="-2.0556145"
+     y="0.24284256" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="10.000000"
-     y="110.00000"
+     id="rect1551"
      style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1551" />
+     y="110.00000"
+     x="10.000000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="50"
+     id="text1553"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="130"
-     style="text-anchor:middle"
-     id="text1553">Developers</text>
+     x="50">Developers</text>
   <line
-     id="line1555"
-     stroke="black"
-     stroke-width="2"
-     y2="125.00000"
-     x2="130.00000"
-     y1="125.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="90.000000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1557"
-     stroke="black"
-     stroke-width="2"
-     y2="120.00000"
-     x2="122.00000"
      y1="125.00000"
-     x1="130.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1559"
-     stroke="black"
+     x2="130.00000"
+     y2="125.00000"
      stroke-width="2"
-     y2="130.00000"
-     x2="122.00000"
+     stroke="black"
+     id="line1555" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="130.00000"
      y1="125.00000"
+     x2="122.00000"
+     y2="120.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1557" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="130.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="125.00000"
+     x2="122.00000"
+     y2="130.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1559" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="10.000000"
-     y="60.000000"
+     id="rect1561"
      style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1561" />
+     y="60.000000"
+     x="10.000000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="50"
+     id="text1563"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="80"
-     style="text-anchor:middle"
-     id="text1563">Developers</text>
+     x="50">Developers</text>
   <path
-     d="M 90.000000,75.000000 C 103.33333,75.000000 110.00000,83.333333 110.00000,100.00000 C 110.00000,120.00000 116.66667,128.33333 130.00000,125.00000"
+     id="path1565"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1565" />
+     d="M 90.000000,75.000000 C 103.33333,75.000000 110.00000,83.333333 110.00000,100.00000 C 110.00000,120.00000 116.66667,128.33333 130.00000,125.00000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="10.000000"
-     y="160.00000"
+     id="rect1567"
      style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1567" />
+     y="160.00000"
+     x="10.000000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="50"
+     id="text1569"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="180"
-     style="text-anchor:middle"
-     id="text1569">Developers</text>
+     x="50">Developers</text>
   <path
-     d="M 90.000000,175.00000 C 103.33333,175.00000 110.00000,166.66667 110.00000,150.00000 C 110.00000,130.00000 116.66667,121.66667 130.00000,125.00000"
+     id="path1571"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1571" />
+     d="M 90.000000,175.00000 C 103.33333,175.00000 110.00000,166.66667 110.00000,150.00000 C 110.00000,130.00000 116.66667,121.66667 130.00000,125.00000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="130.00000"
-     y="110.00000"
+     id="rect1573"
      style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1573" />
+     y="110.00000"
+     x="130.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="170"
+     id="text1575"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="130"
-     style="text-anchor:middle"
-     id="text1575">dev.gentoo</text>
+     x="170">dev.gentoo</text>
   <line
-     id="line1577"
-     stroke="black"
-     stroke-width="2"
-     y2="125.00000"
-     x2="250.00000"
-     y1="125.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="210.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1579"
-     stroke="black"
-     stroke-width="2"
-     y2="120.00000"
-     x2="242.00000"
      y1="125.00000"
-     x1="250.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1581"
-     stroke="black"
+     x2="250.00000"
+     y2="125.00000"
      stroke-width="2"
-     y2="130.00000"
-     x2="242.00000"
+     stroke="black"
+     id="line1577" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="250.00000"
      y1="125.00000"
+     x2="242.00000"
+     y2="120.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1579" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="250.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="125.00000"
+     x2="242.00000"
+     y2="130.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1581" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="250.00000"
-     y="110.00000"
+     id="rect1583"
      style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1583" />
+     y="110.00000"
+     x="250.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="290"
+     id="text1585"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="123"
-     style="text-anchor:middle"
-     id="text1585">Staging</text>
+     x="290">Staging</text>
   <text
-     x="290"
+     id="text1587"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="135"
-     style="text-anchor:middle"
-     id="text1587">Box</text>
+     x="290">Box</text>
   <line
-     id="line1589"
-     stroke="black"
-     stroke-width="2"
-     y2="125.00000"
-     x2="370.00000"
-     y1="125.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="330.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1591"
-     stroke="black"
-     stroke-width="2"
-     y2="120.00000"
-     x2="362.00000"
      y1="125.00000"
-     x1="370.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1593"
-     stroke="black"
+     x2="370.00000"
+     y2="125.00000"
      stroke-width="2"
-     y2="130.00000"
-     x2="362.00000"
+     stroke="black"
+     id="line1589" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="370.00000"
      y1="125.00000"
+     x2="362.00000"
+     y2="120.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1591" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="370.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="125.00000"
+     x2="362.00000"
+     y2="130.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1593" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="370.00000"
-     y="110.00000"
+     id="rect1595"
      style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1595" />
+     y="110.00000"
+     x="370.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="410"
+     id="text1597"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="130"
-     style="text-anchor:middle"
-     id="text1597">OSU Mirrors</text>
+     x="410">OSU Mirrors</text>
   <line
-     id="line1599"
-     stroke="black"
-     stroke-width="2"
-     y2="70.000000"
-     x2="482.00000"
-     y1="75.000000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1601"
-     stroke="black"
-     stroke-width="2"
-     y2="80.000000"
-     x2="482.00000"
      y1="75.000000"
+     x2="482.00000"
+     y2="70.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1599" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="75.000000"
+     x2="482.00000"
+     y2="80.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1601" />
   <path
-     d="M 450.00000,125.00000 C 463.33333,125.00000 470.00000,116.66667 470.00000,100.00000 C 470.00000,80.000000 476.66667,71.666667 490.00000,75.000000"
+     id="path1603"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1603" />
+     d="M 450.00000,125.00000 C 463.33333,125.00000 470.00000,116.66667 470.00000,100.00000 C 470.00000,80.000000 476.66667,71.666667 490.00000,75.000000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="490.00000"
-     y="60.000000"
+     id="rect1605"
      style="fill:#ccffcc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1605" />
+     y="60.000000"
+     x="490.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="530"
+     id="text1607"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="80"
-     style="text-anchor:middle"
-     id="text1607">Public mirror</text>
+     x="530">Public mirror</text>
   <line
-     id="line1609"
-     stroke="black"
-     stroke-width="2"
-     y2="125.00000"
-     x2="490.00000"
-     y1="125.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="450.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1611"
-     stroke="black"
-     stroke-width="2"
-     y2="120.00000"
-     x2="482.00000"
      y1="125.00000"
-     x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1613"
-     stroke="black"
+     x2="490.00000"
+     y2="125.00000"
      stroke-width="2"
-     y2="130.00000"
-     x2="482.00000"
+     stroke="black"
+     id="line1609" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="490.00000"
      y1="125.00000"
+     x2="482.00000"
+     y2="120.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1611" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="125.00000"
+     x2="482.00000"
+     y2="130.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1613" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="490.00000"
-     y="110.00000"
+     id="rect1615"
      style="fill:#ccffcc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1615" />
+     y="110.00000"
+     x="490.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="530"
+     id="text1617"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="130"
-     style="text-anchor:middle"
-     id="text1617">Public mirror</text>
+     x="530">Public mirror</text>
   <line
-     id="line1619"
-     stroke="black"
-     stroke-width="2"
-     y2="170.00000"
-     x2="482.00000"
-     y1="175.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1621"
-     stroke="black"
-     stroke-width="2"
-     y2="180.00000"
-     x2="482.00000"
      y1="175.00000"
+     x2="482.00000"
+     y2="170.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1619" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="490.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="175.00000"
+     x2="482.00000"
+     y2="180.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1621" />
   <path
-     d="M 450.00000,125.00000 C 463.33333,125.00000 470.00000,133.33333 470.00000,150.00000 C 470.00000,170.00000 476.66667,178.33333 490.00000,175.00000"
+     id="path1623"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1623" />
+     d="M 450.00000,125.00000 C 463.33333,125.00000 470.00000,133.33333 470.00000,150.00000 C 470.00000,170.00000 476.66667,178.33333 490.00000,175.00000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="490.00000"
-     y="160.00000"
+     id="rect1625"
      style="fill:#ccffcc;stroke:#000000;stroke-width:2.0000000"
-     id="rect1625" />
+     y="160.00000"
+     x="490.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="530"
+     id="text1627"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="180"
-     style="text-anchor:middle"
-     id="text1627">Public mirror</text>
+     x="530">Public mirror</text>
   <line
-     id="line1629"
-     stroke="black"
-     stroke-width="2"
-     y2="20.000000"
-     x2="602.00000"
-     y1="25.000000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1631"
-     stroke="black"
-     stroke-width="2"
-     y2="30.000000"
-     x2="602.00000"
      y1="25.000000"
+     x2="602.00000"
+     y2="20.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1629" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="25.000000"
+     x2="602.00000"
+     y2="30.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1631" />
   <path
-     d="M 570.00000,75.000000 C 583.33333,75.000000 590.00000,66.666667 590.00000,50.000000 C 590.00000,30.000000 596.66667,21.666667 610.00000,25.000000"
+     id="path1633"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1633" />
+     d="M 570.00000,75.000000 C 583.33333,75.000000 590.00000,66.666667 590.00000,50.000000 C 590.00000,30.000000 596.66667,21.666667 610.00000,25.000000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="610.00000"
-     y="10.000000"
+     id="rect1635"
      style="fill:#ccccff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1635" />
+     y="10.000000"
+     x="610.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="650"
+     id="text1637"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="30"
-     style="text-anchor:middle"
-     id="text1637">Users</text>
+     x="650">Users</text>
   <line
-     id="line1639"
-     stroke="black"
-     stroke-width="2"
-     y2="75.000000"
-     x2="610.00000"
-     y1="75.000000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="570.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1641"
-     stroke="black"
-     stroke-width="2"
-     y2="70.000000"
-     x2="602.00000"
      y1="75.000000"
-     x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1643"
-     stroke="black"
+     x2="610.00000"
+     y2="75.000000"
      stroke-width="2"
-     y2="80.000000"
-     x2="602.00000"
+     stroke="black"
+     id="line1639" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="610.00000"
      y1="75.000000"
+     x2="602.00000"
+     y2="70.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1641" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="75.000000"
+     x2="602.00000"
+     y2="80.000000"
+     stroke-width="2"
+     stroke="black"
+     id="line1643" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="610.00000"
-     y="60.000000"
+     id="rect1645"
      style="fill:#ccccff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1645" />
+     y="60.000000"
+     x="610.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="650"
+     id="text1647"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="80"
-     style="text-anchor:middle"
-     id="text1647">Users</text>
+     x="650">Users</text>
   <line
-     id="line1649"
-     stroke="black"
-     stroke-width="2"
-     y2="125.00000"
-     x2="610.00000"
-     y1="125.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="570.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1651"
-     stroke="black"
-     stroke-width="2"
-     y2="120.00000"
-     x2="602.00000"
      y1="125.00000"
-     x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1653"
-     stroke="black"
+     x2="610.00000"
+     y2="125.00000"
      stroke-width="2"
-     y2="130.00000"
-     x2="602.00000"
+     stroke="black"
+     id="line1649" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="610.00000"
      y1="125.00000"
+     x2="602.00000"
+     y2="120.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1651" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="125.00000"
+     x2="602.00000"
+     y2="130.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1653" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="610.00000"
-     y="110.00000"
+     id="rect1655"
      style="fill:#ccccff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1655" />
+     y="110.00000"
+     x="610.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="650"
+     id="text1657"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="130"
-     style="text-anchor:middle"
-     id="text1657">Users</text>
+     x="650">Users</text>
   <line
-     id="line1659"
-     stroke="black"
-     stroke-width="2"
-     y2="175.00000"
-     x2="610.00000"
-     y1="175.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="570.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1661"
-     stroke="black"
-     stroke-width="2"
-     y2="170.00000"
-     x2="602.00000"
      y1="175.00000"
-     x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1663"
-     stroke="black"
+     x2="610.00000"
+     y2="175.00000"
      stroke-width="2"
-     y2="180.00000"
-     x2="602.00000"
+     stroke="black"
+     id="line1659" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
+     x1="610.00000"
      y1="175.00000"
+     x2="602.00000"
+     y2="170.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1661" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="175.00000"
+     x2="602.00000"
+     y2="180.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1663" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="610.00000"
-     y="160.00000"
+     id="rect1665"
      style="fill:#ccccff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1665" />
+     y="160.00000"
+     x="610.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="650"
+     id="text1667"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="180"
-     style="text-anchor:middle"
-     id="text1667">Users</text>
+     x="650">Users</text>
   <line
-     id="line1669"
-     stroke="black"
-     stroke-width="2"
-     y2="220.00000"
-     x2="602.00000"
-     y1="225.00000"
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
-  <line
-     id="line1671"
-     stroke="black"
-     stroke-width="2"
-     y2="230.00000"
-     x2="602.00000"
      y1="225.00000"
+     x2="602.00000"
+     y2="220.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1669" />
+  <line
+     style="stroke:#000000;stroke-width:2.0000000"
      x1="610.00000"
-     style="stroke:#000000;stroke-width:2.0000000" />
+     y1="225.00000"
+     x2="602.00000"
+     y2="230.00000"
+     stroke-width="2"
+     stroke="black"
+     id="line1671" />
   <path
-     d="M 570.00000,175.00000 C 583.33333,175.00000 590.00000,183.33333 590.00000,200.00000 C 590.00000,220.00000 596.66667,228.33333 610.00000,225.00000"
+     id="path1673"
      style="fill:none;stroke:#000000;stroke-width:2.0000000"
-     id="path1673" />
+     d="M 570.00000,175.00000 C 583.33333,175.00000 590.00000,183.33333 590.00000,200.00000 C 590.00000,220.00000 596.66667,228.33333 610.00000,225.00000" />
   <rect
-     width="80.000000"
-     height="30.000000"
-     x="610.00000"
-     y="210.00000"
+     id="rect1675"
      style="fill:#ccccff;stroke:#000000;stroke-width:2.0000000"
-     id="rect1675" />
+     y="210.00000"
+     x="610.00000"
+     height="30.000000"
+     width="80.000000" />
   <text
-     x="650"
+     id="text1677"
+     style="line-height:0%;text-anchor:middle;-inkscape-font-specification:'Open Sans';font-family:'Open Sans';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;"
      y="230"
-     style="text-anchor:middle"
-     id="text1677">Users</text>
+     x="650">Users</text>
 </svg>