aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2013-02-09 12:00:52 +0000
committerChris Rees <crees@FreeBSD.org>2013-02-09 12:00:52 +0000
commit0dd757920977efb2456287e8d7920b3822c5bbe4 (patch)
tree2de43f02a7adf2cde27a75528b780bbad6998d32 /Tools
parent3bd68caae6f1f5f5a640f544bb3bc8bb194a055c (diff)
downloadports-0dd757920977efb2456287e8d7920b3822c5bbe4.tar.gz
ports-0dd757920977efb2456287e8d7920b3822c5bbe4.zip
Various spelling corrections
PR: ports/175331 Submitted by: Christoph Mallon Approved by: No objections within three weeks from any maintainer While here, style and duplicate phrase fixes in bsdcflow pkg-descr Submitted by: mi
Notes
Notes: svn path=/head/; revision=311969
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/patchtool.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
index 21545e007dd4..65d7b533f196 100755
--- a/Tools/scripts/patchtool.py
+++ b/Tools/scripts/patchtool.py
@@ -171,7 +171,7 @@ def getrelpath(path, wrksrc):
#
-# Generare a diff between saved and current versions of the file pointed by the
+# Generate a diff between saved and current versions of the file pointed by the
# wrksrc+path. Apply heuristics to locate saved version of the file in question
# and if it fails assume that file is new, so /dev/null is to be used as
# original file. Optionally save generated patch into `outfile' instead of
@@ -204,7 +204,7 @@ def gendiff(path, wrksrc, outfile = ''):
exitval = pipe.wait()
if exitval == 0: # No differences were found
retval = False
- retmsg = 'no differencies found between original and current ' \
+ retmsg = 'no differences found between original and current ' \
'version of "%s"' % fullpath
elif exitval == 1: # Some differences were found
if (outfile != ''):
@@ -218,7 +218,7 @@ def gendiff(path, wrksrc, outfile = ''):
sys.stdout.writelines(outbuf)
retval = True
retmsg = ''
- else: # Error occured
+ else: # Error occurred
raise ECmdError('"%s"' % cmdline, \
'external command returned non-zero error code')
# Not reached #
@@ -229,7 +229,7 @@ def gendiff(path, wrksrc, outfile = ''):
#
# Automatically generate a name for a patch based on its path relative to
-# wrksrc. Use simple scheme to ensute 1-to-1 mapping between path and
+# wrksrc. Use simple scheme to ensure 1-to-1 mapping between path and
# patchname - replace all '_' with '__' and all '/' with '_'.
#
def makepatchname(path, patchdir = ''):
@@ -615,7 +615,7 @@ def generate(args, automatic, force, ignoremtime):
# is encountered, all patches that belong to the port are updated. If no
# arguments are supplied - current directory is assumed.
#
-# The procedure homours last modification times of the patchfile, file from
+# The procedure honours last modification times of the patchfile, file from
# which diff to be generated and `EXTRACT_COOKIE' file (usually
# ${WRKDIR}/.extract_cookie) to update only those patches that are really need
# to be updated.