[SCM] Debian package checker branch, master, updated. 2.5.4-171-ga1d9f6c
The following commit has been merged in the master branch:
commit a1d9f6c6d5e6342343f6630f29ba19f19db668ec
Author: Niels Thykier <niels@thykier.net>
Date: Sun Feb 19 20:27:33 2012 +0100
Fix some typoes and misuses of "i.e."
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/doc/README.developers b/doc/README.developers
index fd2ae6d..361bb6c 100644
--- a/doc/README.developers
+++ b/doc/README.developers
@@ -118,11 +118,11 @@ Note that the laboratory is usually abbreviated to "Lab".
=item Overridden (Tag)
-Tag that was overriden by the maintainer. Usually it means that the
+Tag that was overridden by the maintainer. Usually it means that the
maintainer believes Lintian misdiagnosed the issue. In some cases it
is also used for tags that does not handle "corner-cases"
-Overriden tags are not displayed by default, but they are still
+Overridden tags are not displayed by default, but they are still
counted in statistics. This should not be confused with "Suppressed".
=item Suppressed (Tag)
@@ -130,7 +130,7 @@ counted in statistics. This should not be confused with "Suppressed".
Tags that are suppressed cannot be emitted.
Note that suppressed tags are ignored by Lintian, so they are not
-counted in statistics. Not to be confused with "Overriden".
+counted in statistics. Not to be confused with "Overridden".
=item Tag
@@ -158,10 +158,10 @@ shell snippet can be used for this purpose:
Beware of two things: If LINTIAN_ROOT is not set, Lintian will attempt to
use the code from the installed version (in /usr/share/lintian).
-The other issue is that Lintian needs a en_US.UTF-8 locale, so if this is
-absent, it may trigger some issues with some (i.e. manpage) checks. Lintian
-currently generates a private locale when the test-suite is run and if Lintian
-is installed.
+The other issue is that Lintian needs a C.UTF-8 (or an en_US.UTF-8)
+locale, so if this is absent, it may trigger some issues with some
+(e.g. manpage) checks. Lintian currently generates a private locale
+when the test-suite is run and if Lintian is installed.
=head3 Running tests
diff --git a/man/lintian.pod.in b/man/lintian.pod.in
index ff138ae..1c93aa6 100644
--- a/man/lintian.pod.in
+++ b/man/lintian.pod.in
@@ -569,14 +569,14 @@ configuration file; please refer to the individual options in
L</OPTIONS>.
In the configuration file, all options listed must have a value, even
-if they do not accept a value on command line (i.e. --pedantic). The
+if they do not accept a value on command line (e.g. --pedantic). The
values "yes", "y", "1", or "true" will enable such a option and "no",
"n", "0" or "false" will disable it. Prior to the 2.5.2 release,
these values were case sensitive.
For other options, they generally take the same values as they do on
the command line. Though some options allow a slightly different
-format (i.e. --display-level); these exceptions are explained for the
+format (e.g. --display-level). These exceptions are explained for the
relevant options in L</OPTIONS>.
Beyond command line options, it is also allowed to specify the
@@ -670,7 +670,7 @@ packages or when type is "GROUP".
Note: For changes packages, this must match the contents of the
architecture field in the changes. This field may contain a space
-(i.e. "source all") and therefore may also need proper shell escape.
+(e.g. "source all") and therefore may also need proper shell escape.
=back
--
Debian package checker
Reply to: