diff --git a/lam/codespell.sh b/lam/codespell.sh
index d3954986..00ddb3cb 100755
--- a/lam/codespell.sh
+++ b/lam/codespell.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-~/.local/bin/codespell --skip '*3rdParty*,*/ckeditor/*,*/po/*,*/locale/*,tmp,sess,config,graphics,*/style/images/*,*/style/*.gif,*/style/*.png,*/docs/manual-onePage/*,*/docs/manual-sources/images/*,*/templates/lib/*jquery*,*~,*/docs/phpdoc/*,*/docs/manual/*,*/docs/devel/images/*,*/docs/manual-pdf/*,*.sh,*/cropper.js,*/lib/extra/duo/*' --ignore-words-list "tim,files'"
+~/.local/bin/codespell --skip '*3rdParty*,*/ckeditor/*,*/po/*,*/locale/*,tmp,sess,config,graphics,*/style/images/*,*/style/*.gif,*/style/*.png,*/docs/manual-onePage/*,*/docs/manual-sources/images/*,*/templates/lib/*jquery*,*~,*/docs/phpdoc/*,*/docs/manual/*,*/docs/devel/images/*,*/docs/manual-pdf/*,*.sh,*/cropper.js,*/lib/extra/duo/*' --ignore-words-list "tim,te,pres,files'"
diff --git a/lam/docs/devel/mod_accountPages.htm b/lam/docs/devel/mod_accountPages.htm
index 60145d6f..88fd48a3 100644
--- a/lam/docs/devel/mod_accountPages.htm
+++ b/lam/docs/devel/mod_accountPages.htm
@@ -39,7 +39,7 @@ attribute. Therefore we will save these two values.<br>
 &nbsp;&nbsp;&nbsp; * This function loads all needed attributes into the
 object.<br>
 &nbsp;&nbsp;&nbsp; *<br>
-&nbsp;&nbsp;&nbsp; * @param array $attr an array as it is retured from
+&nbsp;&nbsp;&nbsp; * @param array $attr an array as it is returned from
 ldap_get_attributes<br>
 &nbsp;&nbsp;&nbsp; */<br>
 &nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">function</span> <span style="color: rgb(255, 0, 0);">load_attributes</span>($attr) {<br>
diff --git a/lam/docs/devel/mod_basics.htm b/lam/docs/devel/mod_basics.htm
index 4ded5f0b..026cfb7a 100644
--- a/lam/docs/devel/mod_basics.htm
+++ b/lam/docs/devel/mod_basics.htm
@@ -58,7 +58,7 @@ class</span> <span style="color: rgb(255, 0, 0);">ieee802Device</span>
 </table>
 <br>
 <h2>4. Meta data</h2>
-The module interface inludes a lot of required and optional functions.
+The module interface includes a lot of required and optional functions.
 Many of these functions do not need to be implemented directly in the
 module, you can define <span style="font-weight: bold;">meta data</span>
 for them and the <span style="font-weight: bold;">baseModule</span>
diff --git a/lam/docs/devel/mod_general.htm b/lam/docs/devel/mod_general.htm
index d2b57563..cbe1886b 100644
--- a/lam/docs/devel/mod_general.htm
+++ b/lam/docs/devel/mod_general.htm
@@ -122,7 +122,7 @@ get_metaData() {<br>
 <br>
 <br>
 <h2>4. Dependencies</h2>
-Modules can depend on eachother. This is useful if you need to access
+Modules can depend on each other. This is useful if you need to access
 attributes from other modules or the managed object classes of your
 module are not structural.<br>
 <br>
@@ -198,7 +198,7 @@ is set dynamically<br>
 You can tell LAM what object classes are managed by your module.<br>
 LAM will then check the spelling of the objectClass attributes and
 correct it automatically. This is useful if other applications (e.g.
-smbldap-tools) also create accounts and the spelling is differnt.<br>
+smbldap-tools) also create accounts and the spelling is different.<br>
 <br>
 <span style="font-weight: bold; text-decoration: underline;">Example:</span><br>
 <br>
diff --git a/lam/docs/devel/profile_files.htm b/lam/docs/devel/profile_files.htm
index 41825e89..d1c19fa3 100644
--- a/lam/docs/devel/profile_files.htm
+++ b/lam/docs/devel/profile_files.htm
@@ -18,7 +18,7 @@ designed to be editable by hand. They do not allow to add comments and
 have a simpler format.<br>
 <br>
 <h2>Format</h2>
-There is one option per line which is formated: &lt;identifier&gt;:
+There is one option per line which is formatted: &lt;identifier&gt;:
 &lt;value&gt;<br>
 <br>
 Identifier is the option's name, value is the rest of the line after
diff --git a/lam/docs/manual-sources/appendix-security.xml b/lam/docs/manual-sources/appendix-security.xml
index 0ed2b02f..0ed32231 100644
--- a/lam/docs/manual-sources/appendix-security.xml
+++ b/lam/docs/manual-sources/appendix-security.xml
@@ -34,7 +34,7 @@
   <section>
     <title>Use of SSL</title>
 
-    <para>The data which is transfered between you and LAM is very sensitive.
+    <para>The data which is transferred between you and LAM is very sensitive.
     Please always use SSL encrypted connections between LAM and your browser
     to protect yourself against network sniffers.</para>
   </section>
diff --git a/lam/docs/manual-sources/appendix-troubleshooting.xml b/lam/docs/manual-sources/appendix-troubleshooting.xml
index 8d23c04a..7852d288 100644
--- a/lam/docs/manual-sources/appendix-troubleshooting.xml
+++ b/lam/docs/manual-sources/appendix-troubleshooting.xml
@@ -85,7 +85,7 @@
 
       <para>If there are any object classes or attributes missing you will get
       a notice. See <link linkend="a_schema">LDAP schema files</link> for a
-      list of used schemas. You may also want to deactive unused modules in
+      list of used schemas. You may also want to deactivate unused modules in
       your LAM server profile (tab "Modules").</para>
 
       <screenshot>
diff --git a/lam/docs/manual-sources/chapter-bigPicture.xml b/lam/docs/manual-sources/chapter-bigPicture.xml
index 724bcaa3..e0ed3cc0 100644
--- a/lam/docs/manual-sources/chapter-bigPicture.xml
+++ b/lam/docs/manual-sources/chapter-bigPicture.xml
@@ -292,7 +292,7 @@
 
       <para><emphasis role="bold">LAM runtime environment:</emphasis></para>
 
-      <para>LAM runs on PHP. Therefore, it is independant of CPU architecture
+      <para>LAM runs on PHP. Therefore, it is independent of CPU architecture
       and operating system (OS). You can run LAM on any OS which supports
       Apache, Nginx or other PHP compatible web servers.</para>
 
diff --git a/lam/docs/manual-sources/chapter-configuration.xml b/lam/docs/manual-sources/chapter-configuration.xml
index 16b71aad..18b46ff9 100644
--- a/lam/docs/manual-sources/chapter-configuration.xml
+++ b/lam/docs/manual-sources/chapter-configuration.xml
@@ -207,7 +207,7 @@
 
       <itemizedlist>
         <listitem>
-          <para>File: all messages will be writen to the given file. LAM will
+          <para>File: all messages will be written to the given file. LAM will
           create it if not yet existing.</para>
         </listitem>
 
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index 4962d7ea..7339606c 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -1807,7 +1807,7 @@
       <para><emphasis role="bold">Setup password changing</emphasis></para>
 
       <para>LAM Pro cannot generate the password hashes itself because Heimdal
-      uses a propietary format for them. Therefore, LAM Pro needs to call e.g.
+      uses a proprietary format for them. Therefore, LAM Pro needs to call e.g.
       kadmin to set the password.</para>
 
       <para>The wildcards @@password@@ and @@principal@@ are replaced with
@@ -1856,7 +1856,7 @@
       <para><emphasis role="bold">Setup password changing</emphasis></para>
 
       <para>LAM Pro cannot generate the password hashes itself because MIT
-      uses a propietary format for them. Therefore, LAM Pro needs to call
+      uses a proprietary format for them. Therefore, LAM Pro needs to call
       kadmin/kadmin.local to set the password.</para>
 
       <para>LAM will add "-q 'cpw -pw PASSWORD PRINCIPAL'" to the command to
@@ -1870,9 +1870,9 @@
       password change.</para>
 
       <para>Please note that kadmin/kadmin.local often returns a successful
-      command even if errors occured (e.g. password policy violations). You
+      command even if errors occurred (e.g. password policy violations). You
       need to test this before and if affected then write a wrapper script
-      arround kadmin that returns non-zero return codes for errors.</para>
+      around kadmin that returns non-zero return codes for errors.</para>
 
       <para>Example commands:</para>
 
@@ -1956,7 +1956,7 @@
         </mediaobject>
       </screenshot>
 
-      <para>You can add the user to existing alias entries or create completly
+      <para>You can add the user to existing alias entries or create completely
       new ones.</para>
 
       <screenshot>
@@ -4737,7 +4737,7 @@ Run slapindex to rebuild the index.
       please skip the "@" entry in the CSV file below. LAM creates this entry
       with sample data.</para>
 
-      <para>In this example we assume that the following zone extry
+      <para>In this example we assume that the following zone entry
       exists:</para>
 
       <literallayout>dn: dlzZoneName=example.com,ou=bind,dc=example,dc=com
@@ -5360,7 +5360,7 @@ OK (10 msec)</programlisting>
     <para>LAM will display a default icon and "Custom fields" as label if you
     do not enter any values.</para>
 
-    <para>You may also specify how LAM displays cutom fields when there are
+    <para>You may also specify how LAM displays custom fields when there are
     multiple field groups. The default is accordion view where you can switch
     field groups by clicking on the title. You may also deactivate this mode.
     Then all field groups are displayed one below the other.</para>
@@ -5375,7 +5375,7 @@ OK (10 msec)</programlisting>
 
     <para><emphasis role="bold">Defining groups:</emphasis></para>
 
-    <para>All input fields are devided into groups. A group may contain one or
+    <para>All input fields are divided into groups. A group may contain one or
     more object classes and allows you to add/remove a certain set of input
     fields.</para>
 
@@ -5724,7 +5724,7 @@ OK (10 msec)</programlisting>
       </listitem>
 
       <listitem>
-        <para>§attribute|;§; attribute values separted by ";" (you can set
+        <para>§attribute|;§; attribute values separated by ";" (you can set
         other separators if you want)</para>
       </listitem>
     </itemizedlist>
@@ -5974,7 +5974,7 @@ OK (10 msec)</programlisting>
     <para>You can switch LAM's logging to debug mode if you are unsure which
     attributes with which values are available.</para>
 
-    <para>The following special wildcards are available for automatical
+    <para>The following special wildcards are available for automatic
     scripts:</para>
 
     <itemizedlist>
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 27c9f6e6..0e1975a2 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -1921,7 +1921,7 @@
         </listitem>
 
         <listitem>
-          <para>§attribute|;§; attribute values separted by ";" (you can set
+          <para>§attribute|;§; attribute values separated by ";" (you can set
           other separators if you want)</para>
         </listitem>
       </itemizedlist>
diff --git a/lam/docs/manual-sources/chapter-tools.xml b/lam/docs/manual-sources/chapter-tools.xml
index 63ffcb1d..8fc8f562 100644
--- a/lam/docs/manual-sources/chapter-tools.xml
+++ b/lam/docs/manual-sources/chapter-tools.xml
@@ -192,7 +192,7 @@
 
     <para>This will run the actions against your LDAP directory. You will see
     which accounts are edited in the progress area and also if any errors
-    occured.</para>
+    occurred.</para>
 
     <screenshot>
       <mediaobject>
diff --git a/lam/docs/schema/dhcp.schema b/lam/docs/schema/dhcp.schema
index c5ed6c72..a7ed1241 100644
--- a/lam/docs/schema/dhcp.schema
+++ b/lam/docs/schema/dhcp.schema
@@ -331,7 +331,7 @@ attributetype ( 2.16.840.1.113719.1.203.4.55
 attributetype ( 2.16.840.1.113719.1.203.4.56
 	NAME 'dhcpComments' 
 	EQUALITY caseIgnoreIA5Match 
-	DESC 'Generic attribute that allows coments  within any DHCP object' 
+	DESC 'Generic attribute that allows comments  within any DHCP object'
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # Classes
diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc
index 236f6ba9..3ed28827 100644
--- a/lam/lib/modules/dhcp_settings.inc
+++ b/lam/lib/modules/dhcp_settings.inc
@@ -3,7 +3,7 @@
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2008        Thomas Manninger
-                2008 - 2019 Roland Gruber
+                2008 - 2020 Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 */
 
 /**
- * This function checks if the given IP address ist valid.
+ * This function checks if the given IP address is valid.
  *
  * @param string IP to check
  * @param check Subnet
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index aed6bb9f..b77b0a68 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1208,7 +1208,7 @@ class posixAccount extends baseModule implements passwordService {
 	}
 
 	/**
-	* Checks if an attribute contains only ASCII charaters and replaces invalid characters.
+	* Checks if an attribute contains only ASCII characters and replaces invalid characters.
 	*
 	* @param string $attribute attribute value
 	* @return string attribute value with replaced non-ASCII characters
@@ -3670,7 +3670,7 @@ class posixAccount extends baseModule implements passwordService {
 
 	/**
 	 * Returns a suggestion for the user name.
-	 * By default this wil be the first character of the first name plus the last name.
+	 * By default this will be the first character of the first name plus the last name.
 	 *
 	 * @param array $attrs LDAP attributes
 	 * @param string $typeId type id (e.g. user)
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index 5ea2a135..852702e9 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -853,7 +853,7 @@ class posixGroup extends baseModule implements passwordService {
 							else unset($this->attributes['gidNumber'][0]);
 						}
 					}
-					// $uids is allways an array but not if no entries were found
+					// $uids is always an array but not if no entries were found
 					if (is_array($gids)) {
 						// id-number is in use and account is a new account
 						if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]=='') {
diff --git a/lam/lib/schema.inc b/lam/lib/schema.inc
index a7106a02..3d5f714e 100644
--- a/lam/lib/schema.inc
+++ b/lam/lib/schema.inc
@@ -1,10 +1,9 @@
 <?php
 namespace LAM\SCHEMA;
 /*
-$Id$
 
   Copyright (C) 2004 David Smith
-  modified to fit for LDAP Account Manager 2005 - 2018 Roland Gruber
+  modified to fit for LDAP Account Manager 2005 - 2020 Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -809,7 +808,7 @@ class AttributeType extends SchemaItem
 	/**
 	 * Gets this attribute's syntax OID. Differs from getSyntaxString() in that this
      * function only returns the actual OID with any length specification removed.
-     * Ie, if the syntax string is "1.2.3.4{16}", this function only retruns
+     * Ie, if the syntax string is "1.2.3.4{16}", this function only returns
 	 * "1.2.3.4".
      * @return string The syntax OID string.
 	 */
@@ -1330,7 +1329,7 @@ function _get_schema_dn($dn, $debug=false )
 
 /**
  * Fetches the raw schema array for the subschemaSubentry of the server. Note,
- * this function has grown many hairs to accomodate more LDAP servers. It is
+ * this function has grown many hairs to accommodate more LDAP servers. It is
  * needfully complicated as it now supports many popular LDAP servers that
  * don't necessarily expose their schema "the right way".
  *
@@ -1338,7 +1337,7 @@ function _get_schema_dn($dn, $debug=false )
  *		fetch. Five valid values: 'objectclasses', 'attributetypes',
  *		'ldapsyntaxes', 'matchingruleuse', or 'matchingrules'.
  *		Case insensitive.
- * @param $dn (optional) This paremeter is the DN of the entry whose schema you
+ * @param $dn (optional) This parameter is the DN of the entry whose schema you
  * 		would like to fetch. Entries have the option of specifying
  * 		their own subschemaSubentry that points to the DN of the system
  * 		schema entry which applies to this attribute. If unspecified,
@@ -1744,7 +1743,7 @@ function add_aliases_to_attrs( &$attrs )
 /**
  * Adds inherited values to each attributeType specified by the SUP directive.
  * Supports infinite levels of inheritance.
- * Bug 856832: require a second paramter that has all attributes indexed by OID
+ * Bug 856832: require a second parameter that has all attributes indexed by OID
  */
 function add_sup_to_attrs( &$attrs, &$attrs_oid )
 {
@@ -1947,7 +1946,7 @@ function get_schema_syntaxes($dn=null, $use_cache=true )
 
 /**
  * Returns true if the schema for $schema_type has been cached and
- * is availble. $schema_type may be one of (lowercase) the following:
+ * is available. $schema_type may be one of (lowercase) the following:
  *      objectclasses
  *      attributetypes
  *      ldapsyntaxes