Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: general-concepts/git-to-rsync/, general-concepts/mirrors/, ...
Date: Mon, 27 Jan 2020 19:58:25
Message-Id: 1580154985.a79753c392d0b2a66402a1f11ef02cf131efe080.ulm@gentoo
1 commit: a79753c392d0b2a66402a1f11ef02cf131efe080
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 17 15:37:04 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 19:56:25 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a79753c3
7
8 *.svg: specify Open Sans instead of generic "sans-serif" font.
9
10 The text in most of our diagrams was left to use the generic
11 "sans-serif" font face, which depends on both the local machine and
12 the program used to edit/convert the SVG image. This isn't the best
13 situation, because we want the output PNGs to be predictable.
14
15 The Tyrian layout used for devmanual.gentoo.org makes heavy use of the
16 "Open Sans" font, so this commit updates each SVG in the devmanual to
17 use that face for all text elements that were previously "sans-serif".
18
19 Bug: https://bugs.gentoo.org/700904
20 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
21 [Fonts in ebuild-writing/functions/diagram.svg fixed]
22 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
23
24 ebuild-writing/functions/diagram.svg | 477 ++++++++--------
25 general-concepts/autotools/diagram.svg | 515 ++++++++++++++----
26 general-concepts/emerge-and-ebuild/diagram.svg | 294 ++++++++--
27 general-concepts/git-to-rsync/diagram.svg | 644 +++++++++++++++++-----
28 general-concepts/mirrors/diagram.svg | 717 ++++++++++++-------------
29 5 files changed, 1727 insertions(+), 920 deletions(-)
30
31 diff --git a/ebuild-writing/functions/diagram.svg b/ebuild-writing/functions/diagram.svg
32 index 43bf26e..9547fc7 100644
33 --- a/ebuild-writing/functions/diagram.svg
34 +++ b/ebuild-writing/functions/diagram.svg
35 @@ -5,17 +5,11 @@
36 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
37 xmlns:svg="http://www.w3.org/2000/svg"
38 xmlns="http://www.w3.org/2000/svg"
39 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
40 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
41 - inkscape:export-ydpi="96"
42 - inkscape:export-xdpi="96"
43 - inkscape:version="1.0beta1 (fe3e306978, 2019-09-17)"
44 - sodipodi:docname="diagram.svg"
45 - id="svg2503"
46 - viewBox="-130 100 1100 80"
47 - height="80"
48 + version="1.0"
49 width="1100"
50 - version="1.0">
51 + height="80"
52 + viewBox="-130 100 1100 80"
53 + id="svg2503">
54 <metadata
55 id="metadata55">
56 <rdf:RDF>
57 @@ -28,389 +22,366 @@
58 </cc:Work>
59 </rdf:RDF>
60 </metadata>
61 - <sodipodi:namedview
62 - inkscape:current-layer="svg2503"
63 - inkscape:window-maximized="0"
64 - inkscape:window-y="29"
65 - inkscape:window-x="0"
66 - inkscape:cy="-42.598355"
67 - inkscape:cx="920.06029"
68 - inkscape:zoom="3.7798071"
69 - showgrid="false"
70 - id="namedview53"
71 - inkscape:window-height="1423"
72 - inkscape:window-width="1929"
73 - inkscape:pageshadow="2"
74 - inkscape:pageopacity="0"
75 - guidetolerance="10"
76 - gridtolerance="10"
77 - objecttolerance="10"
78 - borderopacity="1"
79 - inkscape:document-rotation="0"
80 - bordercolor="#666666"
81 - pagecolor="#ffffff" />
82 <defs
83 id="defs2577" />
84 <desc
85 id="desc2505">Ebuild Function Order</desc>
86 <rect
87 - style="fill:#eeeeee;stroke-width:0.293003"
88 - id="background"
89 - y="96.698219"
90 - x="-129.33987"
91 + width="1101.323"
92 height="85.745827"
93 - width="1101.323" />
94 + x="-129.33987"
95 + y="96.698219"
96 + id="background"
97 + style="fill:#eeeeee;stroke-width:0.293003" />
98 <rect
99 - style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
100 - id="rect2508"
101 - y="115.12637"
102 - x="-7.6246438"
103 + width="80"
104 height="30"
105 - width="80" />
106 + x="-7.6246438"
107 + y="115.12637"
108 + id="rect2508"
109 + style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
110 <text
111 - style="text-anchor:middle;opacity:1;stop-opacity:1"
112 - id="text2510"
113 + x="32.375347"
114 y="135.12637"
115 - x="32.375347">pkg_setup</text>
116 + id="text2510"
117 + 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>
118 <rect
119 - style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
120 - id="rect2518"
121 - y="115.12637"
122 - x="109.90766"
123 + width="80"
124 height="30"
125 - width="80" />
126 + x="109.90766"
127 + y="115.12637"
128 + id="rect2518"
129 + style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
130 <text
131 - style="text-anchor:middle;opacity:1;stop-opacity:1"
132 - id="text2520"
133 + x="149.90767"
134 y="135.12637"
135 - x="149.90767">src_unpack</text>
136 + id="text2520"
137 + 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>
138 <rect
139 - style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
140 - id="rect2528"
141 - y="115.12637"
142 - x="428.4689"
143 + width="80"
144 height="30"
145 - width="80" />
146 + x="428.4689"
147 + y="115.12637"
148 + id="rect2528"
149 + style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
150 <text
151 - style="text-anchor:middle;opacity:1;stop-opacity:1"
152 - id="text2530"
153 + x="468.4689"
154 y="135.12637"
155 - x="468.4689">src_compile</text>
156 + id="text2530"
157 + 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>
158 <path
159 - inkscape:connector-curvature="0"
160 - style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
161 + 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"
162 id="path2538"
163 - 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" />
164 + style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
165 <rect
166 - style="opacity:1;fill:#ccffcc;stroke:#000000;stroke-width:2;stop-opacity:1"
167 - id="rect2540"
168 - y="115.12637"
169 - x="538.37067"
170 + width="80"
171 height="30"
172 - width="80" />
173 + x="538.37067"
174 + y="115.12637"
175 + id="rect2540"
176 + style="opacity:1;fill:#ccffcc;stroke:#000000;stroke-width:2;stop-opacity:1" />
177 <text
178 - style="text-anchor:middle;opacity:1;stop-opacity:1"
179 - id="text2542"
180 + x="578.37061"
181 y="135.12637"
182 - x="578.37061">src_test</text>
183 + id="text2542"
184 + 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>
185 <g
186 id="g915">
187 <line
188 - x1="619.22565"
189 - y1="130.12637"
190 - x2="647.90759"
191 - y2="130.12637"
192 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
193 id="line2544"
194 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
195 - <line
196 - x1="647.90759"
197 + y2="130.12637"
198 + x2="647.90759"
199 y1="130.12637"
200 - x2="639.90759"
201 - y2="125.12637"
202 - id="line2546"
203 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
204 + x1="619.22565" />
205 <line
206 - x1="647.90759"
207 - y1="130.12637"
208 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
209 + id="line2546"
210 + y2="125.12637"
211 x2="639.90759"
212 - y2="135.12637"
213 + y1="130.12637"
214 + x1="647.90759" />
215 + <line
216 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
217 id="line2548"
218 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
219 + y2="135.12637"
220 + x2="639.90759"
221 + y1="130.12637"
222 + x1="647.90759" />
223 </g>
224 <rect
225 - style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
226 - id="rect2550"
227 - y="115.12637"
228 - x="649.09814"
229 + width="80"
230 height="30"
231 - width="80" />
232 + x="649.09814"
233 + y="115.12637"
234 + id="rect2550"
235 + style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
236 <text
237 - style="text-anchor:middle;opacity:1;stop-opacity:1"
238 - id="text2552"
239 + x="687.09814"
240 y="135.12637"
241 - x="687.09814">src_install</text>
242 + id="text2552"
243 + 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>
244 <g
245 id="g920">
246 <line
247 - x1="729.9978"
248 - y1="130.12637"
249 - x2="767.09814"
250 - y2="130.12637"
251 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
252 id="line2554"
253 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
254 - <line
255 - x1="767.09814"
256 + y2="130.12637"
257 + x2="767.09814"
258 y1="130.12637"
259 - x2="759.09814"
260 - y2="125.12637"
261 - id="line2556"
262 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
263 + x1="729.9978" />
264 <line
265 - x1="767.09814"
266 - y1="130.12637"
267 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
268 + id="line2556"
269 + y2="125.12637"
270 x2="759.09814"
271 - y2="135.12637"
272 + y1="130.12637"
273 + x1="767.09814" />
274 + <line
275 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
276 id="line2558"
277 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
278 + y2="135.12637"
279 + x2="759.09814"
280 + y1="130.12637"
281 + x1="767.09814" />
282 </g>
283 <rect
284 - style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
285 - id="rect2560"
286 - y="115.12637"
287 - x="767.90759"
288 + width="80"
289 height="30"
290 - width="80" />
291 + x="767.90759"
292 + y="115.12637"
293 + id="rect2560"
294 + style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
295 <text
296 - style="text-anchor:middle;opacity:1;stop-opacity:1"
297 - id="text2562"
298 + x="807.90759"
299 y="135.12637"
300 - x="807.90759">pkg_preinst</text>
301 + id="text2562"
302 + 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>
303 <g
304 id="g925">
305 <line
306 - x1="848.47461"
307 - y1="130.12637"
308 - x2="873.90759"
309 - y2="130.12637"
310 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
311 id="line2564"
312 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
313 - <line
314 - x1="873.90759"
315 + y2="130.12637"
316 + x2="873.90759"
317 y1="130.12637"
318 - x2="865.90759"
319 - y2="125.12637"
320 - id="line2566"
321 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
322 + x1="848.47461" />
323 <line
324 - x1="873.90759"
325 - y1="130.12637"
326 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
327 + id="line2566"
328 + y2="125.12637"
329 x2="865.90759"
330 - y2="135.12637"
331 + y1="130.12637"
332 + x1="873.90759" />
333 + <line
334 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
335 id="line2568"
336 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
337 + y2="135.12637"
338 + x2="865.90759"
339 + y1="130.12637"
340 + x1="873.90759" />
341 </g>
342 <rect
343 - style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
344 - id="rect2570"
345 - y="115.12637"
346 - x="873.90759"
347 + width="80"
348 height="30"
349 - width="80" />
350 + x="873.90759"
351 + y="115.12637"
352 + id="rect2570"
353 + style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
354 <text
355 - style="text-anchor:middle;opacity:1;stop-opacity:1"
356 - id="text2572"
357 + x="913.90759"
358 y="135.12637"
359 - x="913.90759">pkg_postinst</text>
360 + id="text2572"
361 + 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>
362 <path
363 - inkscape:connector-curvature="0"
364 - style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
365 + 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"
366 id="path2574"
367 - 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" />
368 + style="opacity:1;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
369 <rect
370 - style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
371 - id="rect2583"
372 - y="115.12637"
373 - x="322.2374"
374 + width="80"
375 height="30"
376 - width="80" />
377 + x="322.2374"
378 + y="115.12637"
379 + id="rect2583"
380 + style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
381 <text
382 - style="text-anchor:middle;opacity:1;stop-opacity:1"
383 + x="363.37662"
384 + y="135.12637"
385 id="text2585"
386 - y="135.1263"
387 - x="363.37662">src_configure</text>
388 + 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>
389 <rect
390 - style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1"
391 - id="rect2587"
392 - y="115.12637"
393 - x="215.93536"
394 + width="80"
395 height="30"
396 - width="80" />
397 + x="215.93536"
398 + y="115.12637"
399 + id="rect2587"
400 + style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:2;stop-opacity:1" />
401 <text
402 - style="text-anchor:middle;opacity:1;stop-opacity:1"
403 + x="258.45276"
404 + y="135.12637"
405 id="text2589"
406 - y="135.1263"
407 - x="258.45276">src_prepare</text>
408 + 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>
409 <rect
410 - width="80"
411 - height="30"
412 - x="-113.90761"
413 - y="115.0796"
414 + style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1"
415 id="rect880"
416 - style="opacity:1;fill:#ccccff;stroke:#000000;stroke-width:2;stop-opacity:1" />
417 + y="115.0796"
418 + x="-113.90761"
419 + height="30"
420 + width="80" />
421 <text
422 x="-73.904678"
423 - y="133.18214"
424 + y="135.12637"
425 id="text890"
426 - style="text-anchor:middle;opacity:1;stop-opacity:1">pkg_pretend</text>
427 + 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>
428 <g
429 id="g910">
430 <line
431 - x1="537.90765"
432 - y1="130.12637"
433 - x2="529.90765"
434 - y2="125.12637"
435 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
436 id="line2534"
437 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
438 - <line
439 - x1="537.90765"
440 - y1="130.12637"
441 + y2="125.12637"
442 x2="529.90765"
443 - y2="135.12637"
444 - id="line2536"
445 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
446 - <line
447 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
448 - id="line890"
449 - y2="130.12637"
450 - x2="537.90759"
451 y1="130.12637"
452 - x1="512.47461" />
453 + x1="537.90765" />
454 <line
455 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
456 - id="line894"
457 - y2="130.12637"
458 - x2="537.90759"
459 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
460 + id="line2536"
461 + y2="135.12637"
462 + x2="529.90765"
463 y1="130.12637"
464 - x1="509.22568" />
465 - </g>
466 - <g
467 - id="g904">
468 + x1="537.90765" />
469 <line
470 - x1="428.4689"
471 + x1="512.47461"
472 y1="130.12637"
473 - x2="420.4689"
474 - y2="125.12637"
475 - id="line2524"
476 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
477 + x2="537.90759"
478 + y2="130.12637"
479 + id="line890"
480 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
481 <line
482 - x1="428.4689"
483 + x1="509.22568"
484 y1="130.12637"
485 - x2="420.4689"
486 - y2="135.12637"
487 - id="line2526"
488 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
489 - <line
490 - style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
491 - id="line902"
492 + x2="537.90759"
493 y2="130.12637"
494 - x2="428.4689"
495 - y1="130.12637"
496 - x1="403.03592" />
497 + id="line894"
498 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
499 </g>
500 <g
501 - id="g899">
502 + id="g904">
503 <line
504 - x1="322.2374"
505 - y1="130.12637"
506 - x2="314.2374"
507 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
508 + id="line2524"
509 y2="125.12637"
510 - id="line2616"
511 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
512 - <line
513 - x1="322.2374"
514 + x2="420.4689"
515 y1="130.12637"
516 - x2="314.2374"
517 + x1="428.4689" />
518 + <line
519 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
520 + id="line2526"
521 y2="135.12637"
522 - id="line2618"
523 - style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
524 + x2="420.4689"
525 + y1="130.12637"
526 + x1="428.4689" />
527 <line
528 - x1="296.80441"
529 + x1="403.03592"
530 y1="130.12637"
531 - x2="322.2374"
532 + x2="428.4689"
533 y2="130.12637"
534 - id="line904"
535 + id="line902"
536 style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
537 </g>
538 <g
539 - id="g894">
540 + id="g899">
541 <line
542 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
543 - id="line2608"
544 + id="line2616"
545 y2="125.12637"
546 - x2="207.93535"
547 + x2="314.2374"
548 y1="130.12637"
549 - x1="215.93535" />
550 + x1="322.2374" />
551 <line
552 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
553 - id="line2610"
554 + id="line2618"
555 y2="135.12637"
556 - x2="207.93535"
557 + x2="314.2374"
558 y1="130.12637"
559 - x1="215.93535" />
560 + x1="322.2374" />
561 <line
562 style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
563 - id="line906"
564 + id="line904"
565 y2="130.12637"
566 - x2="215.93535"
567 + x2="322.2374"
568 y1="130.12637"
569 - x1="190.50237" />
570 + x1="296.80441" />
571 </g>
572 <g
573 - id="g884">
574 + id="g894">
575 <line
576 - x1="-7.6246533"
577 + x1="215.93535"
578 y1="130.12637"
579 - x2="-15.624653"
580 + x2="207.93535"
581 y2="125.12637"
582 - id="line884"
583 + id="line2608"
584 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
585 <line
586 - x1="-7.6246533"
587 + x1="215.93535"
588 y1="130.12637"
589 - x2="-15.624653"
590 + x2="207.93535"
591 y2="135.12637"
592 - id="line886"
593 + id="line2610"
594 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
595 <line
596 - x1="-33.057636"
597 + x1="190.50237"
598 y1="130.12637"
599 - x2="-7.6246533"
600 + x2="215.93535"
601 y2="130.12637"
602 - id="line916"
603 + id="line906"
604 style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
605 </g>
606 <g
607 - id="g889">
608 + id="g884">
609 <line
610 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
611 - x1="109.90767"
612 - y1="130.12637"
613 - x2="101.90767"
614 + id="line884"
615 y2="125.12637"
616 - id="line2514" />
617 + x2="-15.624653"
618 + y1="130.12637"
619 + x1="-7.6246533" />
620 <line
621 style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1"
622 - x1="109.90767"
623 - y1="130.12637"
624 - x2="101.90767"
625 + id="line886"
626 y2="135.12637"
627 - id="line2516" />
628 + x2="-15.624653"
629 + y1="130.12637"
630 + x1="-7.6246533" />
631 <line
632 style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1"
633 - id="line920"
634 + id="line916"
635 y2="130.12637"
636 - x2="109.90767"
637 + x2="-7.6246533"
638 + y1="130.12637"
639 + x1="-33.057636" />
640 + </g>
641 + <g
642 + id="g889">
643 + <line
644 + id="line2514"
645 + y2="125.12637"
646 + x2="101.90767"
647 + y1="130.12637"
648 + x1="109.90767"
649 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
650 + <line
651 + id="line2516"
652 + y2="135.12637"
653 + x2="101.90767"
654 + y1="130.12637"
655 + x1="109.90767"
656 + style="opacity:1;stroke:#000000;stroke-width:2;stop-opacity:1" />
657 + <line
658 + x1="72.807327"
659 y1="130.12637"
660 - x1="72.807327" />
661 + x2="109.90767"
662 + y2="130.12637"
663 + id="line920"
664 + style="opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stop-opacity:1" />
665 </g>
666 </svg>
667
668 diff --git a/general-concepts/autotools/diagram.svg b/general-concepts/autotools/diagram.svg
669 index 7e205e1..37e5a93 100644
670 --- a/general-concepts/autotools/diagram.svg
671 +++ b/general-concepts/autotools/diagram.svg
672 @@ -1,102 +1,415 @@
673 -<?xml version="1.0" standalone="no"?>
674 -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
675 - "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
676 -<svg viewBox="0 50 510 360" width="510" height="360" xmlns="http://www.w3.org/2000/svg" version="1.1">
677 - <desc>Autotools Build Process</desc>
678 - <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
679 -
680 - <rect x="0" y="70" width="470" height="122"
681 - stroke-width="1" stroke="black" fill="none"
682 - stroke-dasharray="5,5" rx="10" ry="10" />
683 - <text style="text-anchor: middle; font-style: italic;"
684 - x="400" y="150">Usually handled</text>
685 - <text style="text-anchor: middle; font-style: italic;"
686 - x="400" y="164">by upstream</text>
687 -
688 - <rect x="130" y="197" width="330" height="63"
689 - stroke-width="1" stroke="black" fill="none"
690 - stroke-dasharray="5,5" rx="10" ry="10" />
691 - <text style="text-anchor: middle; font-style: italic;"
692 - x="410" y="225">Shipped with</text>
693 - <text style="text-anchor: middle; font-style: italic;"
694 - x="410" y="239">the package</text>
695 -
696 - <rect x="10" y="150" width="80" height="30"
697 - fill="#ccccff" stroke="black" stroke-width="2" />
698 - <text style="text-anchor: middle;" x="50" y="170">Makefile.am</text>
699 -
700 - <line x1="90" y1="165" x2="130" y2="165" stroke-width="2" stroke="black" />
701 - <line x1="130" y1="165" x2="122" y2="160" stroke-width="2" stroke="black" />
702 - <line x1="130" y1="165" x2="122" y2="170" stroke-width="2" stroke="black" />
703 -
704 - <polygon points="130,165 180,145 230,165 180,185" fill="#ffffff"
705 - stroke="black" stroke-width="2" />
706 - <text style="text-anchor: middle;" x="180" y="169">automake</text>
707 -
708 - <line x1="180" y1="185" x2="180" y2="215" stroke-width="2" stroke="black" />
709 - <line x1="185" y1="207" x2="180" y2="215" stroke-width="2" stroke="black" />
710 - <line x1="175" y1="207" x2="180" y2="215" stroke-width="2" stroke="black" />
711 -
712 - <rect x="140" y="215" width="80" height="30"
713 - fill="#ccffcc" stroke="black" stroke-width="2" />
714 - <text style="text-anchor: middle;" x="180" y="235">Makefile.in</text>
715 -
716 - <line x1="220" y1="230" x2="260" y2="230" stroke-width="2" stroke="black" />
717 - <line x1="260" y1="230" x2="252" y2="235" stroke-width="2" stroke="black" />
718 - <line x1="260" y1="230" x2="252" y2="225" stroke-width="2" stroke="black" />
719 -
720 - <polygon points="260,230 310,210 360,230 310,250" fill="#ccffcc"
721 - stroke="black" stroke-width="2" />
722 - <text style="text-anchor: middle;" x="310" y="234">configure</text>
723 -
724 - <line x1="310" y1="115" x2="310" y2="210" stroke-width="2" stroke="black" />
725 - <line x1="315" y1="202" x2="310" y2="210" stroke-width="2" stroke="black" />
726 - <line x1="305" y1="202" x2="310" y2="210" stroke-width="2" stroke="black" />
727 -
728 - <polygon points="260,95 310,75 360,95 310,115" fill="#ffffff"
729 - stroke="black" stroke-width="2" />
730 - <text style="text-anchor: middle;" x="310" y="99">autoconf</text>
731 -
732 -
733 - <line x1="220" y1="95" x2="260" y2="95" stroke-width="2" stroke="black" />
734 - <line x1="260" y1="95" x2="252" y2="90" stroke-width="2" stroke="black" />
735 - <line x1="260" y1="95" x2="252" y2="100" stroke-width="2" stroke="black" />
736 -
737 -
738 - <rect x="140" y="80" width="80" height="30"
739 - fill="#ccccff" stroke="black" stroke-width="2" />
740 - <text style="text-anchor: middle;" x="180" y="93" >configure.in /</text>
741 - <text style="text-anchor: middle;" x="180" y="105">configure.ac</text>
742 -
743 - <line x1="90" y1="165" x2="130" y2="165" stroke-width="2" stroke="black" />
744 - <line x1="130" y1="165" x2="122" y2="160" stroke-width="2" stroke="black" />
745 - <line x1="130" y1="165" x2="122" y2="170" stroke-width="2" stroke="black" />
746 -
747 - <line x1="310" y1="250" x2="310" y2="285" stroke-width="2" stroke="black" />
748 - <line x1="315" y1="278" x2="310" y2="285" stroke-width="2" stroke="black" />
749 - <line x1="305" y1="278" x2="310" y2="285" stroke-width="2" stroke="black" />
750 -
751 - <rect x="270" y="285" width="80" height="30"
752 - fill="#ccffcc" stroke="black" stroke-width="2" />
753 - <text style="text-anchor: middle;" x="310" y="305">Makefile</text>
754 -
755 - <line x1="350" y1="300" x2="390" y2="300" stroke-width="2" stroke="black" />
756 - <line x1="390" y1="300" x2="382" y2="295" stroke-width="2" stroke="black" />
757 - <line x1="390" y1="300" x2="382" y2="305" stroke-width="2" stroke="black" />
758 -
759 - <polygon points="390,300 440,280 490,300 440,320" fill="#ffffff"
760 - stroke="black" stroke-width="2" />
761 - <text style="text-anchor: middle;" x="440" y="304">make</text>
762 -
763 - <line x1="440" y1="320" x2="440" y2="355" stroke-width="2" stroke="black" />
764 - <line x1="435" y1="348" x2="440" y2="355" stroke-width="2" stroke="black" />
765 - <line x1="445" y1="348" x2="440" y2="355" stroke-width="2" stroke="black" />
766 -
767 - <ellipse cx="440" cy="375" rx="50" ry="20" stroke-width="2" stroke="black"
768 - fill="#ffcccc" />
769 - <text style="text-anchor: middle;" x="440" y="378">program</text>
770 -
771 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
772 +<svg
773 + xmlns:dc="http://purl.org/dc/elements/1.1/"
774 + xmlns:cc="http://creativecommons.org/ns#"
775 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
776 + xmlns:svg="http://www.w3.org/2000/svg"
777 + xmlns="http://www.w3.org/2000/svg"
778 + id="svg109"
779 + version="1.1"
780 + height="360"
781 + width="510"
782 + viewBox="0 50 510 360">
783 + <metadata
784 + id="metadata115">
785 + <rdf:RDF>
786 + <cc:Work
787 + rdf:about="">
788 + <dc:format>image/svg+xml</dc:format>
789 + <dc:type
790 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
791 + <dc:title></dc:title>
792 + </cc:Work>
793 + </rdf:RDF>
794 + </metadata>
795 + <defs
796 + id="defs113" />
797 + <desc
798 + id="desc2">Autotools Build Process</desc>
799 + <rect
800 + id="background"
801 + fill="#eeeeee"
802 + height="1000"
803 + width="1000"
804 + y="-10"
805 + x="-10" />
806 + <rect
807 + id="rect5"
808 + ry="10"
809 + rx="10"
810 + stroke-dasharray="5,5"
811 + fill="none"
812 + stroke="black"
813 + stroke-width="1"
814 + height="122"
815 + width="470"
816 + y="70"
817 + x="0" />
818 + <text
819 + id="text7"
820 + y="150"
821 + x="400"
822 + 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>
823 + <text
824 + id="text9"
825 + y="164"
826 + x="400"
827 + 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>
828 + <rect
829 + id="rect11"
830 + ry="10"
831 + rx="10"
832 + stroke-dasharray="5,5"
833 + fill="none"
834 + stroke="black"
835 + stroke-width="1"
836 + height="63"
837 + width="330"
838 + y="197"
839 + x="130" />
840 + <text
841 + id="text13"
842 + y="225"
843 + x="410"
844 + 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>
845 + <text
846 + id="text15"
847 + y="239"
848 + x="410"
849 + 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>
850 + <rect
851 + id="rect17"
852 + stroke-width="2"
853 + stroke="black"
854 + fill="#ccccff"
855 + height="30"
856 + width="80"
857 + y="150"
858 + x="10" />
859 + <text
860 + id="text19"
861 + y="170"
862 + x="50"
863 + 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>
864 + <line
865 + id="line21"
866 + stroke="black"
867 + stroke-width="2"
868 + y2="165"
869 + x2="130"
870 + y1="165"
871 + x1="90" />
872 + <line
873 + id="line23"
874 + stroke="black"
875 + stroke-width="2"
876 + y2="160"
877 + x2="122"
878 + y1="165"
879 + x1="130" />
880 + <line
881 + id="line25"
882 + stroke="black"
883 + stroke-width="2"
884 + y2="170"
885 + x2="122"
886 + y1="165"
887 + x1="130" />
888 + <polygon
889 + id="polygon27"
890 + stroke-width="2"
891 + stroke="black"
892 + fill="#ffffff"
893 + points="130,165 180,145 230,165 180,185" />
894 + <text
895 + id="text29"
896 + y="169"
897 + x="180"
898 + 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>
899 + <line
900 + id="line31"
901 + stroke="black"
902 + stroke-width="2"
903 + y2="215"
904 + x2="180"
905 + y1="185"
906 + x1="180" />
907 + <line
908 + id="line33"
909 + stroke="black"
910 + stroke-width="2"
911 + y2="215"
912 + x2="180"
913 + y1="207"
914 + x1="185" />
915 + <line
916 + id="line35"
917 + stroke="black"
918 + stroke-width="2"
919 + y2="215"
920 + x2="180"
921 + y1="207"
922 + x1="175" />
923 + <rect
924 + id="rect37"
925 + stroke-width="2"
926 + stroke="black"
927 + fill="#ccffcc"
928 + height="30"
929 + width="80"
930 + y="215"
931 + x="140" />
932 + <text
933 + id="text39"
934 + y="235"
935 + x="180"
936 + 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>
937 + <line
938 + id="line41"
939 + stroke="black"
940 + stroke-width="2"
941 + y2="230"
942 + x2="260"
943 + y1="230"
944 + x1="220" />
945 + <line
946 + id="line43"
947 + stroke="black"
948 + stroke-width="2"
949 + y2="235"
950 + x2="252"
951 + y1="230"
952 + x1="260" />
953 + <line
954 + id="line45"
955 + stroke="black"
956 + stroke-width="2"
957 + y2="225"
958 + x2="252"
959 + y1="230"
960 + x1="260" />
961 + <polygon
962 + id="polygon47"
963 + stroke-width="2"
964 + stroke="black"
965 + fill="#ccffcc"
966 + points="260,230 310,210 360,230 310,250" />
967 + <text
968 + id="text49"
969 + y="234"
970 + x="310"
971 + 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>
972 + <line
973 + id="line51"
974 + stroke="black"
975 + stroke-width="2"
976 + y2="210"
977 + x2="310"
978 + y1="115"
979 + x1="310" />
980 + <line
981 + id="line53"
982 + stroke="black"
983 + stroke-width="2"
984 + y2="210"
985 + x2="310"
986 + y1="202"
987 + x1="315" />
988 + <line
989 + id="line55"
990 + stroke="black"
991 + stroke-width="2"
992 + y2="210"
993 + x2="310"
994 + y1="202"
995 + x1="305" />
996 + <polygon
997 + id="polygon57"
998 + stroke-width="2"
999 + stroke="black"
1000 + fill="#ffffff"
1001 + points="260,95 310,75 360,95 310,115" />
1002 + <text
1003 + id="text59"
1004 + y="99"
1005 + x="310"
1006 + 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>
1007 + <line
1008 + id="line61"
1009 + stroke="black"
1010 + stroke-width="2"
1011 + y2="95"
1012 + x2="260"
1013 + y1="95"
1014 + x1="220" />
1015 + <line
1016 + id="line63"
1017 + stroke="black"
1018 + stroke-width="2"
1019 + y2="90"
1020 + x2="252"
1021 + y1="95"
1022 + x1="260" />
1023 + <line
1024 + id="line65"
1025 + stroke="black"
1026 + stroke-width="2"
1027 + y2="100"
1028 + x2="252"
1029 + y1="95"
1030 + x1="260" />
1031 + <rect
1032 + id="rect67"
1033 + stroke-width="2"
1034 + stroke="black"
1035 + fill="#ccccff"
1036 + height="30"
1037 + width="80"
1038 + y="80"
1039 + x="140" />
1040 + <text
1041 + id="text69"
1042 + y="93"
1043 + x="180"
1044 + 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>
1045 + <text
1046 + id="text71"
1047 + y="105"
1048 + x="180"
1049 + 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>
1050 + <line
1051 + id="line73"
1052 + stroke="black"
1053 + stroke-width="2"
1054 + y2="165"
1055 + x2="130"
1056 + y1="165"
1057 + x1="90" />
1058 + <line
1059 + id="line75"
1060 + stroke="black"
1061 + stroke-width="2"
1062 + y2="160"
1063 + x2="122"
1064 + y1="165"
1065 + x1="130" />
1066 + <line
1067 + id="line77"
1068 + stroke="black"
1069 + stroke-width="2"
1070 + y2="170"
1071 + x2="122"
1072 + y1="165"
1073 + x1="130" />
1074 + <line
1075 + id="line79"
1076 + stroke="black"
1077 + stroke-width="2"
1078 + y2="285"
1079 + x2="310"
1080 + y1="250"
1081 + x1="310" />
1082 + <line
1083 + id="line81"
1084 + stroke="black"
1085 + stroke-width="2"
1086 + y2="285"
1087 + x2="310"
1088 + y1="278"
1089 + x1="315" />
1090 + <line
1091 + id="line83"
1092 + stroke="black"
1093 + stroke-width="2"
1094 + y2="285"
1095 + x2="310"
1096 + y1="278"
1097 + x1="305" />
1098 + <rect
1099 + id="rect85"
1100 + stroke-width="2"
1101 + stroke="black"
1102 + fill="#ccffcc"
1103 + height="30"
1104 + width="80"
1105 + y="285"
1106 + x="270" />
1107 + <text
1108 + id="text87"
1109 + y="305"
1110 + x="310"
1111 + 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>
1112 + <line
1113 + id="line89"
1114 + stroke="black"
1115 + stroke-width="2"
1116 + y2="300"
1117 + x2="390"
1118 + y1="300"
1119 + x1="350" />
1120 + <line
1121 + id="line91"
1122 + stroke="black"
1123 + stroke-width="2"
1124 + y2="295"
1125 + x2="382"
1126 + y1="300"
1127 + x1="390" />
1128 + <line
1129 + id="line93"
1130 + stroke="black"
1131 + stroke-width="2"
1132 + y2="305"
1133 + x2="382"
1134 + y1="300"
1135 + x1="390" />
1136 + <polygon
1137 + id="polygon95"
1138 + stroke-width="2"
1139 + stroke="black"
1140 + fill="#ffffff"
1141 + points="390,300 440,280 490,300 440,320" />
1142 + <text
1143 + id="text97"
1144 + y="304"
1145 + x="440"
1146 + 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>
1147 + <line
1148 + id="line99"
1149 + stroke="black"
1150 + stroke-width="2"
1151 + y2="355"
1152 + x2="440"
1153 + y1="320"
1154 + x1="440" />
1155 + <line
1156 + id="line101"
1157 + stroke="black"
1158 + stroke-width="2"
1159 + y2="355"
1160 + x2="440"
1161 + y1="348"
1162 + x1="435" />
1163 + <line
1164 + id="line103"
1165 + stroke="black"
1166 + stroke-width="2"
1167 + y2="355"
1168 + x2="440"
1169 + y1="348"
1170 + x1="445" />
1171 + <ellipse
1172 + id="ellipse105"
1173 + fill="#ffcccc"
1174 + stroke="black"
1175 + stroke-width="2"
1176 + ry="20"
1177 + rx="50"
1178 + cy="375"
1179 + cx="440" />
1180 + <text
1181 + id="text107"
1182 + y="378"
1183 + x="440"
1184 + 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>
1185 </svg>
1186 -
1187 -<!-- vim: set ft=xml sw=4 sts=4 et : -->
1188 -
1189
1190 diff --git a/general-concepts/emerge-and-ebuild/diagram.svg b/general-concepts/emerge-and-ebuild/diagram.svg
1191 index 2e28cb2..42f77ed 100644
1192 --- a/general-concepts/emerge-and-ebuild/diagram.svg
1193 +++ b/general-concepts/emerge-and-ebuild/diagram.svg
1194 @@ -1,55 +1,241 @@
1195 -<?xml version="1.0" standalone="no"?>
1196 -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
1197 - "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
1198 -<svg viewBox="0 100 500 220" width="500" height="220" xmlns="http://www.w3.org/2000/svg" version="1.1">
1199 - <desc>Emerge and Ebuild</desc>
1200 - <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
1201 -
1202 - <rect x="50" y="150" width="100" height="30"
1203 - fill="#ccffcc" stroke="black" stroke-width="2" />
1204 - <text style="text-anchor: middle;" x="100" y="170"># emerge foo</text>
1205 -
1206 - <line x1="150" y1="165" x2="200" y2="165" stroke-width="2" stroke="black" />
1207 - <line x1="200" y1="165" x2="193" y2="160" stroke-width="2" stroke="black" />
1208 - <line x1="200" y1="165" x2="193" y2="170" stroke-width="2" stroke="black" />
1209 -
1210 - <rect x="200" y="150" width="100" height="30"
1211 - fill="#ffffff" stroke="black" stroke-width="2" />
1212 - <text style="text-anchor: middle;" x="250" y="170">emerge</text>
1213 -
1214 - <line x1="220" y1="180" x2="220" y2="250" stroke-width="2" stroke="black" />
1215 - <line x1="220" y1="250" x2="215" y2="243" stroke-width="2" stroke="black" />
1216 - <line x1="220" y1="250" x2="225" y2="243" stroke-width="2" stroke="black" />
1217 - <text style="text-anchor: end;" x="210" y="220">$PN, phases</text>
1218 -
1219 - <line x1="280" y1="180" x2="280" y2="250" stroke-width="2" stroke="black" />
1220 - <line x1="280" y1="180" x2="275" y2="187" stroke-width="2" stroke="black" />
1221 - <line x1="280" y1="180" x2="285" y2="187" stroke-width="2" stroke="black" />
1222 - <text style="text-anchor: start;" x="290" y="220">Image in $D</text>
1223 -
1224 - <rect x="200" y="250" width="100" height="30"
1225 - fill="#ffffff" stroke="black" stroke-width="2" />
1226 - <text style="text-anchor: middle;" x="250" y="270">ebuild.sh</text>
1227 -
1228 - <rect x="50" y="250" width="100" height="30"
1229 - fill="#ccccff" stroke="black" stroke-width="2" />
1230 - <text style="text-anchor: middle;" x="100" y="270">foo-1.23.ebuild</text>
1231 -
1232 - <line x1="150" y1="265" x2="200" y2="265" stroke-width="2" stroke="black" />
1233 - <line x1="200" y1="265" x2="193" y2="260" stroke-width="2" stroke="black" />
1234 - <line x1="200" y1="265" x2="193" y2="270" stroke-width="2" stroke="black" />
1235 -
1236 - <line x1="300" y1="165" x2="350" y2="165" stroke-width="2" stroke="black" />
1237 - <line x1="350" y1="165" x2="343" y2="160" stroke-width="2" stroke="black" />
1238 - <line x1="350" y1="165" x2="343" y2="170" stroke-width="2" stroke="black" />
1239 -
1240 - <ellipse cx="400" cy="165" rx="50" ry="20" stroke-width="2" stroke="black"
1241 - fill="#ffcccc" />
1242 - <text style="text-anchor: middle;" x="400" y="164">Installed image</text>
1243 - <text style="text-anchor: middle;" x="400" y="177">in $ROOT</text>
1244 -
1245 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1246 +<svg
1247 + xmlns:dc="http://purl.org/dc/elements/1.1/"
1248 + xmlns:cc="http://creativecommons.org/ns#"
1249 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1250 + xmlns:svg="http://www.w3.org/2000/svg"
1251 + xmlns="http://www.w3.org/2000/svg"
1252 + id="svg61"
1253 + version="1.1"
1254 + height="220"
1255 + width="500"
1256 + viewBox="0 100 500 220">
1257 + <metadata
1258 + id="metadata67">
1259 + <rdf:RDF>
1260 + <cc:Work
1261 + rdf:about="">
1262 + <dc:format>image/svg+xml</dc:format>
1263 + <dc:type
1264 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1265 + <dc:title></dc:title>
1266 + </cc:Work>
1267 + </rdf:RDF>
1268 + </metadata>
1269 + <defs
1270 + id="defs65" />
1271 + <desc
1272 + id="desc2">Emerge and Ebuild</desc>
1273 + <rect
1274 + id="background"
1275 + fill="#eeeeee"
1276 + height="1000"
1277 + width="1000"
1278 + y="-10"
1279 + x="-10" />
1280 + <rect
1281 + id="rect5"
1282 + stroke-width="2"
1283 + stroke="black"
1284 + fill="#ccffcc"
1285 + height="30"
1286 + width="100"
1287 + y="150"
1288 + x="50" />
1289 + <text
1290 + id="text7"
1291 + y="170"
1292 + x="100"
1293 + 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>
1294 + <line
1295 + id="line9"
1296 + stroke="black"
1297 + stroke-width="2"
1298 + y2="165"
1299 + x2="200"
1300 + y1="165"
1301 + x1="150" />
1302 + <line
1303 + id="line11"
1304 + stroke="black"
1305 + stroke-width="2"
1306 + y2="160"
1307 + x2="193"
1308 + y1="165"
1309 + x1="200" />
1310 + <line
1311 + id="line13"
1312 + stroke="black"
1313 + stroke-width="2"
1314 + y2="170"
1315 + x2="193"
1316 + y1="165"
1317 + x1="200" />
1318 + <rect
1319 + id="rect15"
1320 + stroke-width="2"
1321 + stroke="black"
1322 + fill="#ffffff"
1323 + height="30"
1324 + width="100"
1325 + y="150"
1326 + x="200" />
1327 + <text
1328 + id="text17"
1329 + y="170"
1330 + x="250"
1331 + 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>
1332 + <line
1333 + id="line19"
1334 + stroke="black"
1335 + stroke-width="2"
1336 + y2="250"
1337 + x2="220"
1338 + y1="180"
1339 + x1="220" />
1340 + <line
1341 + id="line21"
1342 + stroke="black"
1343 + stroke-width="2"
1344 + y2="243"
1345 + x2="215"
1346 + y1="250"
1347 + x1="220" />
1348 + <line
1349 + id="line23"
1350 + stroke="black"
1351 + stroke-width="2"
1352 + y2="243"
1353 + x2="225"
1354 + y1="250"
1355 + x1="220" />
1356 + <text
1357 + id="text25"
1358 + y="220"
1359 + x="210"
1360 + 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>
1361 + <line
1362 + id="line27"
1363 + stroke="black"
1364 + stroke-width="2"
1365 + y2="250"
1366 + x2="280"
1367 + y1="180"
1368 + x1="280" />
1369 + <line
1370 + id="line29"
1371 + stroke="black"
1372 + stroke-width="2"
1373 + y2="187"
1374 + x2="275"
1375 + y1="180"
1376 + x1="280" />
1377 + <line
1378 + id="line31"
1379 + stroke="black"
1380 + stroke-width="2"
1381 + y2="187"
1382 + x2="285"
1383 + y1="180"
1384 + x1="280" />
1385 + <text
1386 + id="text33"
1387 + y="220"
1388 + x="290"
1389 + 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>
1390 + <rect
1391 + id="rect35"
1392 + stroke-width="2"
1393 + stroke="black"
1394 + fill="#ffffff"
1395 + height="30"
1396 + width="100"
1397 + y="250"
1398 + x="200" />
1399 + <text
1400 + id="text37"
1401 + y="270"
1402 + x="250"
1403 + 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>
1404 + <rect
1405 + id="rect39"
1406 + stroke-width="2"
1407 + stroke="black"
1408 + fill="#ccccff"
1409 + height="30"
1410 + width="100"
1411 + y="250"
1412 + x="50" />
1413 + <text
1414 + id="text41"
1415 + y="270"
1416 + x="100"
1417 + 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>
1418 + <line
1419 + id="line43"
1420 + stroke="black"
1421 + stroke-width="2"
1422 + y2="265"
1423 + x2="200"
1424 + y1="265"
1425 + x1="150" />
1426 + <line
1427 + id="line45"
1428 + stroke="black"
1429 + stroke-width="2"
1430 + y2="260"
1431 + x2="193"
1432 + y1="265"
1433 + x1="200" />
1434 + <line
1435 + id="line47"
1436 + stroke="black"
1437 + stroke-width="2"
1438 + y2="270"
1439 + x2="193"
1440 + y1="265"
1441 + x1="200" />
1442 + <line
1443 + id="line49"
1444 + stroke="black"
1445 + stroke-width="2"
1446 + y2="165"
1447 + x2="350"
1448 + y1="165"
1449 + x1="300" />
1450 + <line
1451 + id="line51"
1452 + stroke="black"
1453 + stroke-width="2"
1454 + y2="160"
1455 + x2="343"
1456 + y1="165"
1457 + x1="350" />
1458 + <line
1459 + id="line53"
1460 + stroke="black"
1461 + stroke-width="2"
1462 + y2="170"
1463 + x2="343"
1464 + y1="165"
1465 + x1="350" />
1466 + <ellipse
1467 + id="ellipse55"
1468 + fill="#ffcccc"
1469 + stroke="black"
1470 + stroke-width="2"
1471 + ry="20"
1472 + rx="50"
1473 + cy="165"
1474 + cx="400" />
1475 + <text
1476 + id="text57"
1477 + y="164"
1478 + x="400"
1479 + 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>
1480 + <text
1481 + id="text59"
1482 + y="177"
1483 + x="400"
1484 + 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>
1485 </svg>
1486 -
1487 -<!-- vim: set ft=xml sw=4 sts=4 et : -->
1488 -
1489 -
1490
1491 diff --git a/general-concepts/git-to-rsync/diagram.svg b/general-concepts/git-to-rsync/diagram.svg
1492 index 2ee9608..e695dbb 100644
1493 --- a/general-concepts/git-to-rsync/diagram.svg
1494 +++ b/general-concepts/git-to-rsync/diagram.svg
1495 @@ -1,142 +1,504 @@
1496 -<?xml version="1.0" standalone="no"?>
1497 -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
1498 - "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
1499 -<svg width="700" height="250" xmlns="http://www.w3.org/2000/svg" version="1.1">
1500 - <desc>Git to RSYNC Propagation</desc>
1501 -
1502 - <rect x="-10" y="-10" width="1000" height="1000" fill="#eeeeee" id="background" />
1503 -
1504 - <rect x="10" y="110" width="80" height="30"
1505 - fill="#ffcccc" stroke="black" stroke-width="2" />
1506 - <text style="text-anchor: middle;" x="50" y="130">Developers</text>
1507 -
1508 - <line x1="90" y1="125" x2="130" y2="125" stroke-width="2" stroke="black" />
1509 - <line x1="130" y1="125" x2="122" y2="120" stroke-width="2" stroke="black" />
1510 - <line x1="130" y1="125" x2="122" y2="130" stroke-width="2" stroke="black" />
1511 -
1512 -
1513 - <rect x="10" y="60" width="80" height="30"
1514 - fill="#ffcccc" stroke="black" stroke-width="2" />
1515 - <text style="text-anchor: middle;" x="50" y="80">Developers</text>
1516 -
1517 - <path d="M 90 75 Q 110 75 110 100 Q 110 130 130 125"
1518 - stroke-width="2" stroke="black" fill="none" />
1519 -
1520 - <rect x="10" y="160" width="80" height="30"
1521 - fill="#ffcccc" stroke="black" stroke-width="2" />
1522 - <text style="text-anchor: middle;" x="50" y="180">Developers</text>
1523 -
1524 - <path d="M 90 175 Q 110 175 110 150 Q 110 120 130 125"
1525 - stroke-width="2" stroke="black" fill="none" />
1526 -
1527 - <rect x="130" y="110" width="80" height="30"
1528 - fill="#ffffff" stroke="black" stroke-width="2" />
1529 - <text style="text-anchor: middle;" x="170" y="130">Git Remote</text>
1530 -
1531 - <line x1="210" y1="125" x2="250" y2="125" stroke-width="2" stroke="black" />
1532 - <line x1="250" y1="125" x2="242" y2="120" stroke-width="2" stroke="black" />
1533 - <line x1="250" y1="125" x2="242" y2="130" stroke-width="2" stroke="black" />
1534 -
1535 -
1536 -
1537 - <rect x="250" y="110" width="80" height="30"
1538 - fill="#ffffff" stroke="black" stroke-width="2" />
1539 - <text style="text-anchor: middle;" x="290" y="123">Staging</text>
1540 - <text style="text-anchor: middle;" x="290" y="135">Box</text>
1541 -
1542 - <line x1="330" y1="125" x2="370" y2="125" stroke-width="2" stroke="black" />
1543 - <line x1="370" y1="125" x2="362" y2="120" stroke-width="2" stroke="black" />
1544 - <line x1="370" y1="125" x2="362" y2="130" stroke-width="2" stroke="black" />
1545 -
1546 -
1547 -
1548 - <rect x="370" y="110" width="80" height="30"
1549 - fill="#ffffff" stroke="black" stroke-width="2" />
1550 - <text style="text-anchor: middle;" x="410" y="130">rsync1</text>
1551 -
1552 -
1553 -
1554 - <line x1="490" y1="75" x2="482" y2="70" stroke-width="2" stroke="black" />
1555 - <line x1="490" y1="75" x2="482" y2="80" stroke-width="2" stroke="black" />
1556 - <path d="M 450 125 Q 470 125 470 100 Q 470 70 490 75"
1557 - stroke-width="2" stroke="black" fill="none" />
1558 -
1559 - <rect x="490" y="60" width="80" height="30"
1560 - fill="#ccffcc" stroke="black" stroke-width="2" />
1561 - <text style="text-anchor: middle;" x="530" y="80">Public rsync</text>
1562 -
1563 -
1564 -
1565 - <line x1="450" y1="125" x2="490" y2="125" stroke-width="2" stroke="black" />
1566 - <line x1="490" y1="125" x2="482" y2="120" stroke-width="2" stroke="black" />
1567 - <line x1="490" y1="125" x2="482" y2="130" stroke-width="2" stroke="black" />
1568 -
1569 - <rect x="490" y="110" width="80" height="30"
1570 - fill="#ccffcc" stroke="black" stroke-width="2" />
1571 - <text style="text-anchor: middle;" x="530" y="130">Public rsync</text>
1572 -
1573 -
1574 -
1575 - <line x1="490" y1="175" x2="482" y2="170" stroke-width="2" stroke="black" />
1576 - <line x1="490" y1="175" x2="482" y2="180" stroke-width="2" stroke="black" />
1577 - <path d="M 450 125 Q 470 125 470 150 Q 470 180 490 175"
1578 - stroke-width="2" stroke="black" fill="none" />
1579 -
1580 - <rect x="490" y="160" width="80" height="30"
1581 - fill="#ccffcc" stroke="black" stroke-width="2" />
1582 - <text style="text-anchor: middle;" x="530" y="180">Public rsync</text>
1583 -
1584 -
1585 -
1586 - <line x1="610" y1="25" x2="602" y2="20" stroke-width="2" stroke="black" />
1587 - <line x1="610" y1="25" x2="602" y2="30" stroke-width="2" stroke="black" />
1588 - <path d="M 570 75 Q 590 75 590 50 Q 590 20 610 25"
1589 - stroke-width="2" stroke="black" fill="none" />
1590 -
1591 - <rect x="610" y="10" width="80" height="30"
1592 - fill="#ccccff" stroke="black" stroke-width="2" />
1593 - <text style="text-anchor: middle;" x="650" y="30">Users</text>
1594 -
1595 -
1596 -
1597 - <line x1="570" y1="75" x2="610" y2="75" stroke-width="2" stroke="black" />
1598 - <line x1="610" y1="75" x2="602" y2="70" stroke-width="2" stroke="black" />
1599 - <line x1="610" y1="75" x2="602" y2="80" stroke-width="2" stroke="black" />
1600 -
1601 - <rect x="610" y="60" width="80" height="30"
1602 - fill="#ccccff" stroke="black" stroke-width="2" />
1603 - <text style="text-anchor: middle;" x="650" y="80">Users</text>
1604 -
1605 -
1606 -
1607 - <line x1="570" y1="125" x2="610" y2="125" stroke-width="2" stroke="black" />
1608 - <line x1="610" y1="125" x2="602" y2="120" stroke-width="2" stroke="black" />
1609 - <line x1="610" y1="125" x2="602" y2="130" stroke-width="2" stroke="black" />
1610 -
1611 - <rect x="610" y="110" width="80" height="30"
1612 - fill="#ccccff" stroke="black" stroke-width="2" />
1613 - <text style="text-anchor: middle;" x="650" y="130">Users</text>
1614 -
1615 -
1616 - <line x1="570" y1="175" x2="610" y2="175" stroke-width="2" stroke="black" />
1617 - <line x1="610" y1="175" x2="602" y2="170" stroke-width="2" stroke="black" />
1618 - <line x1="610" y1="175" x2="602" y2="180" stroke-width="2" stroke="black" />
1619 -
1620 - <rect x="610" y="160" width="80" height="30"
1621 - fill="#ccccff" stroke="black" stroke-width="2" />
1622 - <text style="text-anchor: middle;" x="650" y="180">Users</text>
1623 -
1624 -
1625 -
1626 - <line x1="610" y1="225" x2="602" y2="220" stroke-width="2" stroke="black" />
1627 - <line x1="610" y1="225" x2="602" y2="230" stroke-width="2" stroke="black" />
1628 - <path d="M 570 175 Q 590 175 590 200 Q 590 230 610 225"
1629 - stroke-width="2" stroke="black" fill="none" />
1630 -
1631 - <rect x="610" y="210" width="80" height="30"
1632 - fill="#ccccff" stroke="black" stroke-width="2" />
1633 - <text style="text-anchor: middle;" x="650" y="230">Users</text>
1634 -
1635 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1636 +<svg
1637 + xmlns:dc="http://purl.org/dc/elements/1.1/"
1638 + xmlns:cc="http://creativecommons.org/ns#"
1639 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1640 + xmlns:svg="http://www.w3.org/2000/svg"
1641 + xmlns="http://www.w3.org/2000/svg"
1642 + id="svg133"
1643 + version="1.1"
1644 + height="250"
1645 + width="700">
1646 + <metadata
1647 + id="metadata139">
1648 + <rdf:RDF>
1649 + <cc:Work
1650 + rdf:about="">
1651 + <dc:format>image/svg+xml</dc:format>
1652 + <dc:type
1653 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1654 + <dc:title></dc:title>
1655 + </cc:Work>
1656 + </rdf:RDF>
1657 + </metadata>
1658 + <defs
1659 + id="defs137" />
1660 + <desc
1661 + id="desc2">Git to RSYNC Propagation</desc>
1662 + <rect
1663 + id="background"
1664 + fill="#eeeeee"
1665 + height="1000"
1666 + width="1000"
1667 + y="-10"
1668 + x="-10" />
1669 + <rect
1670 + id="rect5"
1671 + stroke-width="2"
1672 + stroke="black"
1673 + fill="#ffcccc"
1674 + height="30"
1675 + width="80"
1676 + y="110"
1677 + x="10" />
1678 + <text
1679 + id="text7"
1680 + y="130"
1681 + x="50"
1682 + 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>
1683 + <line
1684 + id="line9"
1685 + stroke="black"
1686 + stroke-width="2"
1687 + y2="125"
1688 + x2="130"
1689 + y1="125"
1690 + x1="90" />
1691 + <line
1692 + id="line11"
1693 + stroke="black"
1694 + stroke-width="2"
1695 + y2="120"
1696 + x2="122"
1697 + y1="125"
1698 + x1="130" />
1699 + <line
1700 + id="line13"
1701 + stroke="black"
1702 + stroke-width="2"
1703 + y2="130"
1704 + x2="122"
1705 + y1="125"
1706 + x1="130" />
1707 + <rect
1708 + id="rect15"
1709 + stroke-width="2"
1710 + stroke="black"
1711 + fill="#ffcccc"
1712 + height="30"
1713 + width="80"
1714 + y="60"
1715 + x="10" />
1716 + <text
1717 + id="text17"
1718 + y="80"
1719 + x="50"
1720 + 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>
1721 + <path
1722 + id="path19"
1723 + fill="none"
1724 + stroke="black"
1725 + stroke-width="2"
1726 + d="M 90 75 Q 110 75 110 100 Q 110 130 130 125" />
1727 + <rect
1728 + id="rect21"
1729 + stroke-width="2"
1730 + stroke="black"
1731 + fill="#ffcccc"
1732 + height="30"
1733 + width="80"
1734 + y="160"
1735 + x="10" />
1736 + <text
1737 + id="text23"
1738 + y="180"
1739 + x="50"
1740 + 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>
1741 + <path
1742 + id="path25"
1743 + fill="none"
1744 + stroke="black"
1745 + stroke-width="2"
1746 + d="M 90 175 Q 110 175 110 150 Q 110 120 130 125" />
1747 + <rect
1748 + id="rect27"
1749 + stroke-width="2"
1750 + stroke="black"
1751 + fill="#ffffff"
1752 + height="30"
1753 + width="80"
1754 + y="110"
1755 + x="130" />
1756 + <text
1757 + id="text29"
1758 + y="130"
1759 + x="170"
1760 + 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>
1761 + <line
1762 + id="line31"
1763 + stroke="black"
1764 + stroke-width="2"
1765 + y2="125"
1766 + x2="250"
1767 + y1="125"
1768 + x1="210" />
1769 + <line
1770 + id="line33"
1771 + stroke="black"
1772 + stroke-width="2"
1773 + y2="120"
1774 + x2="242"
1775 + y1="125"
1776 + x1="250" />
1777 + <line
1778 + id="line35"
1779 + stroke="black"
1780 + stroke-width="2"
1781 + y2="130"
1782 + x2="242"
1783 + y1="125"
1784 + x1="250" />
1785 + <rect
1786 + id="rect37"
1787 + stroke-width="2"
1788 + stroke="black"
1789 + fill="#ffffff"
1790 + height="30"
1791 + width="80"
1792 + y="110"
1793 + x="250" />
1794 + <text
1795 + id="text39"
1796 + y="123"
1797 + x="290"
1798 + 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>
1799 + <text
1800 + id="text41"
1801 + y="135"
1802 + x="290"
1803 + 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>
1804 + <line
1805 + id="line43"
1806 + stroke="black"
1807 + stroke-width="2"
1808 + y2="125"
1809 + x2="370"
1810 + y1="125"
1811 + x1="330" />
1812 + <line
1813 + id="line45"
1814 + stroke="black"
1815 + stroke-width="2"
1816 + y2="120"
1817 + x2="362"
1818 + y1="125"
1819 + x1="370" />
1820 + <line
1821 + id="line47"
1822 + stroke="black"
1823 + stroke-width="2"
1824 + y2="130"
1825 + x2="362"
1826 + y1="125"
1827 + x1="370" />
1828 + <rect
1829 + id="rect49"
1830 + stroke-width="2"
1831 + stroke="black"
1832 + fill="#ffffff"
1833 + height="30"
1834 + width="80"
1835 + y="110"
1836 + x="370" />
1837 + <text
1838 + id="text51"
1839 + y="130"
1840 + x="410"
1841 + 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>
1842 + <line
1843 + id="line53"
1844 + stroke="black"
1845 + stroke-width="2"
1846 + y2="70"
1847 + x2="482"
1848 + y1="75"
1849 + x1="490" />
1850 + <line
1851 + id="line55"
1852 + stroke="black"
1853 + stroke-width="2"
1854 + y2="80"
1855 + x2="482"
1856 + y1="75"
1857 + x1="490" />
1858 + <path
1859 + id="path57"
1860 + fill="none"
1861 + stroke="black"
1862 + stroke-width="2"
1863 + d="M 450 125 Q 470 125 470 100 Q 470 70 490 75" />
1864 + <rect
1865 + id="rect59"
1866 + stroke-width="2"
1867 + stroke="black"
1868 + fill="#ccffcc"
1869 + height="30"
1870 + width="80"
1871 + y="60"
1872 + x="490" />
1873 + <text
1874 + id="text61"
1875 + y="80"
1876 + x="530"
1877 + 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>
1878 + <line
1879 + id="line63"
1880 + stroke="black"
1881 + stroke-width="2"
1882 + y2="125"
1883 + x2="490"
1884 + y1="125"
1885 + x1="450" />
1886 + <line
1887 + id="line65"
1888 + stroke="black"
1889 + stroke-width="2"
1890 + y2="120"
1891 + x2="482"
1892 + y1="125"
1893 + x1="490" />
1894 + <line
1895 + id="line67"
1896 + stroke="black"
1897 + stroke-width="2"
1898 + y2="130"
1899 + x2="482"
1900 + y1="125"
1901 + x1="490" />
1902 + <rect
1903 + id="rect69"
1904 + stroke-width="2"
1905 + stroke="black"
1906 + fill="#ccffcc"
1907 + height="30"
1908 + width="80"
1909 + y="110"
1910 + x="490" />
1911 + <text
1912 + id="text71"
1913 + y="130"
1914 + x="530"
1915 + 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>
1916 + <line
1917 + id="line73"
1918 + stroke="black"
1919 + stroke-width="2"
1920 + y2="170"
1921 + x2="482"
1922 + y1="175"
1923 + x1="490" />
1924 + <line
1925 + id="line75"
1926 + stroke="black"
1927 + stroke-width="2"
1928 + y2="180"
1929 + x2="482"
1930 + y1="175"
1931 + x1="490" />
1932 + <path
1933 + id="path77"
1934 + fill="none"
1935 + stroke="black"
1936 + stroke-width="2"
1937 + d="M 450 125 Q 470 125 470 150 Q 470 180 490 175" />
1938 + <rect
1939 + id="rect79"
1940 + stroke-width="2"
1941 + stroke="black"
1942 + fill="#ccffcc"
1943 + height="30"
1944 + width="80"
1945 + y="160"
1946 + x="490" />
1947 + <text
1948 + id="text81"
1949 + y="180"
1950 + x="530"
1951 + 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>
1952 + <line
1953 + id="line83"
1954 + stroke="black"
1955 + stroke-width="2"
1956 + y2="20"
1957 + x2="602"
1958 + y1="25"
1959 + x1="610" />
1960 + <line
1961 + id="line85"
1962 + stroke="black"
1963 + stroke-width="2"
1964 + y2="30"
1965 + x2="602"
1966 + y1="25"
1967 + x1="610" />
1968 + <path
1969 + id="path87"
1970 + fill="none"
1971 + stroke="black"
1972 + stroke-width="2"
1973 + d="M 570 75 Q 590 75 590 50 Q 590 20 610 25" />
1974 + <rect
1975 + id="rect89"
1976 + stroke-width="2"
1977 + stroke="black"
1978 + fill="#ccccff"
1979 + height="30"
1980 + width="80"
1981 + y="10"
1982 + x="610" />
1983 + <text
1984 + id="text91"
1985 + y="30"
1986 + x="650"
1987 + 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>
1988 + <line
1989 + id="line93"
1990 + stroke="black"
1991 + stroke-width="2"
1992 + y2="75"
1993 + x2="610"
1994 + y1="75"
1995 + x1="570" />
1996 + <line
1997 + id="line95"
1998 + stroke="black"
1999 + stroke-width="2"
2000 + y2="70"
2001 + x2="602"
2002 + y1="75"
2003 + x1="610" />
2004 + <line
2005 + id="line97"
2006 + stroke="black"
2007 + stroke-width="2"
2008 + y2="80"
2009 + x2="602"
2010 + y1="75"
2011 + x1="610" />
2012 + <rect
2013 + id="rect99"
2014 + stroke-width="2"
2015 + stroke="black"
2016 + fill="#ccccff"
2017 + height="30"
2018 + width="80"
2019 + y="60"
2020 + x="610" />
2021 + <text
2022 + id="text101"
2023 + y="80"
2024 + x="650"
2025 + 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>
2026 + <line
2027 + id="line103"
2028 + stroke="black"
2029 + stroke-width="2"
2030 + y2="125"
2031 + x2="610"
2032 + y1="125"
2033 + x1="570" />
2034 + <line
2035 + id="line105"
2036 + stroke="black"
2037 + stroke-width="2"
2038 + y2="120"
2039 + x2="602"
2040 + y1="125"
2041 + x1="610" />
2042 + <line
2043 + id="line107"
2044 + stroke="black"
2045 + stroke-width="2"
2046 + y2="130"
2047 + x2="602"
2048 + y1="125"
2049 + x1="610" />
2050 + <rect
2051 + id="rect109"
2052 + stroke-width="2"
2053 + stroke="black"
2054 + fill="#ccccff"
2055 + height="30"
2056 + width="80"
2057 + y="110"
2058 + x="610" />
2059 + <text
2060 + id="text111"
2061 + y="130"
2062 + x="650"
2063 + 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>
2064 + <line
2065 + id="line113"
2066 + stroke="black"
2067 + stroke-width="2"
2068 + y2="175"
2069 + x2="610"
2070 + y1="175"
2071 + x1="570" />
2072 + <line
2073 + id="line115"
2074 + stroke="black"
2075 + stroke-width="2"
2076 + y2="170"
2077 + x2="602"
2078 + y1="175"
2079 + x1="610" />
2080 + <line
2081 + id="line117"
2082 + stroke="black"
2083 + stroke-width="2"
2084 + y2="180"
2085 + x2="602"
2086 + y1="175"
2087 + x1="610" />
2088 + <rect
2089 + id="rect119"
2090 + stroke-width="2"
2091 + stroke="black"
2092 + fill="#ccccff"
2093 + height="30"
2094 + width="80"
2095 + y="160"
2096 + x="610" />
2097 + <text
2098 + id="text121"
2099 + y="180"
2100 + x="650"
2101 + 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>
2102 + <line
2103 + id="line123"
2104 + stroke="black"
2105 + stroke-width="2"
2106 + y2="220"
2107 + x2="602"
2108 + y1="225"
2109 + x1="610" />
2110 + <line
2111 + id="line125"
2112 + stroke="black"
2113 + stroke-width="2"
2114 + y2="230"
2115 + x2="602"
2116 + y1="225"
2117 + x1="610" />
2118 + <path
2119 + id="path127"
2120 + fill="none"
2121 + stroke="black"
2122 + stroke-width="2"
2123 + d="M 570 175 Q 590 175 590 200 Q 590 230 610 225" />
2124 + <rect
2125 + id="rect129"
2126 + stroke-width="2"
2127 + stroke="black"
2128 + fill="#ccccff"
2129 + height="30"
2130 + width="80"
2131 + y="210"
2132 + x="610" />
2133 + <text
2134 + id="text131"
2135 + y="230"
2136 + x="650"
2137 + 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>
2138 </svg>
2139 -
2140 -<!-- vim: set ft=xml sw=4 sts=4 et : -->
2141
2142 diff --git a/general-concepts/mirrors/diagram.svg b/general-concepts/mirrors/diagram.svg
2143 index b807e5a..c98b830 100644
2144 --- a/general-concepts/mirrors/diagram.svg
2145 +++ b/general-concepts/mirrors/diagram.svg
2146 @@ -1,521 +1,496 @@
2147 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2148 -<!-- Created with Inkscape (http://www.inkscape.org/) -->
2149 <svg
2150 xmlns:dc="http://purl.org/dc/elements/1.1/"
2151 - xmlns:cc="http://web.resource.org/cc/"
2152 + xmlns:cc="http://creativecommons.org/ns#"
2153 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
2154 xmlns:svg="http://www.w3.org/2000/svg"
2155 xmlns="http://www.w3.org/2000/svg"
2156 - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
2157 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
2158 - sodipodi:docbase="/home/plasmaroo"
2159 - sodipodi:docname="diagram.svg"
2160 - inkscape:version="0.41"
2161 - sodipodi:version="0.32"
2162 - version="1.0"
2163 - x="0.0000000"
2164 - y="0.0000000"
2165 - width="700.00000px"
2166 - height="250.00000px"
2167 + id="svg1546"
2168 viewBox="0 0 700 250"
2169 - id="svg1546">
2170 + height="250.00000px"
2171 + width="700.00000px"
2172 + y="0.0000000"
2173 + x="0.0000000"
2174 + version="1.0">
2175 <metadata
2176 id="metadata71">
2177 - <rdf:RDF
2178 - id="RDF73">
2179 + <rdf:RDF>
2180 <cc:Work
2181 - id="Work75"
2182 rdf:about="">
2183 - <dc:format
2184 - id="format77">image/svg+xml</dc:format>
2185 + <dc:format>image/svg+xml</dc:format>
2186 <dc:type
2187 - rdf:resource="http://purl.org/dc/dcmitype/StillImage"
2188 - id="type79" />
2189 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
2190 + <dc:title></dc:title>
2191 </cc:Work>
2192 </rdf:RDF>
2193 </metadata>
2194 - <sodipodi:namedview
2195 - inkscape:current-layer="svg1546"
2196 - inkscape:window-y="264"
2197 - inkscape:window-x="164"
2198 - inkscape:cy="81.156529"
2199 - inkscape:cx="343.48587"
2200 - inkscape:zoom="0.97294509"
2201 - inkscape:window-height="541"
2202 - inkscape:window-width="968"
2203 - inkscape:pageshadow="2"
2204 - inkscape:pageopacity="1.0000000"
2205 - borderopacity="1.0"
2206 - bordercolor="#666666"
2207 - pagecolor="#eeeeee"
2208 - id="base" />
2209 <defs
2210 id="defs1680" />
2211 <desc
2212 id="desc1548">Git to RSYNC Propagation</desc>
2213 <rect
2214 - y="0.24284256"
2215 - x="-2.0556145"
2216 - height="260.03522"
2217 - width="710.21484"
2218 + 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"
2219 id="rect1360"
2220 - 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" />
2221 + width="710.21484"
2222 + height="260.03522"
2223 + x="-2.0556145"
2224 + y="0.24284256" />
2225 <rect
2226 - width="80.000000"
2227 - height="30.000000"
2228 - x="10.000000"
2229 - y="110.00000"
2230 + id="rect1551"
2231 style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
2232 - id="rect1551" />
2233 + y="110.00000"
2234 + x="10.000000"
2235 + height="30.000000"
2236 + width="80.000000" />
2237 <text
2238 - x="50"
2239 + id="text1553"
2240 + 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;"
2241 y="130"
2242 - style="text-anchor:middle"
2243 - id="text1553">Developers</text>
2244 + x="50">Developers</text>
2245 <line
2246 - id="line1555"
2247 - stroke="black"
2248 - stroke-width="2"
2249 - y2="125.00000"
2250 - x2="130.00000"
2251 - y1="125.00000"
2252 + style="stroke:#000000;stroke-width:2.0000000"
2253 x1="90.000000"
2254 - style="stroke:#000000;stroke-width:2.0000000" />
2255 - <line
2256 - id="line1557"
2257 - stroke="black"
2258 - stroke-width="2"
2259 - y2="120.00000"
2260 - x2="122.00000"
2261 y1="125.00000"
2262 - x1="130.00000"
2263 - style="stroke:#000000;stroke-width:2.0000000" />
2264 - <line
2265 - id="line1559"
2266 - stroke="black"
2267 + x2="130.00000"
2268 + y2="125.00000"
2269 stroke-width="2"
2270 - y2="130.00000"
2271 - x2="122.00000"
2272 + stroke="black"
2273 + id="line1555" />
2274 + <line
2275 + style="stroke:#000000;stroke-width:2.0000000"
2276 + x1="130.00000"
2277 y1="125.00000"
2278 + x2="122.00000"
2279 + y2="120.00000"
2280 + stroke-width="2"
2281 + stroke="black"
2282 + id="line1557" />
2283 + <line
2284 + style="stroke:#000000;stroke-width:2.0000000"
2285 x1="130.00000"
2286 - style="stroke:#000000;stroke-width:2.0000000" />
2287 + y1="125.00000"
2288 + x2="122.00000"
2289 + y2="130.00000"
2290 + stroke-width="2"
2291 + stroke="black"
2292 + id="line1559" />
2293 <rect
2294 - width="80.000000"
2295 - height="30.000000"
2296 - x="10.000000"
2297 - y="60.000000"
2298 + id="rect1561"
2299 style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
2300 - id="rect1561" />
2301 + y="60.000000"
2302 + x="10.000000"
2303 + height="30.000000"
2304 + width="80.000000" />
2305 <text
2306 - x="50"
2307 + id="text1563"
2308 + 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;"
2309 y="80"
2310 - style="text-anchor:middle"
2311 - id="text1563">Developers</text>
2312 + x="50">Developers</text>
2313 <path
2314 - 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"
2315 + id="path1565"
2316 style="fill:none;stroke:#000000;stroke-width:2.0000000"
2317 - id="path1565" />
2318 + 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" />
2319 <rect
2320 - width="80.000000"
2321 - height="30.000000"
2322 - x="10.000000"
2323 - y="160.00000"
2324 + id="rect1567"
2325 style="fill:#ffcccc;stroke:#000000;stroke-width:2.0000000"
2326 - id="rect1567" />
2327 + y="160.00000"
2328 + x="10.000000"
2329 + height="30.000000"
2330 + width="80.000000" />
2331 <text
2332 - x="50"
2333 + id="text1569"
2334 + 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;"
2335 y="180"
2336 - style="text-anchor:middle"
2337 - id="text1569">Developers</text>
2338 + x="50">Developers</text>
2339 <path
2340 - 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"
2341 + id="path1571"
2342 style="fill:none;stroke:#000000;stroke-width:2.0000000"
2343 - id="path1571" />
2344 + 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" />
2345 <rect
2346 - width="80.000000"
2347 - height="30.000000"
2348 - x="130.00000"
2349 - y="110.00000"
2350 + id="rect1573"
2351 style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
2352 - id="rect1573" />
2353 + y="110.00000"
2354 + x="130.00000"
2355 + height="30.000000"
2356 + width="80.000000" />
2357 <text
2358 - x="170"
2359 + id="text1575"
2360 + 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;"
2361 y="130"
2362 - style="text-anchor:middle"
2363 - id="text1575">dev.gentoo</text>
2364 + x="170">dev.gentoo</text>
2365 <line
2366 - id="line1577"
2367 - stroke="black"
2368 - stroke-width="2"
2369 - y2="125.00000"
2370 - x2="250.00000"
2371 - y1="125.00000"
2372 + style="stroke:#000000;stroke-width:2.0000000"
2373 x1="210.00000"
2374 - style="stroke:#000000;stroke-width:2.0000000" />
2375 - <line
2376 - id="line1579"
2377 - stroke="black"
2378 - stroke-width="2"
2379 - y2="120.00000"
2380 - x2="242.00000"
2381 y1="125.00000"
2382 - x1="250.00000"
2383 - style="stroke:#000000;stroke-width:2.0000000" />
2384 - <line
2385 - id="line1581"
2386 - stroke="black"
2387 + x2="250.00000"
2388 + y2="125.00000"
2389 stroke-width="2"
2390 - y2="130.00000"
2391 - x2="242.00000"
2392 + stroke="black"
2393 + id="line1577" />
2394 + <line
2395 + style="stroke:#000000;stroke-width:2.0000000"
2396 + x1="250.00000"
2397 y1="125.00000"
2398 + x2="242.00000"
2399 + y2="120.00000"
2400 + stroke-width="2"
2401 + stroke="black"
2402 + id="line1579" />
2403 + <line
2404 + style="stroke:#000000;stroke-width:2.0000000"
2405 x1="250.00000"
2406 - style="stroke:#000000;stroke-width:2.0000000" />
2407 + y1="125.00000"
2408 + x2="242.00000"
2409 + y2="130.00000"
2410 + stroke-width="2"
2411 + stroke="black"
2412 + id="line1581" />
2413 <rect
2414 - width="80.000000"
2415 - height="30.000000"
2416 - x="250.00000"
2417 - y="110.00000"
2418 + id="rect1583"
2419 style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
2420 - id="rect1583" />
2421 + y="110.00000"
2422 + x="250.00000"
2423 + height="30.000000"
2424 + width="80.000000" />
2425 <text
2426 - x="290"
2427 + id="text1585"
2428 + 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;"
2429 y="123"
2430 - style="text-anchor:middle"
2431 - id="text1585">Staging</text>
2432 + x="290">Staging</text>
2433 <text
2434 - x="290"
2435 + id="text1587"
2436 + 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;"
2437 y="135"
2438 - style="text-anchor:middle"
2439 - id="text1587">Box</text>
2440 + x="290">Box</text>
2441 <line
2442 - id="line1589"
2443 - stroke="black"
2444 - stroke-width="2"
2445 - y2="125.00000"
2446 - x2="370.00000"
2447 - y1="125.00000"
2448 + style="stroke:#000000;stroke-width:2.0000000"
2449 x1="330.00000"
2450 - style="stroke:#000000;stroke-width:2.0000000" />
2451 - <line
2452 - id="line1591"
2453 - stroke="black"
2454 - stroke-width="2"
2455 - y2="120.00000"
2456 - x2="362.00000"
2457 y1="125.00000"
2458 - x1="370.00000"
2459 - style="stroke:#000000;stroke-width:2.0000000" />
2460 - <line
2461 - id="line1593"
2462 - stroke="black"
2463 + x2="370.00000"
2464 + y2="125.00000"
2465 stroke-width="2"
2466 - y2="130.00000"
2467 - x2="362.00000"
2468 + stroke="black"
2469 + id="line1589" />
2470 + <line
2471 + style="stroke:#000000;stroke-width:2.0000000"
2472 + x1="370.00000"
2473 y1="125.00000"
2474 + x2="362.00000"
2475 + y2="120.00000"
2476 + stroke-width="2"
2477 + stroke="black"
2478 + id="line1591" />
2479 + <line
2480 + style="stroke:#000000;stroke-width:2.0000000"
2481 x1="370.00000"
2482 - style="stroke:#000000;stroke-width:2.0000000" />
2483 + y1="125.00000"
2484 + x2="362.00000"
2485 + y2="130.00000"
2486 + stroke-width="2"
2487 + stroke="black"
2488 + id="line1593" />
2489 <rect
2490 - width="80.000000"
2491 - height="30.000000"
2492 - x="370.00000"
2493 - y="110.00000"
2494 + id="rect1595"
2495 style="fill:#ffffff;stroke:#000000;stroke-width:2.0000000"
2496 - id="rect1595" />
2497 + y="110.00000"
2498 + x="370.00000"
2499 + height="30.000000"
2500 + width="80.000000" />
2501 <text
2502 - x="410"
2503 + id="text1597"