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 c6104de70558a6e99f82ead09a3eeb2164090940..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="""
 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
 """]]
 
 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
 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
 
 Ikiwiki is a full-featured wiki that you can use
 for a variety of purposes, from traditional wikis


@@ -129,8 +130,8 @@ While directories are useful for broad hierarchical
 grouping, tags are better for categorizing issues
 as bugs, wishlist items, security issues, patches,
 or whatever other categories are useful. Bugs can
 grouping, tags are better for categorizing issues
 as bugs, wishlist items, security issues, patches,
 or whatever other categories are useful. Bugs can

-be tagged "moreinfo", "done" "unreproducible",
-or "moreinfo", etc, to document different stages of
+be tagged "moreinfo", "done", "unreproducible",
+etc, to document different stages of

 their lifecycle. A developer can take ownership of a
 bug by tagging it with something like "owner/Joey".
 
 their lifecycle. A developer can take ownership of a
 bug by tagging it with something like "owner/Joey".