Merge commit 'smcv/comments'

diff --git a/doc/tips/using_the_web_interface_with_a_real_text_editor.mdwn b/doc/tips/using_the_web_interface_with_a_real_text_editor.mdwn
index 1c9ecdc8cc56ef0b06157893d4bbeb9b1988b2d4..cf9327395bcde7ab38fea3d02df3b9aa65610e5d 100644 (file)
--- a/doc/tips/using_the_web_interface_with_a_real_text_editor.mdwn
+++ b/doc/tips/using_the_web_interface_with_a_real_text_editor.mdwn
@@ -5,4 +5,9 @@ areas.  This allows you to edit ikiwiki pages with a real text editor through
 the ikiwiki web interface, rather than only with direct commit 
 access. --[[JoshTriplett]] 
 
-For Firefox or Iceweasel users, the vimperator extension is also a good idea.  You can press Ctrl-I in the insert mode of vimperator and switch to an external editor, e.g. Vim. --[[WeakishJiang]]
+For Firefox or Iceweasel users, the vimperator extension is also a good
+idea.  You can press Ctrl-I in the insert mode of vimperator and switch to
+an external editor, e.g. Vim. --[[WeakishJiang]]
+
+Finally, with wikis configured to allow, [[untrusted_git_push]], you can
+ditch the browser altogether. --[[Joey]] 

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index aa6b130dc737449782e08997b33318ea5f6c73df..50fd89682b4582b7a8204701fcc785c79ffcf93b 100644 (file)
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -13,7 +13,10 @@ Known issues with the [[plugins/comments]] plugin:
 
   > Done in my comments git branch --[[smcv]]
 
-  > Not seeing it there, which branch? --[[Joey]] 
+  > Not seeing it there, which branch? --[[Joey]]
+
+  >> Bah, git push --all is not the default... 'comments' branch now (I've also rebased it).
+  >> Sorry, I'm on mobile Internet at the moment... --[[smcv]]
 
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
@@ -22,6 +25,9 @@ Known issues with the [[plugins/comments]] plugin:
   > {x} and {*} smileys for anonymous, OpenID and login respectively).
   > --[[smcv]]
 
+  >> I've improved this to use independent icons from the wikiicons
+  >> directory (untested!) --[[smcv]]
+
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
   in a box like is used for inlined pages.

diff --git a/doc/users/weakishjiang.mdwn b/doc/users/weakishjiang.mdwn
index 68296af2b94ad0210007a1ccd9942baacfa434ce..0cafb4653b1069a41be64cca7b1784a7a5633aae 100644 (file)
--- a/doc/users/weakishjiang.mdwn
+++ b/doc/users/weakishjiang.mdwn
@@ -1 +1,4 @@
 [My blog](http://millenniumdark.blog.ubuntu.org.cn)
+
+> So, you're learning haskell. You know, I want to add support for haskell
+> external plugins to ikiwiki.. :-) --[[Joey]]