aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-04-18 11:44:21 -0400
committerJoey Hess <joey@kitenet.net>2014-04-18 11:44:21 -0400
commite7e20e8fd8126ca44de765ed20eb5e3d3fa935c8 (patch)
treef4f24bc728ded50ad3558739af18e916a4848f18 /doc
parent5df475c81398b42fa0fa3f710d7268d15ae920ae (diff)
parent59e0b4a4365664a16482de1dd648ad2bd887c260 (diff)
downloadikiwiki-e7e20e8fd8126ca44de765ed20eb5e3d3fa935c8.tar
ikiwiki-e7e20e8fd8126ca44de765ed20eb5e3d3fa935c8.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
index c8bbaa157..cce39976e 100644
--- a/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
+++ b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
@@ -1,3 +1,20 @@
i'm trying to work on the decentralised wikis documentation in [[tips/distributed_wikis]] and i would like to add more / edit SVG graphics, but I can't because i'm not admin. --[[users/anarcat]]
[[!template id=gitbranch branch=anarcat/dev/decentralised_graphics author="[[anarcat]]"]]
+
+This branch is ready to be merged, I believe. There are some improvements to be done on the text of those pages, but I'd like to get the images in before going any further. [[patch]]
+
+Here are the images, to give you an idea:
+
+* <http://src.anarc.at/ikiwiki.git/blob/dev/decentralised_graphics:/doc/rcs/git/wiki_edit_flow.svg>
+* <http://src.anarc.at/ikiwiki.git/blob/dev/decentralised_graphics:/doc/tips/Git_repository_and_web_server_on_different_hosts/separate-webserver.svg>
+* <http://src.anarc.at/ikiwiki.git/blob/dev/decentralised_graphics:/doc/tips/distributed_wikis/ping-setup.svg>
+* <http://src.anarc.at/ikiwiki.git/blob/dev/decentralised_graphics:/doc/tips/distributed_wikis/decentralized_wikis.svg>
+
+<img src="http://src.anarc.at/ikiwiki.git/blob_plain/dev/decentralised_graphics:/doc/rcs/git/wiki_edit_flow.svg" />
+
+<img src="http://src.anarc.at/ikiwiki.git/blob_plain/dev/decentralised_graphics:/doc/tips/Git_repository_and_web_server_on_different_hosts/separate-webserver.svg" />
+
+<img src="http://src.anarc.at/ikiwiki.git/blob_plain/dev/decentralised_graphics:/doc/tips/distributed_wikis/ping-setup.svg" />
+
+<img src="http://src.anarc.at/ikiwiki.git/blob_plain/dev/decentralised_graphics:/doc/tips/distributed_wikis/decentralized_wikis.svg" />