web commit by http://adam.shand.net/

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

diff --git a/doc/tips/issue_tracking.mdwn b/doc/tips/issue_tracking.mdwn
index 276cfea013b6d83596bc5dd357e2786a01f76bb3..a39b93656e0cc2b63666373c03a977701c4ee21b 100644 (file)
--- a/doc/tips/issue_tracking.mdwn
+++ b/doc/tips/issue_tracking.mdwn
@@ -35,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


@@ -93,7 +93,7 @@ project's website. You can check the wiki-format text
 into revision control as part of the software project,
 and tie it into the build system using the Makefile.
 
 into revision control as part of the software project,
 and tie it into the build system using the Makefile.
 

-Ikiwiki can also be tied into the `post-commit` hook of your revision
+Ikiwiki can also be tied into the [[post-commit]] hook of your revision

 control system, so that whenever a developer commits a change to a wiki
 page in revision control, the project's web site is automatically updated.
 The [[ikiwiki_tutorial|setup]] explains in
 control system, so that whenever a developer commits a change to a wiki
 page in revision control, the project's web site is automatically updated.
 The [[ikiwiki_tutorial|setup]] explains in