(no commit message)

[git.ikiwiki.info.git] / doc / todo / improve_decentralised_wikis_documentation_and_graphics.mdwn

diff --git a/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
index c8bbaa15706598ea8245dfaa99d665baf5e9718e..98b4add40037face42dc37846c4f13a8438cea06 100644 (file)
--- a/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
+++ b/doc/todo/improve_decentralised_wikis_documentation_and_graphics.mdwn
@@ -1,3 +1,14 @@
 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]]"]]
 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>
+
+[[patch merged|done]], thanks.