From: Benjamin Mako Hill <mako@atdot.cc>
Date: Fri, 18 Jul 2014 21:40:28 +0000 (-0700)
Subject: Merge branch 'patch-3' of github.com:nemobis/wikiq
X-Git-Url: https://projects.mako.cc/source/wikiq/commitdiff_plain/HEAD?hp=-c

Merge branch 'patch-3' of github.com:nemobis/wikiq
---

21341e70f9d509aeaaf0cb6a39caf56d704dc838
diff --combined wikiq.cpp
index 3451582,3351e2e..ad9ac48
--- a/wikiq.cpp
+++ b/wikiq.cpp
@@@ -528,7 -528,7 +528,7 @@@ void print_usage(char* argv[]) 
           << endl
           << "options:" << endl
           << "  -v   verbose mode prints text and comments after each line of tab separated data" << endl
-          << "  -n   name of the following regex for contet (e.g. -n name -r \"...\")" << endl
+          << "  -n   name of the following regex for content (e.g. -n name -r \"...\")" << endl
           << "  -r   regex to check against content of the revision" << endl
           << "  -N   name of the following regex for diffs (e.g. -N name -R \"...\")" << endl
           << "  -R   regex to check against diffs (i.e., additions and deletions)" << endl
@@@ -545,7 -545,7 +545,7 @@@
           << "unless the article is a revert to a previous revision, in which case, it" << endl
           << "contains the revision ID of the revision which was reverted to." << endl
           << endl
 -         << "authors: Erik Garrison <erik@hypervolu.me>" << endl;
 +         << "authors: Erik Garrison <erik@hypervolu.me>" << endl
           << "         Benjamin Mako Hill <mako@atdot.cc>" << endl;
  }