aboutsummaryrefslogtreecommitdiff
path: root/doc/rcs
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2014-04-18 11:28:21 -0400
committerAntoine Beaupré <anarcat@koumbit.org>2014-04-18 11:31:22 -0400
commite75fa67406052712476e3aa4d798cf88ec5893d1 (patch)
treefb78bbd0b5f46d214a91bb47f8f8777d219c7869 /doc/rcs
parent9e1ad9037fe4cb54fb5eeb8b3ad65c6594b1c1d4 (diff)
downloadikiwiki-e75fa67406052712476e3aa4d798cf88ec5893d1.tar
ikiwiki-e75fa67406052712476e3aa4d798cf88ec5893d1.tar.gz
add graphical explanations of various decentralisation schemes for ikiwiki
the wiki_edit_flow.svg file is slightly changed to make the box designate the server boundaries so it can be reused in a coherent manner in the other graphics. the distributed_wikis page still needs an overhaul to clarify it's about the third and fourth setups, but that will be easier to do in separate commits.
Diffstat (limited to 'doc/rcs')
-rw-r--r--doc/rcs/git/wiki_edit_flow.svg130
1 files changed, 65 insertions, 65 deletions
diff --git a/doc/rcs/git/wiki_edit_flow.svg b/doc/rcs/git/wiki_edit_flow.svg
index 200a3439d..bb83bb115 100644
--- a/doc/rcs/git/wiki_edit_flow.svg
+++ b/doc/rcs/git/wiki_edit_flow.svg
@@ -13,7 +13,7 @@
height="548.64734"
id="svg2"
version="1.1"
- inkscape:version="0.48.1 r9760"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="wiki_edit_flow.svg">
<defs
id="defs4">
@@ -196,17 +196,17 @@
inkscape:pageshadow="2"
inkscape:zoom="1.0885159"
inkscape:cx="281.26331"
- inkscape:cy="219.65103"
+ inkscape:cy="288.69374"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-global="true"
- inkscape:window-width="1280"
- inkscape:window-height="995"
- inkscape:window-x="1280"
- inkscape:window-y="0"
+ inkscape:window-width="1438"
+ inkscape:window-height="872"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
inkscape:window-maximized="1"
fit-margin-top="25"
fit-margin-left="25"
@@ -228,7 +228,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -240,104 +240,104 @@
<rect
style="fill:none;stroke:#000000;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect3866"
- width="220.00006"
- height="79.999939"
+ width="442.32111"
+ height="341.82434"
x="184.99994"
- y="142.36218"
+ y="164.68744"
ry="10"
rx="10" />
<path
style="fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 355,182.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 355,222.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="368.57144"
- y="225.21931"
+ y="251.21931"
id="text2995"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan2997"
x="368.57144"
- y="225.21931" /></text>
+ y="251.21931" /></text>
<path
style="fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 355,322.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 355,348.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989-4"
inkscape:connector-curvature="0" />
<path
style="fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 355,457.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 355,483.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989-1"
inkscape:connector-curvature="0" />
<path
style="fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 355,597.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 355,623.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989-5"
inkscape:connector-curvature="0" />
<path
style="opacity:0.48800001;fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 475,597.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 475,623.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989-2"
inkscape:connector-curvature="0" />
<path
style="opacity:0.5;fill:#ffcb14;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 235,597.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
+ d="m 235,623.36218 55,0 0,-45 -25,0 -5,-5 -20,0 -5,5 z"
id="path2989-8"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="386.06738"
- y="626.36218"
+ y="652.36218"
id="text3868"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3870"
x="386.06738"
- y="626.36218"
+ y="652.36218"
style="font-size:20px;text-align:center;text-anchor:middle">working clones</tspan></text>
<text
xml:space="preserve"
style="font-size:18px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="524.37988"
- y="437.36218"
+ y="463.36218"
id="text3874"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3876"
x="524.37988"
- y="437.36218"
+ y="463.36218"
style="font-size:20px;text-align:center;text-anchor:middle">repository</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="525.35156"
- y="304.36218"
+ y="330.36218"
id="text3878"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3880"
x="525.35156"
- y="304.36218"
+ y="330.36218"
style="font-size:20px;text-align:center;text-anchor:middle">srcdir</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="525.1543"
- y="165.36218"
+ y="201.36218"
id="text3882"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3884"
x="525.1543"
- y="165.36218"
+ y="201.36218"
style="font-size:20px;text-align:center;text-anchor:middle">destdir</tspan></text>
<g
id="g5440"
- transform="translate(5,25.000003)">
+ transform="translate(5,51.000003)">
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
@@ -352,7 +352,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
</g>
<g
- transform="translate(5,-110)"
+ transform="translate(5,-84)"
id="g5440-4">
<path
sodipodi:nodetypes="cc"
@@ -368,7 +368,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
</g>
<g
- transform="matrix(0.71872744,0.69529193,-0.69529193,0.71872744,353.78964,-104.94206)"
+ transform="matrix(0.71872744,0.69529193,-0.69529193,0.71872744,353.78964,-78.94206)"
id="g5440-47">
<path
sodipodi:nodetypes="cc"
@@ -384,7 +384,7 @@
style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
</g>
<g
- transform="matrix(-0.71872744,0.69529193,0.69529193,0.71872744,421.21036,-104.94206)"
+ transform="matrix(-0.71872744,0.69529193,0.69529193,0.71872744,421.21036,-78.94206)"
id="g5440-47-9"
style="opacity:0.5">
<path
@@ -402,12 +402,12 @@
</g>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5532)"
- d="m 380,262.36218 0,-60"
+ d="m 380,288.36218 0,-60"
id="path5558"
inkscape:connector-curvature="0" />
<g
id="g5810"
- transform="translate(0,-9)">
+ transform="translate(0,17)">
<g
transform="translate(-230,-4.9999974)"
id="g3784-7">
@@ -469,7 +469,7 @@
</g>
<g
id="g5824"
- transform="translate(0,-9)">
+ transform="translate(0,17)">
<g
transform="translate(-165,-9.9999974)"
id="g3784-0">
@@ -522,7 +522,7 @@
sodipodi:cy="187.36218"
sodipodi:rx="5"
sodipodi:ry="5"
- d="m 300,187.36218 a 5,5 0 1 1 -10,0 5,5 0 1 1 10,0 z"
+ d="m 300,187.36218 c 0,2.76143 -2.23858,5 -5,5 -2.76142,0 -5,-2.23857 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
transform="matrix(1.4,0,0,1.4,-120,-74.944873)" />
</g>
</g>
@@ -530,17 +530,17 @@
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="265"
- y="211.36218"
+ y="237.36218"
id="text5806"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan5808"
x="265"
- y="211.36218"
+ y="237.36218"
style="font-size:12px">ikiwiki.cgi</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5532)"
- d="m 295,217.36218 c 10,40 25,65 55,85"
+ d="m 295,243.36218 c 10,40 25,65 55,85"
id="path5834"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
@@ -548,157 +548,157 @@
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="351.31982"
- y="362.36218"
+ y="388.36218"
id="text6240"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6242"
x="351.31982"
- y="362.36218"
+ y="388.36218"
style="font-size:14px;text-align:end;writing-mode:lr-tb;text-anchor:end">post-update</tspan><tspan
sodipodi:role="line"
x="351.31982"
- y="379.86218"
+ y="405.86218"
style="font-size:14px;text-align:end;writing-mode:lr-tb;text-anchor:end"
id="tspan6244">hook</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="420"
- y="362.36218"
+ y="388.36218"
id="text6246"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6248"
x="420"
- y="362.36218"
+ y="388.36218"
style="font-size:14px">ikiwiki.cgi</tspan><tspan
sodipodi:role="line"
x="420"
- y="379.86218"
+ y="405.86218"
id="tspan6250"
style="font-size:14px">push</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="382"
- y="316.36218"
+ y="342.36218"
id="text6252"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6254"
x="382"
- y="316.36218">.git</tspan></text>
+ y="342.36218">.git</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="383"
- y="592.36218"
+ y="618.36218"
id="text6252-3"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6254-1"
x="383"
- y="592.36218">.git</tspan></text>
+ y="618.36218">.git</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="502"
- y="591.36218"
+ y="617.36218"
id="text6252-3-1"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6254-1-0"
x="502"
- y="591.36218">.git</tspan></text>
+ y="617.36218">.git</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="263"
- y="592.36218"
+ y="618.36218"
id="text6252-3-6"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6254-1-1"
x="263"
- y="592.36218">.git</tspan></text>
+ y="618.36218">.git</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="411"
- y="456.36218"
+ y="482.36218"
id="text6252-3-0"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6254-1-2"
x="411"
- y="456.36218">.git</tspan></text>
+ y="482.36218">.git</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="300"
- y="262.36218"
+ y="288.36218"
id="text6372"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6374"
x="300"
- y="262.36218"
+ y="288.36218"
style="font-size:14px">web-side</tspan><tspan
sodipodi:role="line"
x="300"
- y="279.86218"
+ y="305.86218"
id="tspan6376"
style="font-size:14px">edit</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="410"
- y="232.36218"
+ y="258.36218"
id="text6378"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6380"
x="410"
- y="232.36218"
+ y="258.36218"
style="font-size:14px">automatic</tspan><tspan
sodipodi:role="line"
x="410"
- y="249.86218"
+ y="275.86218"
id="tspan6382"
style="font-size:14px">rebuild</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="406.75635"
- y="501.15298"
+ y="527.15295"
id="text6384"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6386"
x="406.75635"
- y="501.15298"
+ y="527.15295"
style="font-size:14px">git</tspan><tspan
sodipodi:role="line"
x="406.75635"
- y="518.65295"
+ y="544.65295"
id="tspan6388"
style="font-size:14px">pull</tspan></text>
<text
xml:space="preserve"
style="font-size:16px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
x="363.62955"
- y="504.39691"
+ y="530.39691"
id="text6390"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan6392"
x="363.62955"
- y="504.39691"
+ y="530.39691"
style="font-size:14px;text-align:end;text-anchor:end">git</tspan><tspan
sodipodi:role="line"
x="363.62955"
- y="521.89691"
+ y="547.89691"
id="tspan6394"
style="font-size:14px;text-align:end;text-anchor:end">push</tspan></text>
</g>