web commit by http://ethan.betacantrips.com/: this part was unrelated, right?

[git.ikiwiki.info.git] / doc / tips / issue_tracking.mdwn

diff --git a/doc/tips/issue_tracking.mdwn b/doc/tips/issue_tracking.mdwn
index 28f7ba7a16a9491c5a6a693e24afbf97532fed21..8f08bc692d24a58365ae1e4686d7b41ffebbea6a 100644 (file)
--- a/doc/tips/issue_tracking.mdwn
+++ b/doc/tips/issue_tracking.mdwn
@@ -3,8 +3,9 @@
 By Joey Hess, LinuxWorld.com
 
 [[template id=note text="""
-First published on [LinuxWorld.com](http:://www.linuxworld.com/), a
-publication of Network World Inc., 118 Turnpike Rd., Southboro, MA 01772.
+[First published](http://www.linuxworld.com/news/2007/040607-integrated-issue-tracking-ikiwiki.html)
+on [LinuxWorld.com](http:://www.linuxworld.com/), a publication of Network
+World Inc., 118 Turnpike Rd., Southboro, MA 01772.
 """]]
 
 Wikis are not just for encyclopedias and websites anymore. You can use
@@ -34,7 +35,7 @@ In the rare cases where automatic merging fails
 because of concurrent edits to the same part of a
 page, regular commit conflict markers are shown in
 the file to let you resolve the conflict, as you
-would for conflicting edit in source code.
+would for conflicting edits in source code.
 
 Ikiwiki is a full-featured wiki that you can use
 for a variety of purposes, from traditional wikis