[Pkg-cgit-commits] [pkg-cgit] 13/18: Fix spelling

[Peter Colberg]

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository pkg-cgit.

commit 645c6950ac0f86af9100e2a32720b70ef60f2757
Author: Peter Colberg <peter at colberg.org>
Date:   Fri Jun 10 10:37:56 2016 -0400

    Fix spelling
---
 debian/patches/fix-spelling-in-man-page.patch | 25 ++++++++++++++++++++++++
 debian/patches/fix-spelling-of-occurred.patch | 28 +++++++++++++++++++++++++++
 debian/patches/series                         |  2 ++
 3 files changed, 55 insertions(+)

diff --git a/debian/patches/fix-spelling-in-man-page.patch b/debian/patches/fix-spelling-in-man-page.patch
new file mode 100644
index 0000000..908a3df
--- /dev/null
+++ b/debian/patches/fix-spelling-in-man-page.patch
@@ -0,0 +1,25 @@
+Description: Fix spelling in man page
+Author: Peter Colberg <peter at colberg.org>
+Forwarded: https://lists.zx2c4.com/pipermail/cgit/2016-June/003093.html
+Last-Update: 2016-06-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cgitrc.5.txt
++++ b/cgitrc.5.txt
+@@ -676,14 +676,14 @@
+ 	expected on standard output.
+ 
+ email filter::
+-	This filter is given two parameters: the email address of the relevent
++	This filter is given two parameters: the email address of the relevant
+ 	author and a string indicating the originating page. The filter will
+ 	then receive the text string to format on standard input and is
+ 	expected to write to standard output the formatted text to be included
+ 	in the page.
+ 
+ owner filter::
+-	This filter is given no arguments.  The owner text is avilable on
++	This filter is given no arguments.  The owner text is available on
+ 	standard input and the filter is expected to write to standard
+ 	output.  The output is included in the Owner column.
+ 
diff --git a/debian/patches/fix-spelling-of-occurred.patch b/debian/patches/fix-spelling-of-occurred.patch
new file mode 100644
index 0000000..50bfefc
--- /dev/null
+++ b/debian/patches/fix-spelling-of-occurred.patch
@@ -0,0 +1,28 @@
+Description: Fix spelling of "occurred"
+Author: Peter Colberg <peter at colberg.org>
+Forwarded: https://marc.info/?l=git&m=146556912105322&w=2
+Last-Update: 2016-06-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/git/config.c
++++ b/git/config.c
+@@ -1274,7 +1274,7 @@
+ 		 * something went really wrong and we should stop
+ 		 * immediately.
+ 		 */
+-		die(_("unknown error occured while reading the configuration files"));
++		die(_("unknown error occurred while reading the configuration files"));
+ }
+ 
+ static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
+--- a/git/refs.h
++++ b/git/refs.h
+@@ -345,7 +345,7 @@
+  *     msg -- a message describing the change (for the reflog).
+  *
+  *     err -- a strbuf for receiving a description of any error that
+- *         might have occured.
++ *         might have occurred.
+  *
+  * The functions make internal copies of refname and msg, so the
+  * caller retains ownership of these parameters.
diff --git a/debian/patches/series b/debian/patches/series
index 09d9632..5cef807 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ add-hardening.patch
 assume-highlight-version-3-in-filter-script.patch
 add-highlighting-rules-to-cgit.css.patch
 use-debian-binary-name-rst2html.patch
+fix-spelling-in-man-page.patch
+fix-spelling-of-occurred.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cgit/pkg-cgit.git