summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--doc/bugs/example_Mercurial_historyurl_doesn__39__t_show_file_history.mdwn8
-rw-r--r--doc/ikiwiki.setup2
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 37e6f7d26..cf7063f40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ ikiwiki (2.13) UNRELEASED; urgency=low
* Correct markdown in example index page in setup. Closes: #451469
* Better error message when a setup file has a syntax error.
Closes: #451666
+ * Fix mercurial historyurl in example setup file.
- -- Joey Hess <joeyh@debian.org> Sat, 17 Nov 2007 14:05:38 -0500
+ -- Joey Hess <joeyh@debian.org> Sat, 17 Nov 2007 14:43:26 -0500
ikiwiki (2.12) unstable; urgency=low
diff --git a/doc/bugs/example_Mercurial_historyurl_doesn__39__t_show_file_history.mdwn b/doc/bugs/example_Mercurial_historyurl_doesn__39__t_show_file_history.mdwn
index e1f03d47c..390449dd3 100644
--- a/doc/bugs/example_Mercurial_historyurl_doesn__39__t_show_file_history.mdwn
+++ b/doc/bugs/example_Mercurial_historyurl_doesn__39__t_show_file_history.mdwn
@@ -6,8 +6,12 @@ The current historyurl is:
A link to the history page for the file would be:
- #historyurl => "http://localhost:8000/log/tip/[\[file]]", # hg serve'd local repository
+ #historyurl => "http://localhost:8000/log/tip/\[[file]]", # hg serve'd local repository
*The backslash in the code should be removed.*
-This creates links to the hgweb page which is equivalent to the Git file history page. \ No newline at end of file
+> To escape a link, use `\\[[link]]`. Example: \[[link]] --[[Joey]]
+
+> ([[done]], BTW)
+
+This creates links to the hgweb page which is equivalent to the Git file history page.
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index e36559112..1456a3411 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -40,7 +40,7 @@ use IkiWiki::Setup::Standard {
# Mercurial stuff.
#rcs => "mercurial",
- #historyurl => "http://localhost:8000/", # hg serve'd local repository
+ #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
# Monotone stuff