Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 clsync (0.2.1-1) unstable; urgency=low
 .
   * New upstream version
Author: Barak A. Pearlmutter <bap@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- clsync-0.2.1.orig/main.c
+++ clsync-0.2.1/main.c
@@ -1213,7 +1213,7 @@ int main(int argc, char *argv[]) {
 			options.flags[MODE] == MODE_RSYNCSO
 		)
 	) {
-		printf_e("Error: main(): Option \"--have-recursive-sync\" with nodes \"rsyncdirect\", \"rsyncshell\" and \"rsyncso\" are incompatable.\n");
+		printf_e("Error: main(): Option \"--have-recursive-sync\" with nodes \"rsyncdirect\", \"rsyncshell\" and \"rsyncso\" are incompatible.\n");
 		ret = EINVAL;
 	}
 
@@ -1230,7 +1230,7 @@ int main(int argc, char *argv[]) {
 			options.flags[MODE] == MODE_RSYNCSO
 		)
 	) {
-		printf_e("Error: main(): Option \"--synclist-simplify\" with nodes \"rsyncdirect\" and \"rsyncshell\" are incompatable.\n");
+		printf_e("Error: main(): Option \"--synclist-simplify\" with nodes \"rsyncdirect\" and \"rsyncshell\" are incompatible.\n");
 		ret = EINVAL;
 	}
 
--- clsync-0.2.1.orig/man/man1/clsync.1
+++ clsync-0.2.1/man/man1/clsync.1
@@ -288,7 +288,7 @@ If you're using this option (but no \-\-
 will write neither includes nor excludes of content of mount points.
 .br
 This may cause problems e.g. you're using rsync for sync-handler without
-similar option "--one-file-system".
+similar option "\-\-one\-file\-system".
 
 Is not set by default.
 .RE
@@ -602,7 +602,7 @@ as an error. You can set multiple ignore
 times.
 
 Recommended values for rsync case is "24". You can set multiple values with
-listing a lot of "-x" options (e.g. "\-x 23 \-x 24") or via commas
+listing a lot of "\-x" options (e.g. "\-x 23 \-x 24") or via commas
 (e.g. "\-x 23,24"). To drop the list use zero exitcode (e.g. "\-x 0"). For
 example you can use "\-x 0,23" to drop the list and set "23"-th exitcode to
 be ignored.
@@ -1103,7 +1103,7 @@ It's not recommended to use
 .I w
 rules in modes "rsyncdirect", "rsyncshell" and "rsyncso".
 .BR rsync (1)
-allows to set syncing and walking only together in "\-\-include" rules
+allows one to set syncing and walking only together in "\-\-include" rules
 ("\-\-files\-from" is not appropriate due to problem with syncing files
 deletions). So there may be problems with clsync's
 .I w
@@ -1125,7 +1125,7 @@ Syncing pwdb files and sshd_config (non-
 .br
 	+w^/ssh$
 .br
-	-*
+	\-*
 .RE
 
 Syncing pwdb files and sshd_config (non-rsync case with option
@@ -1161,9 +1161,9 @@ Syncing pwdb files and sshd_config (rsyn
 
 Syncing /srv/lxc tree (rsync case):
 .RS
-	-d/sess(ion)?s?$
+	\-d/sess(ion)?s?$
 .br
-	-f/tmp/
+	\-f/tmp/
 .br
 	+*
 .RE
@@ -1272,7 +1272,7 @@ reads only one configuration file. In ot
 .I \-\-config\-file
 is not set and file
 .B ~/.clsync.conf
-is accessable and parsable,
+is accessible and parsable,
 .B clsync
 will not try to open
 .BR /etc/clsync/clsync.conf .
