From 9ceac7ea426bf4aceb6aa260d10b83e3c7fe16d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sun, 2 Apr 2017 09:46:54 +0200
Subject: Fix Debian package lintian warnings

https://mentors.debian.net/package/vis
---
 main.c              | 6 +++---
 man/vis-clipboard.1 | 1 -
 man/vis-digraph.1   | 2 +-
 man/vis-menu.1      | 1 -
 man/vis.1           | 4 ++--
 sam.c               | 2 +-
 vis-text-objects.c  | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/main.c b/main.c
index 4bdb05c..c8fefaa 100644
--- a/main.c
+++ b/main.c
@@ -539,12 +539,12 @@ static const KeyAction vis_action[] = {
 	},
 	[VIS_ACTION_CURSOR_SEARCH_WORD_FORWARD] = {
 		"vis-motion-search-word-forward",
-		VIS_HELP("Move cursor to next occurence of the word under cursor")
+		VIS_HELP("Move cursor to next occurrence of the word under cursor")
 		movement, { .i = VIS_MOVE_SEARCH_WORD_FORWARD }
 	},
 	[VIS_ACTION_CURSOR_SEARCH_WORD_BACKWARD] = {
 		"vis-motion-search-word-backward",
-		VIS_HELP("Move cursor to previous occurence of the word under cursor")
+		VIS_HELP("Move cursor to previous occurrence of the word under cursor")
 		movement, { .i = VIS_MOVE_SEARCH_WORD_BACKWARD }
 	},
 	[VIS_ACTION_WINDOW_PAGE_UP] = {
@@ -779,7 +779,7 @@ static const KeyAction vis_action[] = {
 	},
 	[VIS_ACTION_OPERATOR_FILTER_FMT] = {
 		"vis-operator-filter-format",
-		VIS_HELP("Formating operator, filter range through fmt(1)")
+		VIS_HELP("Formatting operator, filter range through fmt(1)")
 		operator_filter, { .s = "|fmt" }
 	},
 	[VIS_ACTION_COUNT] = {
diff --git a/man/vis-clipboard.1 b/man/vis-clipboard.1
index 82a14f5..e745588 100644
--- a/man/vis-clipboard.1
+++ b/man/vis-clipboard.1
@@ -97,4 +97,3 @@ vis-clipboard --paste | curl -d - https://www.nsa.gov/
 .Xr vis 1 ,
 .Xr xclip 1 ,
 .Xr xsel 1
-.
diff --git a/man/vis-digraph.1 b/man/vis-digraph.1
index b55852f..e25f320 100644
--- a/man/vis-digraph.1
+++ b/man/vis-digraph.1
@@ -53,7 +53,7 @@ Digraph not recognised.
 .It 2
 Digraph is the beginning of an existing digraph, but does not correspond to a full digraph.
 .It 3
-An error occured and digraph could not be read or printed.
+An error occurred and digraph could not be read or printed.
 .El
 .
 .Sh SEE ALSO
diff --git a/man/vis-menu.1 b/man/vis-menu.1
index c1d2ab8..d0ca653 100644
--- a/man/vis-menu.1
+++ b/man/vis-menu.1
@@ -245,4 +245,3 @@ it was forked to become
 .Nm vis-menu
 to be distributed with
 .Xr vis 1 .
-.
diff --git a/man/vis.1 b/man/vis.1
index caf7da9..1e00711 100644
--- a/man/vis.1
+++ b/man/vis.1
@@ -223,7 +223,7 @@ It uses what POSIX refers to as
 .Dq Extended Regular Expressions
 as described in
 .Xr regex 7 .
-Additonally
+Additionally
 .Li \[rs]n
 and
 .Li \[rs]t
@@ -1162,7 +1162,7 @@ keys.
 .
 In order to facilitate usage of non-latin keyboard layouts,
 .Nm
-allows to map locale specific keys to their latin equivalents by means of the
+allows one to map locale specific keys to their latin equivalents by means of the
 .Pp
 .D1 Ic :langmap Ar locale-keys Ar latin-keys
 .Pp
diff --git a/sam.c b/sam.c
index 105d7b2..20c58b8 100644
--- a/sam.c
+++ b/sam.c
@@ -300,7 +300,7 @@ static const OptionDef options[] = {
 	[OPTION_ESCDELAY] = {
 		{ "escdelay" },
 		VIS_OPTION_TYPE_NUMBER,
-		VIS_HELP("Miliseconds to wait to distinguish <Escape> from terminal escape sequences")
+		VIS_HELP("Milliseconds to wait to distinguish <Escape> from terminal escape sequences")
 	},
 	[OPTION_AUTOINDENT] = {
 		{ "autoindent", "ai" },
diff --git a/vis-text-objects.c b/vis-text-objects.c
index af9aae2..467c101 100644
--- a/vis-text-objects.c
+++ b/vis-text-objects.c
@@ -61,7 +61,7 @@ static Filerange object_unpaired(Text *txt, size_t pos, char obj) {
 		text_iterator_byte_prev(&rit, NULL);
 	}
 
-	/* if there is no previous occurence on the same line, advance starting position */
+	/* if there is no previous occurrence on the same line, advance starting position */
 	if (!before) {
 		while (text_iterator_byte_get(&it, &c) && c != '\n') {
 			if (c == obj) {
-- 
cgit v1.2.3