X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=GeekiGeekiToDo;h=32369cc42f8b4c508ee9aba1954a9a02aaab4f32;hp=9e2bc89f72baea22020c3774acacb832d48ff223;hb=f748697bbd6def4a9981d84f67c715c32ff8d9c4;hpb=20af78b72e85083f780f5ab105842ed8c1b66cdd

diff --git a/GeekiGeekiToDo b/GeekiGeekiToDo
index 9e2bc89..32369cc 100644
--- a/GeekiGeekiToDo
+++ b/GeekiGeekiToDo
@@ -2,8 +2,9 @@
 
  * Page delete
  * Page rename
- * Editing comment
- * Quick Find box in the menu
+ * Page redirects (using symlinks)
+ * Quick Find box in the navbar
+ * Replace ##<****<Include|foo>****>## with ##{****{foo}****}##
  * WikiCreole syntax: ##<****<macro param1 param2>****>##
  * WikiCreole syntax: ##{****{image|title}****}##
 
@@ -17,5 +18,8 @@
  * Groups/ directory with group lists implemented as wiki pages with unordered lists
  * Includes (aka templates)
  * Syntax hilighting for code blocks
+=== Nice to have ===
+
+ * A functionality to have custom merge strategy in git to merge different wiki/GeekiGeeki in a single one
 
  * See also the original PikiToDo