web commit by JoshTriplett: Use inline code blocks for formbuilder_setup, to avoid...

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

diff --git a/doc/tips/issue_tracking.mdwn b/doc/tips/issue_tracking.mdwn
index 6705e5936fb818af951282202261582042d258db..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
@@ -18,7 +19,7 @@ described by the term "wiki compiler". Just as a
 typical software project consists of source code
 that is stored in revision control and compiled with
 `make` and `gcc`, an ikiwiki-based wiki is stored as
-human editable source in a revision control system,
+human-editable source in a revision control system,
 and built into HTML using ikiwiki.
 
 Ikiwiki uses your revision control system to track
@@ -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
@@ -54,7 +55,8 @@ The simplest way to use ikiwiki is to build static
 HTML files from source wiki files. This example builds
 a wiki for an imaginary software project.  The wiki
 source files used in this example are available in the
-[[examples/softwaresite]] section of ikiwiki's documentation.
+[[examples/softwaresite|examples/softwaresite]] section
+of ikiwiki's documentation.
 
        wiki$ ls
        Makefile  bugs.mdwn     doc/      download.mdwn  news/
@@ -128,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
-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".