Resync to trunk, windows non-pro build aoo/aw080

5 files changed, 12 insertions, 12 deletions

diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index a13c359caa9d..a59c5d4fe946 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -60,7 +60,7 @@ extern "C" {
    not be null; if the given binary blob is malformed, or of a version larger
    than <code>maxVersion</code>, null is returned
 
-   @return false iff an out-of-memory condition occured, in which case
+   @return false iff an out-of-memory condition occurred, in which case
    <code>result</code> is left unchanged, and no type reader is created
 
    @since UDK 3.2.0
@@ -318,7 +318,7 @@ void SAL_CALL typereg_reader_getFieldTypeName(
    @param result an out-parameter obtaining the field value's value; must not be
    null
 
-   @return false iff an out-of-memory condition occured, in which case
+   @return false iff an out-of-memory condition occurred, in which case
    <code>type</code> and <code>value</code> are left unchanged
 
    @since UDK 3.2.0
diff --git a/registry/inc/registry/regtype.h b/registry/inc/registry/regtype.h
index d6493850e8da..8ae4d58767d5 100644
--- a/registry/inc/registry/regtype.h
+++ b/registry/inc/registry/regtype.h
@@ -71,7 +71,7 @@ enum RegKeyType
 
     A registry key can contain a value which has one of seven different types.
     Three simple types (long, ascii and unicode string) and a list type of
-    these simple types. Furthermore a binary type which provides the possibilty
+    these simple types. Furthermore a binary type which provides the possibility
     to define own data structures and store these types in the registry. The UNO
     core reflection data is stored as a binary blob in the type registry.
  */
diff --git a/registry/inc/registry/types.h b/registry/inc/registry/types.h
index a8c6cb6c2cfd..13d746b29e79 100644
--- a/registry/inc/registry/types.h
+++ b/registry/inc/registry/types.h
@@ -265,8 +265,8 @@ enum RTMethodMode {
 
 /** specifies the mode of a parameter.
 
-    There are three paramter modes which have impact of the handling of the
-    paramter in the UNO bridges and the UNO code generation.
+    There are three parameter modes which have impact of the handling of the
+    parameter in the UNO bridges and the UNO code generation.
  */
 enum RTParamMode {
     /// indicates an invalid parameter mode
diff --git a/registry/inc/registry/writer.h b/registry/inc/registry/writer.h
index d6682c59c624..da2afa9d41a0 100644
--- a/registry/inc/registry/writer.h
+++ b/registry/inc/registry/writer.h
@@ -94,7 +94,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
 
    @param typeName the super type name; must not be null
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
@@ -124,7 +124,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
 
    @param valueValue the value of the value of the field
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
@@ -155,7 +155,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData(
 
    @param exceptionCount the number of exceptions of the method
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
@@ -184,7 +184,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData(
 
    @param typeName the type name of the parameter; must not be null
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
@@ -207,7 +207,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
 
    @param typeName the exception type name; must not be null
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
@@ -233,7 +233,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
 
    @param typeName the type name of the reference; must not be null
 
-   @return false iff an out-of-memory condition ocurred, in which case the type
+   @return false iff an out-of-memory condition occurred, in which case the type
    writer is not modified
 
    @since UDK 3.2.0
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index e4eb09706791..6536df1d4a6f 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -127,7 +127,7 @@ void Options_Impl::printUsage_Impl() const
             "    -c|C      = make a complete check, that means any differences will be\n"
             "                detected. Default is only a compatibility check that means\n"
             "                only UNO typelibrary entries will be checked.\n"
-            "    -t|T      = make an UNO type compatiblity check. This means that registry 2\n"
+            "    -t|T      = make an UNO type compatibility check. This means that registry 2\n"
             "                will be checked against registry 1. If a interface in r2 contains\n"
             "                more methods or the methods are in a different order as in r1, r2 is\n"
             "                incompatible to r1. But if a service in r2 supports more properties as\n"