summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn6
-rw-r--r--doc/todo/web_reversion.mdwn2
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1d12d0558..d1ee4967d 100644
--- 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
+ * 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
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 4998c1a75..d69b3801b 100644
--- 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]]
+
+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 212fd3a53..9550fa58b 100644
--- 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]]
+
+[[done]]