aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrees <crees@FreeBSD.org>2013-02-09 20:00:52 +0800
committercrees <crees@FreeBSD.org>2013-02-09 20:00:52 +0800
commitb0094ebe661f0e88d3e6f639c7a985be0f597af3 (patch)
tree2de43f02a7adf2cde27a75528b780bbad6998d32
parent963f18a4bd4b61eb4d68e79b3e03b14c33b1de49 (diff)
downloadfreebsd-ports-gnome-b0094ebe661f0e88d3e6f639c7a985be0f597af3.tar.gz
freebsd-ports-gnome-b0094ebe661f0e88d3e6f639c7a985be0f597af3.tar.zst
freebsd-ports-gnome-b0094ebe661f0e88d3e6f639c7a985be0f597af3.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
-rwxr-xr-xTools/scripts/patchtool.py10
-rw-r--r--audio/baresip/Makefile.depends2
-rw-r--r--audio/maplay/files/patch-maplay.cc2
-rw-r--r--benchmarks/p5-Benchmark-Stopwatch/pkg-descr2
-rw-r--r--chinese/p5-Encode-HanConvert/pkg-descr2
-rw-r--r--deskutils/kbirthday/Makefile2
-rw-r--r--devel/bsdcflow/pkg-descr6
-rw-r--r--games/exmars/pkg-descr2
-rw-r--r--games/nonsense/files/nonsense.62
-rw-r--r--games/ruby-exmars/pkg-descr2
-rw-r--r--lang/pfe/pkg-descr2
-rw-r--r--lang/schemetoc/files/README.FreeBSD4
-rw-r--r--mail/gld/files/pkg-message.in2
-rw-r--r--mail/spfval/pkg-descr2
-rw-r--r--misc/xdelta/files/patch-configure2
-rw-r--r--net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html2
-rw-r--r--net/csync2/files/pkg-install.in2
-rw-r--r--net/netsed/files/patch-netsed.c2
-rw-r--r--net/ser/files/patch-modules::nathelper::nathelper.c2
-rw-r--r--ports-mgmt/managepkg/pkg-descr2
-rw-r--r--print/acrobatviewer/pkg-message2
-rw-r--r--print/rtf2latex/files/Makefile2
-rw-r--r--security/p5-Digest-Nilsimsa/pkg-descr2
-rw-r--r--security/vlog/files/patch-curses.c2
-rw-r--r--sysutils/boxbackup-devel/files/999.boxbackup.in2
-rw-r--r--sysutils/boxbackup/files/999.boxbackup.in2
-rw-r--r--sysutils/su2/pkg-descr4
-rw-r--r--textproc/mifluz/pkg-descr4
-rw-r--r--textproc/modlogan/files/patch-cssfile-writting2
-rw-r--r--www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch2
-rw-r--r--www/apache22/files/mpm-itk-20110321-012
-rw-r--r--www/limesurvey/Makefile2
-rw-r--r--x11-fonts/fontconfig/files/fc-query.12
33 files changed, 42 insertions, 42 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.
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index 58d6a6dfab86..d5ea40e05a72 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -3,7 +3,7 @@
ALSA_DEPEND= ${LOCALBASE}/include/alsa/asoundlib.h:${PORTSDIR}/audio/alsa-lib
BV32_DEPEND= # nonexistent
CELT_DEPEND= ${LOCALBASE}/include/celt/celt.h:${PORTSDIR}/audio/celt
-CONS_DEPEND= # unneccessary
+CONS_DEPEND= # unnecessary
EVDEV_DEPEND=
FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:${PORTSDIR}/multimedia/ffmpeg
G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:${PORTSDIR}/comms/spandsp
diff --git a/audio/maplay/files/patch-maplay.cc b/audio/maplay/files/patch-maplay.cc
index 13f2566cdc5a..ac553386fb82 100644
--- a/audio/maplay/files/patch-maplay.cc
+++ b/audio/maplay/files/patch-maplay.cc
@@ -172,7 +172,7 @@
if (range_violations)
{
- cerr << range_violations << " range violations have occured!\n";
-+ std::cerr << range_violations << " range violations have occured!\n";
++ std::cerr << range_violations << " range violations have occurred!\n";
if (stdout_mode)
- cerr << "If you notice these violations,\n";
+ std::cerr << "If you notice these violations,\n";
diff --git a/benchmarks/p5-Benchmark-Stopwatch/pkg-descr b/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
index da18320f2de1..4294a4f2503c 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
+++ b/benchmarks/p5-Benchmark-Stopwatch/pkg-descr
@@ -6,7 +6,7 @@ The stopwatch analogy is that at some point you get a new stopwatch
and start timing. Then you note certain events using lap. Finally you
stop the watch and then print out a summary.
-The summary shows all the events in order, what time they occured at,
+The summary shows all the events in order, what time they occurred at,
how long since the last lap and the percentage of the total time.
Hopefully this will give you a good idea of where your code is
spending most of its time.
diff --git a/chinese/p5-Encode-HanConvert/pkg-descr b/chinese/p5-Encode-HanConvert/pkg-descr
index 311a7be98422..4996de705884 100644
--- a/chinese/p5-Encode-HanConvert/pkg-descr
+++ b/chinese/p5-Encode-HanConvert/pkg-descr
@@ -1,4 +1,4 @@
-This module is an attempt to solve most common problems occured in
+This module is an attempt to solve most common problems occurred in
Traditional vs. Simplified Chinese conversion, in an efficient,
flexible way, without resorting to external tools or modules.
diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile
index 2cd8967583f4..2114df351517 100644
--- a/deskutils/kbirthday/Makefile
+++ b/deskutils/kbirthday/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
# may or may not solve the alpha compilation issue....
CONFIGURE_ARGS= --with-pic
-# necesary to access the second master site by getting rid of the default switch -A
+# necessary to access the second master site by getting rid of the default switch -A
FETCH_CMD ?=/usr/bin/fetch -Rr
post-patch:
diff --git a/devel/bsdcflow/pkg-descr b/devel/bsdcflow/pkg-descr
index 60569386260c..e6413eb98e6d 100644
--- a/devel/bsdcflow/pkg-descr
+++ b/devel/bsdcflow/pkg-descr
@@ -1,5 +1,5 @@
cflow reads files as C or assembler program source and prints a graph
-a graph of the function call hierarchy. Called functions are indented
-according to their caller-callee relationship, in the order of occurance.
+of the function call hierarchy. Called functions are indented according
+to their caller-callee relationship, in the order of occurrence.
-WWW: http://www.sysfault.org/projects
+WWW: http://www.sysfault.org/projects
diff --git a/games/exmars/pkg-descr b/games/exmars/pkg-descr
index bba9ddad3eda..a2e2a1856bc1 100644
--- a/games/exmars/pkg-descr
+++ b/games/exmars/pkg-descr
@@ -8,7 +8,7 @@ everything with a high level interface for Ruby.
The resulting program has the following main features:
-* Uses the parser from pMARS, so no previous parsing is neccessary. At first
+* Uses the parser from pMARS, so no previous parsing is necessary. At first
this was my main motivation for exMARS.
* Speed: 50% faster than pmars on a Pentium III, and often more than twice as
fast than pmars on a Pentium 4 (using gcc 3.3.1, and the same compiler
diff --git a/games/nonsense/files/nonsense.6 b/games/nonsense/files/nonsense.6
index a36569cb8461..16112217fe28 100644
--- a/games/nonsense/files/nonsense.6
+++ b/games/nonsense/files/nonsense.6
@@ -233,7 +233,7 @@ So, for instance,
{@A}
would be replaced with the current day of the week.
.It {@strftime format|number1|number2}
-Same as above, but uses the date/time that occured X seconds ago,
+Same as above, but uses the date/time that occurred X seconds ago,
where X is a random number between
.Ar number1
and
diff --git a/games/ruby-exmars/pkg-descr b/games/ruby-exmars/pkg-descr
index 019ebf9f62c0..857c38bc2937 100644
--- a/games/ruby-exmars/pkg-descr
+++ b/games/ruby-exmars/pkg-descr
@@ -8,7 +8,7 @@ everything with a high level interface for Ruby.
The resulting program has the following main features:
-* Uses the parser from pMARS, so no previous parsing is neccessary. At first
+* Uses the parser from pMARS, so no previous parsing is necessary. At first
this was my main motivation for exMARS.
* Speed: 50% faster than pmars on a Pentium III, and often more than twice as
fast than pmars on a Pentium 4 (using gcc 3.3.1, and the same compiler
diff --git a/lang/pfe/pkg-descr b/lang/pfe/pkg-descr
index 8c98155afaa3..9a0b0eba2ca6 100644
--- a/lang/pfe/pkg-descr
+++ b/lang/pfe/pkg-descr
@@ -1,4 +1,4 @@
-This package contains all neccessary ANSI-C source files to build a
+This package contains all necessary ANSI-C source files to build a
running Forth-environment on most UNIX machines, on DOS and on OS/2.
The Forth-system is closely modeled along the new American National
diff --git a/lang/schemetoc/files/README.FreeBSD b/lang/schemetoc/files/README.FreeBSD
index b5ce58b47a54..f05ffa3713b0 100644
--- a/lang/schemetoc/files/README.FreeBSD
+++ b/lang/schemetoc/files/README.FreeBSD
@@ -10,13 +10,13 @@ The syntax of the scc compiler has been extended to automatically
use dynamic linking unless the -static flag is specified on the scc
command line.
-For compiling exectables on the command line from only object files
+For compiling executables on the command line from only object files
it has no method of knowing if you need the X library linked in,
and will by default not. So, if you are building an application
written for scheme->c which needs X support (such as ezd), you
will need to supply a -lX11 flag on the command line. If you are
compiling a single scheme file(not an object file) which has the
-(with xlib) line in the module statement it is not neccesary to
+(with xlib) line in the module statement it is not necessary to
include -lX11.
Those not wishing to use the X library support can delete the following
diff --git a/mail/gld/files/pkg-message.in b/mail/gld/files/pkg-message.in
index 18dd2b9ead3f..3a4f62465f62 100644
--- a/mail/gld/files/pkg-message.in
+++ b/mail/gld/files/pkg-message.in
@@ -4,7 +4,7 @@
gld_enable="YES"
- To complete the installation, you need to create the neccesary
+ To complete the installation, you need to create the necessary
database and tables. An example configuration file is available in
%%PREFIX%%/etc/gld.conf-dist. For more information see the
documentation in %%DOCSDIR%%/share/doc/gld.
diff --git a/mail/spfval/pkg-descr b/mail/spfval/pkg-descr
index 20a44970642b..0314082d5b20 100644
--- a/mail/spfval/pkg-descr
+++ b/mail/spfval/pkg-descr
@@ -4,4 +4,4 @@ SPF records. Simply pass the validator a string and it will see if it validates
as an SPFv1 or SPF-Classic record.
If an error is found, it tries its best to report the error in question and the
-specific location in the record where the error occured.
+specific location in the record where the error occurred.
diff --git a/misc/xdelta/files/patch-configure b/misc/xdelta/files/patch-configure
index fa3368c657fd..509a117b02ab 100644
--- a/misc/xdelta/files/patch-configure
+++ b/misc/xdelta/files/patch-configure
@@ -341,7 +341,7 @@
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
-+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
++ echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
diff --git a/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html b/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
index 23128f830008..471f38d4dae7 100644
--- a/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
+++ b/net-mgmt/nagios-check_netsnmp/files/check_netsnmp.html
@@ -21,7 +21,7 @@ href="http://net-snmp.sourceforge.net/">net-snmp</a> package, provides
a convenient way to collect this information and export it by means of
SNMP protocol. It also allows one to specify the critical values for
the above parameters and automatically sets error flag to indicate the
-error occured and provides error message which describes it.
+error occurred and provides error message which describes it.
Using <code>snmpd</code> it is also possible to execute custom scripts
which allows to monitor parameters which are not available in standard
mibs.
diff --git a/net/csync2/files/pkg-install.in b/net/csync2/files/pkg-install.in
index afbe4f364b60..ae42495104e8 100644
--- a/net/csync2/files/pkg-install.in
+++ b/net/csync2/files/pkg-install.in
@@ -21,7 +21,7 @@ create_cert() {
rm -f /tmp/csync2_ssl_cert.csr
if [ ${code} -ne 0 ]; then
- echo "csync2: OpenSSL error occured:"
+ echo "csync2: OpenSSL error occurred:"
echo
cat ${_errlog}
echo
diff --git a/net/netsed/files/patch-netsed.c b/net/netsed/files/patch-netsed.c
index cab0a91ebbdc..ed5fc3d88a06 100644
--- a/net/netsed/files/patch-netsed.c
+++ b/net/netsed/files/patch-netsed.c
@@ -20,7 +20,7 @@
+ ERR("be passed using HTTP-alike hex escape sequences (eg. CRLF -> %%0a%%0d).\n");
+ ERR("Single '%%' can be reached by using '%%%%'. Examples:\n\n");
+ ERR(" 's/andrew/mike/1' - replace 'andrew' with 'mike' (once)\n");
-+ ERR(" 's/andrew/mike' - replace all occurences of 'andrew' with 'mike'\n");
++ ERR(" 's/andrew/mike' - replace all occurrences of 'andrew' with 'mike'\n");
+ ERR(" 's/andrew/mike%%00' - replace 'andrew' with 'mike\\x00' (to keep orig. size)\n");
ERR(" 's/%%%%/%%2f/20' - replace '%%' with '/' in first 20 packets\n\n");
ERR("Rules are not working on cross-packet boundaries and are evaluated from\n");
diff --git a/net/ser/files/patch-modules::nathelper::nathelper.c b/net/ser/files/patch-modules::nathelper::nathelper.c
index e64495c468e9..d85865e0eaa0 100644
--- a/net/ser/files/patch-modules::nathelper::nathelper.c
+++ b/net/ser/files/patch-modules::nathelper::nathelper.c
@@ -1259,7 +1259,7 @@ $FreeBSD$
+ /*
+ * Having such data, but not at line beginning.
+ * Skip them and reiterate. ser_memmem() will find next
-+ * occurence.
++ * occurrence.
+ */
+ if (plimit - cp1 < 2)
+ return NULL;
diff --git a/ports-mgmt/managepkg/pkg-descr b/ports-mgmt/managepkg/pkg-descr
index 568903156d13..2c1cae7e1116 100644
--- a/ports-mgmt/managepkg/pkg-descr
+++ b/ports-mgmt/managepkg/pkg-descr
@@ -1,5 +1,5 @@
This script runs though the complete ports tree without stopping after a make
-error occured.
+error occurred.
If you call make with any parameter in one of the directories of the ports tree
in FreeBSD the run will stop if make returns with a code bigger than zero. That
means, that it is (in opposite to NetBSD or OpenBSD impossible to run a echo
diff --git a/print/acrobatviewer/pkg-message b/print/acrobatviewer/pkg-message
index f39ad5034182..c547b201dbf2 100644
--- a/print/acrobatviewer/pkg-message
+++ b/print/acrobatviewer/pkg-message
@@ -1,5 +1,5 @@
Please advise all your users intended to use Acrobat Viewer to create
-"~/AcrobatFonts" directory, which is neccessary for Acrobat Viewer to normally
+"~/AcrobatFonts" directory, which is necessary for Acrobat Viewer to normally
save its configuration data.
diff --git a/print/rtf2latex/files/Makefile b/print/rtf2latex/files/Makefile
index f1985ea98d9a..dc631a96ce48 100644
--- a/print/rtf2latex/files/Makefile
+++ b/print/rtf2latex/files/Makefile
@@ -18,7 +18,7 @@ PREFIX?=/usr/local
# want to specify this for ULTRIX - ULTRIX has both, strchr and index but
# lacks prototypes for the latter.
#
-# uncomment this line and delete unneccesary flags if needed.
+# uncomment this line and delete unnecessary flags if needed.
#XCFLAGS=-DNO_MALLOC_H -DSTDARG -DVARARGS -DSYSV
#XCFLAGS = -DSYSV
diff --git a/security/p5-Digest-Nilsimsa/pkg-descr b/security/p5-Digest-Nilsimsa/pkg-descr
index b4779313c304..61c929438005 100644
--- a/security/p5-Digest-Nilsimsa/pkg-descr
+++ b/security/p5-Digest-Nilsimsa/pkg-descr
@@ -1,4 +1,4 @@
-A nilsimsa signature is a statistic of n-gram occurance in a piece of text.
+A nilsimsa signature is a statistic of n-gram occurrence in a piece of text.
It is a 256 bit value usually represented in hex. This module is a wrapper
around nilsimsa implementation in C by cmeclax.
diff --git a/security/vlog/files/patch-curses.c b/security/vlog/files/patch-curses.c
index 7bb9e4c577ce..4eb12a0c429d 100644
--- a/security/vlog/files/patch-curses.c
+++ b/security/vlog/files/patch-curses.c
@@ -34,7 +34,7 @@
+ arrows move the window one line 0 scroll window to leftmost\n\
+ h,j,k,l in either direction. \n\
+ H,J,K,L Caps move faster. /,? search a regexp forward/backward\n\
-+ b,space back, forward 1 page n,N goto next/previous occurence\n\
++ b,space back, forward 1 page n,N goto next/previous occurrence\n\
+PgUp/Down these work on XFree only >,< goto next/previous day boundary\n\
+ ],[ goto next/previous marked line\n\
+--------- MISC KEYS ---------------- \n\
diff --git a/sysutils/boxbackup-devel/files/999.boxbackup.in b/sysutils/boxbackup-devel/files/999.boxbackup.in
index 989d62d6b3e2..e620fa306ca9 100644
--- a/sysutils/boxbackup-devel/files/999.boxbackup.in
+++ b/sysutils/boxbackup-devel/files/999.boxbackup.in
@@ -49,7 +49,7 @@ case "$monthly_boxbackup_compare_enable" in
# Return codes:
# 1 Comparison was exact
# 2 Differences were found
- # 3 An error occured
+ # 3 An error occurred
if [ $? -eq 2 ]; then
echo
echo "Differences were found. Please check the output."
diff --git a/sysutils/boxbackup/files/999.boxbackup.in b/sysutils/boxbackup/files/999.boxbackup.in
index 989d62d6b3e2..e620fa306ca9 100644
--- a/sysutils/boxbackup/files/999.boxbackup.in
+++ b/sysutils/boxbackup/files/999.boxbackup.in
@@ -49,7 +49,7 @@ case "$monthly_boxbackup_compare_enable" in
# Return codes:
# 1 Comparison was exact
# 2 Differences were found
- # 3 An error occured
+ # 3 An error occurred
if [ $? -eq 2 ]; then
echo
echo "Differences were found. Please check the output."
diff --git a/sysutils/su2/pkg-descr b/sysutils/su2/pkg-descr
index e36da0da834f..c0d1aa9fe416 100644
--- a/sysutils/su2/pkg-descr
+++ b/sysutils/su2/pkg-descr
@@ -1,7 +1,7 @@
From the README:
su2 is a great program for anyone that has anything to do with
-system adiministration. su2 gives you the ability to masquerade with
+system administration. su2 gives you the ability to masquerade with
the UID of other users. You use own password to switch. Probably the
biggest benefit of su2 is that you retain your own customized shell
environment.
@@ -12,7 +12,7 @@ than this. Regular users can put a .su2rc file in their home
directory to enable other users to become them. While this may sound
odd, it is sometimes useful to allow a number of users to masquerade
around with the uid of restricted accounts. One such example of this
-is a 'www' account which is a common occurance with the proliferation
+is a 'www' account which is a common occurrence with the proliferation
of the web. While the www user's password may be starred out to
disable direct logins, root could put a set of usernames into
~www/.su2rc to enable these users to 'become' www and do Web
diff --git a/textproc/mifluz/pkg-descr b/textproc/mifluz/pkg-descr
index d4061eca07c8..a834a847e875 100644
--- a/textproc/mifluz/pkg-descr
+++ b/textproc/mifluz/pkg-descr
@@ -4,12 +4,12 @@ indexed text for the index. It is simple because it provides only
a few basic functionalities. It does not contain document parsers
(HTML, PDF etc...). It does not contain a full text query parser.
It does not provide result display functions or other user friendly
-stuff. It only provides functions to store word occurences and retrieve
+stuff. It only provides functions to store word occurrences and retrieve
them. The fact that it uses 50% of the size of the indexed text is
rather atypical. Most well known full text indexing systems only use
30%. The advantage GNU mifluz has over most full text indexing systems
is that it is fully dynamic (update, delete, insert), uses only a
-controled amount of memory while resolving a query, has higher upper
+controlled amount of memory while resolving a query, has higher upper
limits and has a simple storage scheme. Consuming more disk space
allows all this.
diff --git a/textproc/modlogan/files/patch-cssfile-writting b/textproc/modlogan/files/patch-cssfile-writting
index a34c1d02f433..c5d1f3ed4f06 100644
--- a/textproc/modlogan/files/patch-cssfile-writting
+++ b/textproc/modlogan/files/patch-cssfile-writting
@@ -47,7 +47,7 @@ diff -u -u -r1.100 generate.c
+
+ ret = unlink(filename);
+ if(ret == 0 || (ret == -1 && errno == ENOENT)) {
-+ /* If no error occured or the file didn't existed: link it. */
++ /* If no error occurred or the file didn't existed: link it. */
+
+ ret = symlink(conf->cssfile, filename);
+ if (ret != 0) {
diff --git a/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch b/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
index 4a2c058c89c8..da5714e85685 100644
--- a/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
+++ b/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0.patch
@@ -2007,7 +2007,7 @@ diff -Nur httpd-2.2.3/server/mpm/experimental/peruser/peruser.c httpd-2.2.3-peru
+ SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */
+
+ if (status == APR_EGENERAL) {
-+ /* resource shortage or should-not-occur occured */
++ /* resource shortage or should-not-occur occurred */
+ clean_child_exit(1);
+ }
+ else if (status != APR_SUCCESS || die_now) {
diff --git a/www/apache22/files/mpm-itk-20110321-01 b/www/apache22/files/mpm-itk-20110321-01
index 25ad065c3412..45f79a492eda 100644
--- a/www/apache22/files/mpm-itk-20110321-01
+++ b/www/apache22/files/mpm-itk-20110321-01
@@ -748,7 +748,7 @@ unchanged:
+ SAFE_ACCEPT(accept_mutex_off()); /* unlock after "accept" */
+
+ if (status == APR_EGENERAL) {
-+ /* resource shortage or should-not-occur occured */
++ /* resource shortage or should-not-occur occurred */
+ clean_child_exit(1);
+ }
+ else if (status != APR_SUCCESS) {
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index e0d1419dec49..14a283b29efe 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -28,7 +28,7 @@ ZIP_DESC= Install PHP zip extension
USE_PGSQL= yes
USE_PHP= pgsql
.else
-# server is not neccesery on this host.
+# server is not necessary on this host.
#USE_MYSQL= server
USE_MYSQL= client
USE_PHP= mysql
diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1
index a6e6e47a9387..38dbaa43bef8 100644
--- a/x11-fonts/fontconfig/files/fc-query.1
+++ b/x11-fonts/fontconfig/files/fc-query.1
@@ -39,7 +39,7 @@ Query \fIfont-file\fR for font faces.
.SH "RETURN CODES"
.PP
\fBfc-query\fR returns error code 0 for successful parsing,
-or 1 if any errors occured or if at least one font face could not be opened.
+or 1 if any errors occurred or if at least one font face could not be opened.
.SH "SEE ALSO"
.PP
\fBfc-scan\fR(1)