Index: openacs-4/packages/contacts/lib/contact-relationships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/contacts/lib/contact-relationships.tcl	22 Jun 2007 05:33:11 -0000	1.15
+++ openacs-4/packages/contacts/lib/contact-relationships.tcl	12 Aug 2018 12:30:06 -0000	1.16
@@ -36,7 +36,7 @@
 
 multirow create rels relationship relation_url rel_id contact contact_url attribute value creation_date role
 
-# Get the groups for adding and make sure we have the permisison working.
+# Get the groups for adding and make sure we have the permissions working.
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id  and group_id > 0}]
 lappend groups_belonging_to [contacts::default_group]
 
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.77 -r1.78
--- openacs-4/packages/contacts/lib/contacts.tcl	12 Aug 2018 12:22:48 -0000	1.77
+++ openacs-4/packages/contacts/lib/contacts.tcl	12 Aug 2018 12:30:06 -0000	1.78
@@ -388,7 +388,7 @@
 }
 set combined_extended_columns [lsort -unique [concat $db_extend_columns $extended_columns]]
 
-# we run through the multirow here to determine wether or not the columns are allowed
+# we run through the multirow here to determine whether or not the columns are allowed
 set report_elements [list]
 template::multirow foreach ext {
     set selected_p 0
@@ -519,7 +519,7 @@
     if { [empty_string_p $list_properties(page_size)] || $list_properties(page_size) == 0 } {
 	# we give an alias that won't likely be used in the contacts::multirow extend callbacks
 	# because those callbacks may have references to a parties table and we don't want 
-	# postgresql to think that this query belongs to that table.
+	# PostgreSQL to think that this query belongs to that table.
 	set select_query "select p[ad_conn user_id].party_id from parties p[ad_conn user_id]"
     } else {
 	set select_query [template::list::page_get_ids -name "contacts"]
@@ -552,7 +552,7 @@
     }
 
     if { [llength $party_ids] < 10000 } {
-	# postgresql cannot deal with lists larger than 10000
+	# PostgreSQL cannot deal with lists larger than 10000
 	set select_query [template::util::tcl_to_sql_list $party_ids]
     } else {
 	set select_query "select p[ad_conn user_id].party_id from parties p[ad_conn user_id]"
Index: openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl	28 Oct 2005 17:57:18 -0000	1.2
+++ openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl	12 Aug 2018 12:30:06 -0000	1.3
@@ -3,7 +3,7 @@
 # object_id        - to filter mails for a object_id
 # page             - to filter the pagination
 # page_size        - to know how many rows show (optional default to 10)
-# show_filter_p    - to show or not the filters in the inlcude, default to "t"
+# show_filter_p    - to show or not the filters in the include, default to "t"
 # from_package_id  - to watch mails of this package instance  
 # elements         - a list of elements to show in the list template. If not provided will show all elements.
 
Index: openacs-4/packages/contacts/tcl/contact-search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-procs.tcl,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/contacts/tcl/contact-search-procs.tcl	9 May 2018 15:33:30 -0000	1.42
+++ openacs-4/packages/contacts/tcl/contact-search-procs.tcl	12 Aug 2018 12:30:06 -0000	1.43
@@ -88,7 +88,7 @@
     -search_id:required
 } {
 } {
-    return [db_list get_search_exensions {
+    return [db_list get_search_extensions {
 	    select extend_column
 	      from contact_search_extend_map
 	     where search_id = :search_id
@@ -252,7 +252,7 @@
         # The party column is the column of the object we look for
         # The item column is the column of the item which has the
 	# attributes
-	# This allows to search for the attributes of an organization,
+	# This allows one to search for the attributes of an organization,
 	# but have the party
         # in a special search (employee search)
         
@@ -337,7 +337,7 @@
 
 	# The party column is the column of the object we look for
 	# The item column is the column of the item which has the attributes
-	# This allows to search for the attributes of an organization, but have the party
+	# This allows one to search for the attributes of an organization, but have the party
 	# in a special search (employee search)
 	
 	switch $object_type {
@@ -415,7 +415,7 @@
     
     # The party column is the column of the object we look for
     # The item column is the column of the item which has the attributes
-    # This allows to search for the attributes of an organization, but have the party
+    # This allows one to search for the attributes of an organization, but have the party
     # in a special search (employee search)
     
     switch $object_type {
Index: openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl	9 May 2018 15:33:30 -0000	1.8
+++ openacs-4/packages/contacts/tcl/contact-search-widget-procs.tcl	12 Aug 2018 12:30:06 -0000	1.9
@@ -151,7 +151,7 @@
 	    # we use the package_id from this contacts instance
 	    set package_id [ad_conn package_id]
 	} else {
-	    error "You cannot use the contact_search widget without specifying a package_id of a contacts instance in which to search (done the same way you would specifiy html attributes)"
+	    error "You cannot use the contact_search widget without specifying a package_id of a contacts instance in which to search (done the same way you would specify html attributes)"
 	}
     }
     set person_ids [list]
Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.65 -r1.66
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	9 May 2018 15:33:30 -0000	1.65
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl	12 Aug 2018 12:30:06 -0000	1.66
@@ -169,7 +169,7 @@
     {-party_id ""}
     {-action ""}
 } {
-    This callback is executed by /package/contacts/index.vuh. If you want contact urls to map
+    This callback is executed by /package/contacts/index.vuh. If you want contact URLs to map
     to or override standard files/links this is where you can customize the rp_internal_redirect
     or add your own ad_returnredirect
 } -
Index: openacs-4/packages/contacts/tcl/contacts-import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-import-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/tcl/contacts-import-procs.tcl	15 May 2018 21:20:25 -0000	1.5
+++ openacs-4/packages/contacts/tcl/contacts-import-procs.tcl	12 Aug 2018 12:30:06 -0000	1.6
@@ -350,7 +350,7 @@
 		}
 	    
 		# set organization address attributes
-		set Adresse $values(Strasse)
+		set Address $values(Strasse)
 		set Ort $values(Ort)
 		set Postleitzahl $values(PLZ)
 		set Land $values(Land)
@@ -371,9 +371,9 @@
 		    set locale "en_US"
 		}
 
-		if {![string eq "" $Adresse] && ![string eq "" $Land]} {
+		if {![string eq "" $Address] && ![string eq "" $Land]} {
 		    set value_id [ams::util::postal_address_save \
-				      -delivery_address $Adresse \
+				      -delivery_address $Address \
 				      -municipality $Ort \
 				      -postal_code $Postleitzahl \
 				      -country_code $Land \
@@ -541,7 +541,7 @@
 	    }
 	    
 	    # set person address attributes
-	    set Adresse $values(Pstrasse)
+	    set Address $values(Pstrasse)
 	    set Ort $values(Port)
 	    set Postleitzahl $values(PPLZ)
 	    set Land $values(Pland)
@@ -563,9 +563,9 @@
 	    }
 	    
 	    
-	    if {![string eq "" $Adresse] && ![string eq "" $Land]} {
+	    if {![string eq "" $Address] && ![string eq "" $Land]} {
 		set value_id [ams::util::postal_address_save \
-				  -delivery_address $Adresse \
+				  -delivery_address $Address \
 				  -municipality $Ort \
 				  -postal_code $Postleitzahl \
 				  -country_code $Land \
Index: openacs-4/packages/contacts/tcl/contacts-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-install-procs.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	17 Apr 2018 14:47:02 -0000	1.29
+++ openacs-4/packages/contacts/tcl/contacts-install-procs.tcl	12 Aug 2018 12:30:06 -0000	1.30
@@ -182,7 +182,7 @@
 
 #    set node_id [db_string get_it { select node_id from site_nodes where object_id = :package_id }]
 
-    # getting the the context_id of the parent package might be a cleaner way of doing this? if yes we should change it.
+    # getting the context_id of the parent package might be a cleaner way of doing this? if yes we should change it.
     set node_id [db_string get_it { select node_id from site_nodes where object_id is null order by node_id desc limit 1 }]
     set subsite_id [site_node::closest_ancestor_package -node_id $node_id -package_key "acs-subsite"]
     set subsite_default_group [application_group::group_id_from_package_id -no_complain -package_id $subsite_id]
@@ -552,7 +552,7 @@
 			ns_log notice "An application group (${contacts_application_group_id}) already exists for contacts instance ${package_id}."
 		    } else {
 			# We are not going to copy all the attributes to this
-			# application groups list. Since we we do not want to
+			# application groups list. Since we do not want to
 			# make assumptions about how a site should be configured
 			set contacts_application_group_id [application_group::new -package_id $package_id -group_name "\#contacts.All_Contacts\#"]
 			ns_log notice "An application group (${contacts_application_group_id}) was created for contacts instance ${package_id}."
@@ -576,7 +576,7 @@
 		    set subsite_application_group_id [application_group::group_id_from_package_id -no_complain -package_id $subsite_package_id]
 
 		    if { $subsite_application_group_id ne "-2" } {
-			error "The upgrade from contacts 1.2b3 to 1.2b4 removes contacts dependence on the registered users group '-2'. It is set to automatically use the nearest subsites application group. Unfortunately since your contacts instance is not mounted directly on the root subsite (i.e. its not mounted at a url similar to /contacts/) this application group is '$subsite_application_group_id'. You either need to manually move all of your contacts and ams::lists associated with the '-2' group to this application group (note the ams::list::copy will come in hand for this) or you may run a custom contacts::default_group_not_cached proc that will return the appropriate_id for your install and keep its functionality for any new contacts instance you create. This proc that corrects your setup should not be part of the official contacts release since its a hack that is now site specific. Sorry for the significant inconvenience. This was what happens when you live on the bleeding edge of developmental versions of software :("
+			error "The upgrade from contacts 1.2b3 to 1.2b4 removes contacts dependence on the registered users group '-2'. It is set to automatically use the nearest subsites application group. Unfortunately since your contacts instance is not mounted directly on the root subsite (i.e. its not mounted at a URL similar to /contacts/) this application group is '$subsite_application_group_id'. You either need to manually move all of your contacts and ams::lists associated with the '-2' group to this application group (note the ams::list::copy will come in hand for this) or you may run a custom contacts::default_group_not_cached proc that will return the appropriate_id for your install and keep its functionality for any new contacts instance you create. This proc that corrects your setup should not be part of the official contacts release since its a hack that is now site specific. Sorry for the significant inconvenience. This was what happens when you live on the bleeding edge of developmental versions of software :("
 		    }
 
 		}
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.122 -r1.123
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	12 Aug 2018 12:22:48 -0000	1.122
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	12 Aug 2018 12:30:06 -0000	1.123
@@ -888,7 +888,7 @@
 		
 	    }
 
-	    # Make sure that we we did not store user preferences before
+	    # Make sure that we did not store user preferences before
 	    if {![db_string user_prefs_p "select 1 from user_preferences where user_id = :user_id" -default "0"]} {
 		db_dml update_user_prefs {insert into user_preferences
 		    (user_id)
Index: openacs-4/packages/contacts/tcl/oo-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/oo-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/contacts/tcl/oo-procs.tcl	18 Apr 2018 09:09:13 -0000	1.12
+++ openacs-4/packages/contacts/tcl/oo-procs.tcl	12 Aug 2018 12:30:06 -0000	1.13
@@ -3,7 +3,7 @@
     Support procs for the contacts package with regards to OpenOffice
 
     Before you can make use of these functions, OpenOffice 2.0 needs to be installed in your system.
-    Additionally you need ghostscript and the msttftcorefonts (so your users wont complain about wrong verdana fonts)
+    Additionally you need ghostscript and the msttftcorefonts (so your users won't complain about wrong verdana fonts)
     Not to forget "vncserver" and "x11fonts".
 
     Once this is done, call "spadmin" as the user running the AOLserver and configure a printer for PDF
Index: openacs-4/packages/contacts/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/contacts/www/search.tcl	9 May 2018 15:33:30 -0000	1.35
+++ openacs-4/packages/contacts/www/search.tcl	12 Aug 2018 12:30:06 -0000	1.36
@@ -113,7 +113,7 @@
 	lappend extended_columns $add_column
     }
 
-    # we run through the multirow here to determine wether or not the columns are allowed
+    # we run through the multirow here to determine whether or not the columns are allowed
     template::multirow foreach ext {
 	set selected_p 0
 	if { [lsearch $extended_columns "${type_key}__${key}"] >= 0 } {
Index: openacs-4/packages/contacts/www/admin/attribute-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/attribute-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/attribute-list.tcl	3 Feb 2006 16:53:41 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/attribute-list.tcl	12 Aug 2018 12:30:06 -0000	1.4
@@ -2,7 +2,7 @@
 ad_page_contract {
 
     Display a list of the available attributes to map to an specific
-    search_id and also the default attributes set in the paramaters
+    search_id and also the default attributes set in the parameters
     for each specific search_type.
     
     @author Miguel Marin (miguelmarin@viaro.net)
Index: openacs-4/packages/contacts/www/admin/full-organizations.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/full-organizations.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/full-organizations.tcl	9 May 2018 15:33:30 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/full-organizations.tcl	12 Aug 2018 12:30:06 -0000	1.4
@@ -27,7 +27,7 @@
 }
 
 if { [llength $party_ids] < 10000 } {
-    # postgresql cannot deal with lists larger than 10000
+    # PostgreSQL cannot deal with lists larger than 10000
     set select_query [template::util::tcl_to_sql_list $party_ids]
 } else {
     set select_query "select p[ad_conn user_id].party_id from parties p[ad_conn user_id]"
@@ -54,7 +54,7 @@
     if { ( $type eq "organization" || $type eq "party" ) && [lsearch $preset_columns $key] >= 0 } {
 	# we aren't adding the columns that are provided by the parties and organizations tables
     } elseif { $type eq "organization" || $type eq "party" } {
-	# if you want other extend columsn they should be added here
+	# if you want other extend columns they should be added here
         # you would add the type you want to show up in this list
         # by default as of the time of writing the only standard
         # extensions (i.e. not site specific) are attributes with
Index: openacs-4/packages/contacts/www/admin/full-people.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/full-people.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/admin/full-people.tcl	9 May 2018 15:33:30 -0000	1.3
+++ openacs-4/packages/contacts/www/admin/full-people.tcl	12 Aug 2018 12:30:06 -0000	1.4
@@ -28,7 +28,7 @@
 }
 
 if { [llength $party_ids] < 10000 } {
-    # postgresql cannot deal with lists larger than 10000
+    # PostgreSQL cannot deal with lists larger than 10000
     set select_query [template::util::tcl_to_sql_list $party_ids]
 } else {
     set select_query "select p[ad_conn user_id].party_id from parties p[ad_conn user_id]"
@@ -55,7 +55,7 @@
     if { ( $type eq "person" || $type eq "party" ) && [lsearch $preset_columns $key] >= 0 } {
 	# we aren't adding the columns that are provided by the parties and persons tables
     } elseif { $type eq "person" || $type eq "party" } {
-	# if you want other extend columsn they should be added here
+	# if you want other extend columns they should be added here
         # you would add the type you want to show up in this list
         # by default as of the time of writing the only standard
         # extensions (i.e. not site specific) are attributes with
Index: openacs-4/packages/contacts/lib/search-contact.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/search-contact.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/lib/search-contact.tcl	19 Dec 2006 11:02:05 -0000	1.6
+++ openacs-4/packages/contacts/lib/search-contact.tcl	12 Aug 2018 12:33:06 -0000	1.7
@@ -1,6 +1,6 @@
 # /packages/project-manager/lib/search-jobid.tcl
 #
-# Include that searchs for the name of a contact
+# Include that searches for the name of a contact
 # and redirects to the found project if it's just one or to
 # first one if there are various.
 # 
Index: openacs-4/packages/contacts/tcl/contact-employee-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-employee-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/tcl/contact-employee-procs.tcl	9 May 2018 15:33:30 -0000	1.8
+++ openacs-4/packages/contacts/tcl/contact-employee-procs.tcl	12 Aug 2018 12:33:06 -0000	1.9
@@ -118,7 +118,7 @@
     # If employer(s) exist
     if {[llength $employers] > 0} {
 	if {[exists_and_not_null organization_id]} {
-	    # If user sepcified to get information for a certain employer, check if the specified employer exists. If employer specified is not an employer, no organization info will be returned.
+	    # If user specified to get information for a certain employer, check if the specified employer exists. If employer specified is not an employer, no organization info will be returned.
 	    foreach single_employer $employers {
 		if {$organization_id == [lindex $single_employer 0]} {
 		    set employer $single_employer
@@ -250,7 +250,7 @@
 	# If employer(s) exist
 	if {[llength $employers] > 0} {
 	    if {[exists_and_not_null organization_id]} {
-		# If user sepcified to get information for a certain employer, check if the specified employer exists. 
+		# If user specified to get information for a certain employer, check if the specified employer exists. 
 		# If employer specified is not an employer, no organization info will be returned.
 		foreach single_employer $employers {
 		    if {$organization_id == [lindex $single_employer 0]} {
Index: openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl	12 Aug 2018 12:22:48 -0000	1.42
+++ openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl	12 Aug 2018 12:33:06 -0000	1.43
@@ -503,7 +503,7 @@
 				    #
 				    set value_pretty [lc_time_fmt $value "%q"]
                                     set output_pretty "[_ contacts.lt_attribute_pretty_is_a]"
-				    # We need to evalute the date_part since the i18N message doesn't
+				    # We need to evaluate the date_part since the i18N message doesn't
 				    # execute the tcl code.
 #				    regexp -nocase {lc_time_fmt [0-9]*-[0-9]*-[0-9]* %[a-z]*} $output_pretty date_part
 #				    set date_result [eval $date_part]
@@ -516,7 +516,7 @@
 				    # its a lot cleaner to not try and do a hack as below to get the date formatted in a lang key, instead change the key to use value_pretty
 				    #
 				    set value_pretty [lc_time_fmt $value "%q"]
-				    # We need to evalute the date_part since the i18N message doesn't
+				    # We need to evaluate the date_part since the i18N message doesn't
 				    # execute the tcl code.
                                     set output_pretty "[_ contacts.lt_attribute_pretty_is_a]"
 #				    regexp -nocase {lc_time_fmt [0-9]*-[0-9]*-[0-9]* %[a-z]*} $output_pretty date_part