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

diff --git a/GeekiGeekiToDo b/GeekiGeekiToDo
index 9e2bc89..0468d6b 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}****}##
 
@@ -16,6 +17,9 @@
  * Directory listing
  * Groups/ directory with group lists implemented as wiki pages with unordered lists
  * Includes (aka templates)
- * Syntax hilighting for code blocks
+ * Syntax highlighting 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