aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlly Betts <olly@survex.com>2013-10-15 11:25:11 +1300
committerOlly Betts <olly@survex.com>2013-12-12 11:45:30 +1300
commitc6e4dea5722eac4319306a2d09c119e312848dc8 (patch)
treec34ae2b69d8dabab014b419f2d5590191225c4e7
parent2d0dc707e6975ae4476931c32f4df4e4faaa2e4e (diff)
downloadswig-c6e4dea5722eac4319306a2d09c119e312848dc8.tar.gz
Fix a few typos in comments and docs
-rw-r--r--CHANGES6
-rw-r--r--Doc/Manual/SWIGPlus.html2
-rw-r--r--Doc/Manual/Typemaps.html2
-rw-r--r--Lib/python/pytypemaps.swg2
-rw-r--r--Lib/swig.swg2
-rw-r--r--Lib/typemaps/swigmacros.swg10
-rw-r--r--Lib/typemaps/swigtypemaps.swg2
-rw-r--r--Source/Swig/typesys.c6
8 files changed, 16 insertions, 16 deletions
diff --git a/CHANGES b/CHANGES
index 4cc222901..da5fb1f07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -201,7 +201,7 @@ Version 2.0.10 (27 May 2013)
The macros are silently ignored.
2013-04-17: wsfulton
- [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors.
+ [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjunction with directors.
2013-04-15: kwwette
[Octave] Fix bugs in output of cleanup code.
@@ -5206,7 +5206,7 @@ Version 1.3.29 (March 21, 2006)
6146 _std_containers.so
174 _std_containers.so.hidden
- Excecution times:
+ Execution times:
real 0m0.050s user 0m0.039s sys 0m0.005s _std_containers.so
real 0m0.039s user 0m0.026s sys 0m0.007s _std_containers.so.hidden
@@ -5292,7 +5292,7 @@ Version 1.3.29 (March 21, 2006)
protected methods by default.
In previous releases, you needed to use the 'dirprot'
- option to acheive the same.
+ option to achieve the same.
If you want, you can disable the new default behaviour,
use the 'nodirprot' option:
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index 2713725d7..2ed450c01 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -1522,7 +1522,7 @@ multiple inheritance.
spirit, and target language capabilities, as possible. In most
cases, this means that SWIG will parse the non-public inheritance
declarations, but that will have no effect in the generated code,
-besides the implicit policies derived for constructor and
+besides the implicit policies derived for constructors and
destructors.
</p>
diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index 81e3fd1bb..20ad085f8 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -3956,7 +3956,7 @@ Requirements for the type system:
<li>Store inheritance and type equivalence information and be able to correctly
re-create the type pointer.</li>
<li>Share type information between modules.</li>
-<li>Modules can be loaded in any order, irregardless of actual type
+<li>Modules can be loaded in any order, regardless of actual type
dependency.</li>
<li>Avoid the use of dynamically allocated memory, and library/system calls in general.</li>
<li>Provide a reasonably fast implementation, minimizing the lookup time for all
diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg
index c64b47b05..5c6abb01e 100644
--- a/Lib/python/pytypemaps.swg
+++ b/Lib/python/pytypemaps.swg
@@ -9,7 +9,7 @@
#undef SWIG_TYPECHECK_BOOL
%define SWIG_TYPECHECK_BOOL 10000 %enddef
-/* Include fundamental fragemt definitions */
+/* Include fundamental fragment definitions */
%include <typemaps/fragments.swg>
/* Look for user fragments file. */
diff --git a/Lib/swig.swg b/Lib/swig.swg
index ad6b7b64b..241d93f3f 100644
--- a/Lib/swig.swg
+++ b/Lib/swig.swg
@@ -258,7 +258,7 @@ static int NAME(TYPE x) {
%rename("$ignore", %$isenumitem, %$classname="MyClass") "";
- we use the prefix '%$' to avoid clashings with other swig
+ we use the prefix '%$' to avoid clashes with other swig
macros/directives.
*/
diff --git a/Lib/typemaps/swigmacros.swg b/Lib/typemaps/swigmacros.swg
index c9b42facf..61470583e 100644
--- a/Lib/typemaps/swigmacros.swg
+++ b/Lib/typemaps/swigmacros.swg
@@ -3,16 +3,16 @@
* ----------------------------------------------------------------------------- */
/*
This file implements the internal macros of the 'SWIG API', which
- are useful to implement all the SWIG target languges.
+ are useful to implement all the SWIG target languages.
Basic preprocessor macros:
--------------------------
%arg(Arg) Safe argument wrap
- %str(Arg) Stringtify the argument
- %begin_block Begin a execution block
- %end_block End a execution block
- %block(Block) Execute Block as a excecution block
+ %str(Arg) Stringify the argument
+ %begin_block Begin an execution block
+ %end_block End an execution block
+ %block(Block) Execute Block as an execution block
%define_as(Def, Val) Define 'Def' as 'Val', expanding Def and Val first
%ifcplusplus(V1, V2) if C++ Mode; then V1; else V2; fi
diff --git a/Lib/typemaps/swigtypemaps.swg b/Lib/typemaps/swigtypemaps.swg
index 0e39afe4c..4e5bb2b04 100644
--- a/Lib/typemaps/swigtypemaps.swg
+++ b/Lib/typemaps/swigtypemaps.swg
@@ -12,7 +12,7 @@
and then include this file.
Typically you will create a 'mytypemaps.swg' file in each target
- languge, where you will have the following sections:
+ language, where you will have the following sections:
=== mytypemaps.swg ===
diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c
index 1552703c6..bcfd2feb5 100644
--- a/Source/Swig/typesys.c
+++ b/Source/Swig/typesys.c
@@ -1381,13 +1381,13 @@ int SwigType_type(const SwigType *t) {
*
* 2.- swig doesn't mark 'type' as non-assignable.
*
- * 3.- the user specify that the value wrapper is not needed by using
- * the %feature("novaluewrapper"), in that case the user need to type
+ * 3.- the user specifies that the value wrapper is not needed by using
+ * %feature("novaluewrapper") like so:
*
* %feature("novaluewrapper") MyOpaqueClass;
* class MyOpaqueClass;
*
- * Users can also force the use of the value wrapper by using the
+ * The user can also force the use of the value wrapper with
* %feature("valuewrapper").
* ----------------------------------------------------------------------------- */