From 3a370505d4b6418909b381c5d131837132ca25cd Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Fri, 12 Jan 2018 13:11:05 +0100
Subject: [PATCH] Equvivalent and equivalent are not equivalent.
---
lib/7.8/modules/Crypto.pmod/RSA.pike | 2 +-
lib/modules/Array.pmod | 2 +-
lib/modules/Stdio.pmod/Terminfo.pmod | 2 +-
lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike | 2 +-
src/builtin_functions.c | 2 +-
src/cpp.c | 8 ++++----
src/modules/Java/jvm.c | 2 +-
src/modules/Math/module.pmod.in | 2 +-
src/modules/system/system.c | 2 +-
src/pike_embed.c | 4 ++--
src/program.c | 4 ++--
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/7.8/modules/Crypto.pmod/RSA.pike b/lib/7.8/modules/Crypto.pmod/RSA.pike
index f8d69db281..cddbec8e84 100644
--- a/lib/7.8/modules/Crypto.pmod/RSA.pike
+++ b/lib/7.8/modules/Crypto.pmod/RSA.pike
@@ -132,7 +132,7 @@ int query_blocksize() {
}
//! Pads the @[message] to the current block size with method @[type]
-//! and returns the result as an integer. This is equvivalent to
+//! and returns the result as an integer. This is equivalent to
//! OS2IP(EME-PKCS1-V1_5-ENCODE(message)) in PKCS-1.
//! @param type
//! @int
diff --git a/lib/modules/Array.pmod b/lib/modules/Array.pmod
index 69a285fdcd..2d43b3045e 100644
--- a/lib/modules/Array.pmod
+++ b/lib/modules/Array.pmod
@@ -252,7 +252,7 @@ array sort_array(array arr, function(int(0..0),int(0..0),mixed ...:int)|void cmp
//! Get multiple columns from an array.
//!
-//! This function is equvivalent to
+//! This function is equivalent to
//! @pre{
//! map(ind, lambda(mixed i) { return column(x, i); })
//! @}
diff --git a/lib/modules/Stdio.pmod/Terminfo.pmod b/lib/modules/Stdio.pmod/Terminfo.pmod
index e657fee12f..3ac67280d7 100644
--- a/lib/modules/Stdio.pmod/Terminfo.pmod
+++ b/lib/modules/Stdio.pmod/Terminfo.pmod
@@ -895,7 +895,7 @@ Termcap getTerm(string|void term)
}
//! Returns an object describing the fallback terminal for the terminal
-//! @[term]. This is usually equvivalent to @[Stdio.Terminfo.getTerm("dumb")].
+//! @[term]. This is usually equivalent to @[Stdio.Terminfo.getTerm("dumb")].
//!
//! @seealso
//! Stdio.Terminfo.getTerm
diff --git a/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike b/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike
index 0c12b750e2..faa755d8b6 100644
--- a/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike
+++ b/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike
@@ -26,7 +26,7 @@ int(0..) key_size();
//! @[_equal()]
int(0..1) public_key_equal(this_program other);
-//! Check whether two objects are equvivalent.
+//! Check whether two objects are equivalent.
//!
//! This includes checking both the public and private keys.
//!
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 7f78304399..5f8e8285ca 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -4461,7 +4461,7 @@ static struct pike_string *replace_many(struct pike_string *str,
*! If the first argument is a string, and the others array(string), a string
*! with every occurrance of @[from][@i{i@}] in @[s] replaced with
*! @[to][@i{i@}] will be returned. Instead of the arrays @[from] and @[to]
- *! a mapping equvivalent to @expr{@[mkmapping](@[from], @[to])@} can be
+ *! a mapping equivalent to @expr{@[mkmapping](@[from], @[to])@} can be
*! used.
*!
*! If the first argument is an array or mapping, the values of @[a] which
diff --git a/src/cpp.c b/src/cpp.c
index c01c84b41d..5610ec5804 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -569,7 +569,7 @@ void cpp_change_compat(struct cpp *this, int major, int minor)
*!
*! @tt{#ifdef @i{<identifier>@}@}
*!
- *! is equvivalent to
+ *! is equivalent to
*!
*! @tt{#if @[defined](@i{<identifier>@})@}
*!
@@ -587,7 +587,7 @@ void cpp_change_compat(struct cpp *this, int major, int minor)
*!
*! @tt{#ifndef @i{<identifier>@}@}
*!
- *! is equvivalent to
+ *! is equivalent to
*!
*! @tt{#if !@[defined](@i{<identifier>@})@}
*!
@@ -644,7 +644,7 @@ void cpp_change_compat(struct cpp *this, int major, int minor)
*!
*! @example
*!
- *! The following two are equvivalent:
+ *! The following two are equivalent:
*!
*! @code
*! #ifdef A
@@ -852,7 +852,7 @@ void cpp_change_compat(struct cpp *this, int major, int minor)
*! is defined.
*!
*! @note
- *! @tt{#if defined(MY_DEF)@} is equvivalent to
+ *! @tt{#if defined(MY_DEF)@} is equivalent to
*! @tt{#ifdef MY_DEF@}.
*!
*! @seealso
diff --git a/src/modules/Java/jvm.c b/src/modules/Java/jvm.c
index c9b1339a9f..aa4631c13d 100644
--- a/src/modules/Java/jvm.c
+++ b/src/modules/Java/jvm.c
@@ -1513,7 +1513,7 @@ struct native_method_context;
* data Value to prepend in the argument list.
* statc dispatch is a static method.
* dispatch Function to call.
- * args Number of integer equvivalents to pass along.
+ * args Number of integer equivalents to pass along.
* flt_args bitfield: There are float arguments at these positions.
* dbl_args bitfield: There are double arguments at these positions.
*/
diff --git a/src/modules/Math/module.pmod.in b/src/modules/Math/module.pmod.in
index 24da03644f..1b306d7232 100644
--- a/src/modules/Math/module.pmod.in
+++ b/src/modules/Math/module.pmod.in
@@ -345,7 +345,7 @@ class Angle {
//! Calculate binomial koefficient @[n] choose @[k].
//!
-//! This is equvivalent to @tt{@[n]!/(@[k]!*(@[n]-@[k])!)@}.
+//! This is equivalent to @tt{@[n]!/(@[k]!*(@[n]-@[k])!)@}.
int choose(int n, int k)
{
if (k*2 > n) k = n-k;
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index f14ad61503..4492d87112 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -2002,7 +2002,7 @@ int get_inet_addr(PIKE_SOCKADDR *addr,char *name,char *service, INT_TYPE port,
#ifdef AF_INET6
if (inet_flags & 2) {
SOCKADDR_FAMILY(*addr) = AF_INET6;
- /* Note: This is equvivalent to :: (aka IPv6 ANY). */
+ /* Note: This is equivalent to :: (aka IPv6 ANY). */
memset(&addr->ipv6.sin6_addr, 0, sizeof(addr->ipv6.sin6_addr));
}
#endif
diff --git a/src/pike_embed.c b/src/pike_embed.c
index 3a5f2bcefc..34226183fb 100644
--- a/src/pike_embed.c
+++ b/src/pike_embed.c
@@ -194,10 +194,10 @@ void init_pike_runtime(void (*exit_cb)(int))
* too unsafe (consider 64-bit systems).
*/
#if STACK_DIRECTION < 0
- /* Equvivalent with |= 0xffff */
+ /* Equivalent with |= 0xffff */
Pike_interpreter.stack_top += ~(PTR_TO_INT(Pike_interpreter.stack_top)) & 0xffff;
#else /* STACK_DIRECTION >= 0 */
- /* Equvivalent with &= ~0xffff */
+ /* Equivalent with &= ~0xffff */
Pike_interpreter.stack_top -= PTR_TO_INT(Pike_interpreter.stack_top) & 0xffff;
#endif /* STACK_DIRECTION < 0 */
diff --git a/src/program.c b/src/program.c
index 28ac4e6be1..36e9604760 100644
--- a/src/program.c
+++ b/src/program.c
@@ -392,7 +392,7 @@ static struct pike_type *lfun_setter_type_string = NULL;
*! }
*! @endcode
*! In the above case an implicit @[lfun::create()] is created, and
- *! it's equvivalent to:
+ *! it's equivalent to:
*! @code
*! class Foo {
*! int foo;
@@ -863,7 +863,7 @@ static struct pike_type *lfun_setter_type_string = NULL;
*! Hashing callback.
*!
*! The main caller of this function is @[predef::hash_value()]
- *! or the low-level equvivalent, which get called by various
+ *! or the low-level equivalent, which get called by various
*! mapping operations when the object is used as index in a mapping.
*!
*! @returns
--
GitLab