revert interface done

diff --git a/debian/changelog b/debian/changelog
index 1d12d055881b1eb25564859a43b9d38cc200ebc0..d1ee4967d86e2bc5f7a7a1c59bd593a2e62a2c8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
   * htmltidy: Allow configuring tidy parameters in setup file.
     (W. Trevor King)
   * Updated French program translation. Closes: #598918
   * htmltidy: Allow configuring tidy parameters in setup file.
     (W. Trevor King)
   * Updated French program translation. Closes: #598918

+  * git: Added new rcs_revert and rcs_preprevert hooks.
+  * recentchanges: Add revert buttons to RecentChanges page, and
+    implement web-based reversion interface.
+  * Thanks to Peter Gammie for his assistance with the web-based reversion
+    feature.

 
  -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
 

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index 4998c1a7575767b3131ac7f014c67705b049cb7c..d69b3801b5b08e7220e4033498848ba3fb691b6b 100644 (file)
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -38,3 +38,9 @@ Puzzled a bit :-/
 
 Perer Gammie and I are working on reversion over at [[todo/web_reversion]].
 --[[Joey]] 
 
 Perer Gammie and I are working on reversion over at [[todo/web_reversion]].
 --[[Joey]] 

+
+Update: Web reversion is now supported by ikiwiki. Only changes committed
+to your wiki after you upgrade to the version of ikiwiki that supports it
+will get revert buttons on the RecentChanges page. If you want to force
+adding buttons for older changes, you can delete `recentchanges/*._change`
+from your srcdir, and rebuild the wiki. --[[Joey]] 

diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index 212fd3a5333ca6d899987b0b7cad35e19b1296d5..9550fa58b976974ad2910d0a68bd3bb825836f5c 100644 (file)
--- a/doc/todo/web_reversion.mdwn
+++ b/doc/todo/web_reversion.mdwn
@@ -71,3 +71,5 @@ Peter Gammie has done an initial implementation of the above.
 >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]]
 >>> (and fixed all the indention..). --[[Joey]] 
 >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]]
 >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]]
 >>> (and fixed all the indention..). --[[Joey]] 
 >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]]

+
+[[done]]