[Pkg-gnupg-commit] [gnupg2] 28/292: doc: Eliminate inconsistent UK English.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 825c1dfb3ee4c1704f42eaf064161b9731c20134
Author: Ineiev <ineiev at gnu.org>
Date:   Fri Mar 4 16:00:51 2016 +0000

    doc: Eliminate inconsistent UK English.
    
    * doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
    doc/tools.texi: Fix.
---
 doc/dirmngr.texi   | 2 +-
 doc/gpg-agent.texi | 4 ++--
 doc/scdaemon.texi  | 2 +-
 doc/tools.texi     | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 7b5c7e7..0f37cc4 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -196,7 +196,7 @@ however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
 any time without notice.  FLAGS are bit encoded and may be given in
 usual C-Syntax.
 
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index b99dc5f..8176b37 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -230,7 +230,7 @@ however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
 any time without notice.  FLAGS are bit encoded and may be given in
 usual C-Syntax. The currently defined bits are:
 
@@ -366,7 +366,7 @@ version of the used Pinentry.
 @opindex ignore-cache-for-signing
 This option will let @command{gpg-agent} bypass the passphrase cache for all
 signing operation.  Note that there is also a per-session option to
-control this behaviour but this command line option takes precedence.
+control this behavior but this command line option takes precedence.
 
 @item --default-cache-ttl @var{n}
 @opindex default-cache-ttl
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 3ab44ae..3728d96 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -160,7 +160,7 @@ helpers to debug problems.
 
 @item --debug @var{flags}
 @opindex debug
-This option is only useful for debugging and the behaviour may change at
+This option is only useful for debugging and the behavior may change at
 any time without notice.  FLAGS are bit encoded and may be given in
 usual C-Syntax. The currently defined bits are:
 
diff --git a/doc/tools.texi b/doc/tools.texi
index d6e130f..1cb992e 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -422,8 +422,8 @@ is de-escaped by replacing all occurrences of @code{%XY} by the byte
 that has the hexadecimal value @code{XY}.  @code{X} and @code{Y} are
 from the set @code{0-9a-f}.
 
- at item localised
-Some fields contain strings that are described to be @emph{localised}.
+ at item localized
+Some fields contain strings that are described to be @emph{localized}.
 Such strings are translated to the active language and formatted in
 the active character set.
 
@@ -804,7 +804,7 @@ error and abort the operation.
 @item argname
 This field is only defined for options with an argument type
 @var{type} that is not @code{0}.  In this case it may contain a
- at emph{percent-escaped} and @emph{localised string} that gives a short
+ at emph{percent-escaped} and @emph{localized string} that gives a short
 name for the argument.  The field may also be empty, though, in which
 case a short name is not known.
 

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