From 539a6580da4236c0bd9efae80acb49dd38d408a6 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Tue, 21 Feb 2017 11:03:07 +0000 Subject: [PATCH] correct spelling mistakes (#4405) --- data/lock-decoder/LockTracerDecoder.cs | 4 ++-- docs/abc-removal.txt | 8 ++++---- libgc/blacklst.c | 2 +- libgc/doc/README.changes | 2 +- libgc/doc/README.macros | 2 +- libgc/mark.c | 2 +- man/mdoc.5 | 2 +- man/mono.1 | 2 +- man/monodocer.1 | 4 ++-- man/sqlsharp.1 | 2 +- mcs/CodingStyle | 4 ++-- mcs/class/README | 2 +- .../System.Runtime.Caching/ReferenceSources/R.Designer.cs | 2 +- mono/metadata/verify.c | 2 +- mono/tests/verifier/make_tests.sh | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/data/lock-decoder/LockTracerDecoder.cs b/data/lock-decoder/LockTracerDecoder.cs index 08576f1a7de..1471ea51181 100644 --- a/data/lock-decoder/LockTracerDecoder.cs +++ b/data/lock-decoder/LockTracerDecoder.cs @@ -86,7 +86,7 @@ LOCK RULES Simple locks: Can be acquired at any point regardless of which locks are taken or not. No other locks can be acquired or released while holding a simple lock. - Reentrancy is not recomended. (warning) + Reentrancy is not recommended. (warning) Simple locks are leaf locks on the lock lattice. Complex locks: @@ -129,7 +129,7 @@ ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache Both of those happen when filling up the name_cache, as it needs to alloc image memory. - This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly. + This one is fixable by splitting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriately. */ diff --git a/docs/abc-removal.txt b/docs/abc-removal.txt index b44089c0de9..5c2ce91fd5f 100755 --- a/docs/abc-removal.txt +++ b/docs/abc-removal.txt @@ -26,7 +26,7 @@ some combination of the two. To be clearer, and give an idea of what the algorithm can and cannot do without describing it in detail... keep in mind that - only "redunant" checks cannot be removed. By "redundant", I + only "redundant" checks cannot be removed. By "redundant", I mean "already explicitly checked" in the method code. Unfortunately, analyzing complex expressions is not so easy @@ -136,7 +136,7 @@ some combination of the two. In the first case, the BB has exactly two exit BBs, and their execution conditions are easy to get from the condition of the branch (see the "get_relation_from_branch_instruction" - function, and expecially the end of "analyze_block" in + function, and especially the end of "analyze_block" in abcremoval.c. If there is a switch, the jump condition of every exit BB is @@ -303,7 +303,7 @@ some combination of the two. each BB tried to examine all possible conditions between all variables, filling a sort of "evaluation matrix". The problem was that the complexity of this evaluation was quadratic (or - worse) on the number of variables, and that many wariables + worse) on the number of variables, and that many variables were examined even if they were not involved in any array access. @@ -332,7 +332,7 @@ some combination of the two. [1b] Prepare the evaluation graph (empty) - [1b] Summarize each varible definition, and put + [1b] Summarize each variable definition, and put the resulting relations in the evaluation graph diff --git a/libgc/blacklst.c b/libgc/blacklst.c index ae2f95cb3fe..5e6ebcfb7a3 100644 --- a/libgc/blacklst.c +++ b/libgc/blacklst.c @@ -21,7 +21,7 @@ * See the definition of page_hash_table in gc_private.h. * False hits from the stack(s) are much more dangerous than false hits * from elsewhere, since the former can pin a large object that spans the - * block, eventhough it does not start on the dangerous block. + * block, even though it does not start on the dangerous block. */ /* diff --git a/libgc/doc/README.changes b/libgc/doc/README.changes index fa6f279f518..c30d2fc2184 100644 --- a/libgc/doc/README.changes +++ b/libgc/doc/README.changes @@ -1872,7 +1872,7 @@ Since 6.2alpha6: - Fixed Makefile.direct for DARWIN. (Thanks to Manuel Serrano.) - There was a race between GC_pthread_detach and thread exit that could result in a thread structure being deallocated by GC_pthread_detach - eventhough it was still needed by the thread exit code. (Thanks to + even though it was still needed by the thread exit code. (Thanks to Dick Porter for the small test case that allowed this to be debugged.) - Fixed version parsing for non-alpha versions in acinclude.m4 and version checking in version.h. diff --git a/libgc/doc/README.macros b/libgc/doc/README.macros index df0ef2cda93..153a3e0f914 100644 --- a/libgc/doc/README.macros +++ b/libgc/doc/README.macros @@ -19,7 +19,7 @@ relatively easy to adapt to new compilers with a different set of predefined macros. Currently these macros generally identify platforms instead of features. In many cases, this is a mistake. -3) The code currently avoids #elif, eventhough that would make it more +3) The code currently avoids #elif, even though that would make it more readable. This was done since #elif would need to be understood by ALL compilers used to build the collector, and that hasn't always been the case. It makes sense to reconsider this decision at some point, since #elif has been diff --git a/libgc/mark.c b/libgc/mark.c index e14e5296c59..e870342e412 100644 --- a/libgc/mark.c +++ b/libgc/mark.c @@ -936,7 +936,7 @@ void GC_do_local_mark(mse *local_mark_stack, mse *local_top) /* Try to share the load, since the main stack is empty, */ /* and helper threads are waiting for a refill. */ /* The entries near the bottom of the stack are likely */ - /* to require more work. Thus we return those, eventhough */ + /* to require more work. Thus we return those, even though */ /* it's harder. */ mse * p; mse * new_bottom = local_mark_stack diff --git a/man/mdoc.5 b/man/mdoc.5 index 440fc15a397..3cd4bbea555 100644 --- a/man/mdoc.5 +++ b/man/mdoc.5 @@ -765,7 +765,7 @@ Refers to a namespace, e.g. \fIN:System\fR. .I "P:" Refers to a property. If the property is an indexer or takes parameters, the parameter types are appended to the property name and enclosed with -paranthesis: +parenthesis: \fIP:System.String.Length\fR, \fIP:System.String.Chars(System.Int32)\fR. .TP diff --git a/man/mono.1 b/man/mono.1 index 7b8506ae8a7..4c99a8dd0d8 100644 --- a/man/mono.1 +++ b/man/mono.1 @@ -609,7 +609,7 @@ Finally, namespaces can be specified using the N: prefix: Don't align stack frames on the x86 architecture. By default, Mono aligns stack frames to 16 bytes on x86, so that local floating point and SIMD variables can be properly aligned. This option turns off the -alignment, which usually saves one intruction per call, but might +alignment, which usually saves one instruction per call, but might result in significantly lower floating point and SIMD performance. .TP \fB--jitmap\fR diff --git a/man/monodocer.1 b/man/monodocer.1 index 19d74030527..8bbc34cb239 100644 --- a/man/monodocer.1 +++ b/man/monodocer.1 @@ -237,7 +237,7 @@ to the type name, while methods append the method name (with an optional count of the number of generic parameters). .Sp If the constructor or method take arguments, these are listed within -paranthesis after the constructor/method name: +parenthesis after the constructor/method name: .Sp .I M:System.Object..ctor , @@ -259,7 +259,7 @@ Refers to a namespace, e.g. .I "P:" Refers to a property. If the property is an indexer or takes parameters, the parameter types are appended to the property name and enclosed with -paranthesis: +parenthesis: .I P:System.String.Length , .I P:System.String.Chars(System.Int32) diff --git a/man/sqlsharp.1 b/man/sqlsharp.1 index 4bf500ffd4a..008fddbfc5c 100644 --- a/man/sqlsharp.1 +++ b/man/sqlsharp.1 @@ -407,7 +407,7 @@ mysql MySQL AB MySql.Data.MySqlClient MySql.Data NOTES: Ngsql is the .Net Data Provider for PosgreSQL. The -latest verison can be downloaded from +latest version can be downloaded from http://npgsql.projects.postgresql.org/ MySql.Data is the MySQL Connector/Net for connecting to MySql databases. diff --git a/mcs/CodingStyle b/mcs/CodingStyle index 9d2deb9122f..54aa55d1545 100644 --- a/mcs/CodingStyle +++ b/mcs/CodingStyle @@ -134,7 +134,7 @@ code (); } - * Avoid using unecessary open/close braces, vertical space + * Avoid using unnecessary open/close braces, vertical space is usually limited: good: @@ -474,4 +474,4 @@ class X : Y { MyHelperClass.cli.cs MyHelperClass.jvm.cs - By using partial classes. \ No newline at end of file + By using partial classes. diff --git a/mcs/class/README b/mcs/class/README index efebe9ad5a9..421c04da2bf 100644 --- a/mcs/class/README +++ b/mcs/class/README @@ -134,7 +134,7 @@ testing. code (); } - * Avoid using unecessary open/close braces, vertical space + * Avoid using unnecessary open/close braces, vertical space is usually limited: good: diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs index 1a7d41de48d..2fdeb996965 100644 --- a/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs +++ b/mcs/class/System.Runtime.Caching/ReferenceSources/R.Designer.cs @@ -1,5 +1,5 @@ // This is a copy of external/referencesource/System.Runtime.Caching/Resources/R.Designer.cs -// This verison does not use ResourceManager, instead it uses hard coded strings. +// This version does not use ResourceManager, instead it uses hard coded strings. // This should be removed once Mono has access to .NET resources. namespace System.Runtime.Caching.Resources { diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c index f826b7965e7..e2cec88115b 100644 --- a/mono/metadata/verify.c +++ b/mono/metadata/verify.c @@ -5945,7 +5945,7 @@ mono_method_verify (MonoMethod *method, int level) for (i = 0; i < ctx.code_size && i < ip_offset; ++i) { if (ctx.code [i].flags & IL_CODE_FLAG_WAS_TARGET) { if (!(ctx.code [i].flags & IL_CODE_FLAG_SEEN)) - ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Branch or exception block target middle of intruction at 0x%04x", i)); + ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Branch or exception block target middle of instruction at 0x%04x", i)); if (ctx.code [i].flags & IL_CODE_DELEGATE_SEQUENCE) CODE_NOT_VERIFIABLE (&ctx, g_strdup_printf ("Branch to delegate code sequence at 0x%04x", i)); diff --git a/mono/tests/verifier/make_tests.sh b/mono/tests/verifier/make_tests.sh index 25dd54a9257..ccad6f00ddb 100755 --- a/mono/tests/verifier/make_tests.sh +++ b/mono/tests/verifier/make_tests.sh @@ -3414,7 +3414,7 @@ done ./make_exception_overlap_test.sh exception_entry_overlap_try_over_filter invalid ".try TRY_BLOCK_1 to FILTER_BLOCK_3_A filter FILTER_BLOCK_3 handler CATCH_BLOCK_1 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END" "yes" -#blocks start in the middle of an intruction +#blocks start in the middle of an instruction ./make_exception_overlap_test.sh try_block_start_in_the_middle_of_a_instruction invalid ".try AFTER_PREFIX_1 to TRY_BLOCK_1_END catch [mscorlib]System.Exception handler CATCH_BLOCK_1 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END" ./make_exception_overlap_test.sh catch_block_start_in_the_middle_of_a_instruction invalid ".try TRY_BLOCK_1 to TRY_BLOCK_1_END catch [mscorlib]System.Exception handler AFTER_PREFIX_2 to CATCH_BLOCK_1_END" ".try TRY_BLOCK_2 to TRY_BLOCK_2_END catch [mscorlib]System.Exception handler CATCH_BLOCK_2 to CATCH_BLOCK_2_END" -- 2.25.1