Merge pull request #244 from luzpaz/typos-various

Fix various typos

doc/deployment.adoc

@@ -17,10 +17,10 @@ link:index{outfilesuffix}[Top]
 3. Define new release variable: +
    `./build.gradle.kts: version = '8.0'`
 4. `./gradlew clean build`
-5. If all tests are finished successfully and the test of the ProjectForge-Application works for new and existing databases), proceeed:
+5. If all tests are finished successfully and the test of the ProjectForge-Application works for new and existing databases), proceed:
 6. Copy executable jar file from `projectforge-application/build/libs/projectforge-application-\*.jar` to SourceForge and tag this file as default for all platforms
 7. Building and pushing docker
-    a. For testing docker images first, please refer `/dokcer/README.adoc`.
+    a. For testing docker images first, please refer `/docker/README.adoc`.
     b. `export PF_VERSION=8.0`
     c. `export DOCKER_USER=micromata`
     d. `cp projectforge-application/build/libs/projectforge-application*.jar .`
@@ -35,7 +35,7 @@ link:index{outfilesuffix}[Top]
 11. Create new SNAPSHOT-Release by increasing version number: +
 `./build.gradle.kts: version = '8.0.1-SNAPSHOT'`
 12. Commit everything to master and develop branch and push it to Github
-13. Upload the saved jar files to Github (Create release from taged version) and SourceForge (e.g. as zip (see previous versions as example)).
+13. Upload the saved jar files to Github (Create release from tagged version) and SourceForge (e.g. as zip (see previous versions as example)).
 
 Optional (if not done before):
 

docker/entrypoint.sh

@@ -83,7 +83,7 @@ if [ -f "$CONFIG_FILE" ]; then
   echo "Normal start"
   java $START &
 else
-  # CONFIG_FILE doesn't exist, so assume intial start:
+  # CONFIG_FILE doesn't exist, so assume initial start:
   # java must run in foreground for using the console setup wizard.
   echo "Initial start"
   java $START

plugins/org.projectforge.plugins.datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt

@@ -74,7 +74,7 @@ open class DataTransferAccessChecker(
   }
 
   /**
-   * Checks select/download-access (same). See [checkDownloadAccess] for special handling of perosnal boxes.
+   * Checks select/download-access (same). See [checkDownloadAccess] for special handling of personal boxes.
    */
   private fun checkAccess(user: PFUserDO?, id: Any) {
     user!!

plugins/org.projectforge.plugins.ihk/src/main/java/org/projectforge/plugins/ihk/IHKExporter.java

@@ -192,7 +192,7 @@ private double setNewRows(double hourCounter, final TimesheetDO timesheet, Excel
 
 
     /*
-      Calculate height of cell from the content lenght and the number of line breaks
+      Calculate height of cell from the content length and the number of line breaks
     */
 
     String puffer = description;

plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignEditPage.java

@@ -31,7 +31,7 @@
 import org.slf4j.Logger;
 
 /**
- * The controler of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super
+ * The controller of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super
  * class.
  *
  * @author Kai Reinhard ([email protected])

plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignValueEditPage.java

@@ -37,7 +37,7 @@
 import java.util.Iterator;
 
 /**
- * The controler of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super
+ * The controller of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super
  * class.
  *
  * @author Kai Reinhard ([email protected])

plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinRunner.kt

@@ -421,7 +421,7 @@ open class MerlinRunner {
       }
     }
     if (!validUsernames) {
-      log.error { "Errors for personal box users occured. No document will be send to any personal user box. Aborting." }
+      log.error { "Errors for personal box users occurred. No document will be send to any personal user box. Aborting." }
       return pdfDocuments
     }
     var counter = 0

plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinStatistics.kt

@@ -88,7 +88,7 @@ class MerlinStatistics {
   }
 
   /**
-   * Updates dto variables: Adds statistics variables not yet included in dto and updates usage info (defined, master variabl etc.)
+   * Updates dto variables: Adds statistics variables not yet included in dto and updates usage info (defined, master variable etc.)
    * of dto variables and dependentVariables.
    */
   fun updateDtoVariables(dto: MerlinTemplate) {

plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinVariable.kt

@@ -76,7 +76,7 @@ class MerlinVariable : MerlinVariableBase() {
 
   /**
    * Input variables will be displayed for editing (or given in serial Excel). Input variables are defined and not dependent.
-   * Equals to definded && !dependent.
+   * Equals to defined && !dependent.
    */
   val input: Boolean
     get() = defined && !dependent

plugins/org.projectforge.plugins.skillmatrix/src/main/kotlin/org/projectforge/plugins/skillmatrix/SkillMatrixPlugin.kt

@@ -41,7 +41,7 @@ private val log = KotlinLogging.logger {}
 class SkillMatrixPlugin : AbstractPlugin(
     PluginAdminService.PLUGIN_SKILL_MATRIX_ID,
     "Skill matrix",
-    "The users skills managed by the users themselve."
+    "The users skills managed by the users themselves."
 ) {
 
     override fun initialize() {

site/_changelogs/changelog-20180717--6-22.md

@@ -8,7 +8,7 @@ The ProjectForge Version 6.22.0 with new Spring Boot version and some bugfixes i
 __The ProjectForge Launcher is not working anymore. Only the projectforge-application.jar command-line starter is available.__
 
 {% include tag.html tag="added" %}
-- BIC for german IBANs optiona
+- BIC for german IBANs optional
 
 {% include tag.html tag="improved" %}
 - Update Spring Boot version to 2.0

site/_changelogs/changelog-20210525--7-2.adoc

@@ -9,7 +9,7 @@ Security issues of pentests, DataTransfer improved.
 ++++
 {% include tag.html tag="added" %}
 ++++
-- Word-Templating (Merlin): Word templating for letters, information, contracts etc. with serial execution including variables, if-else-expressions etc. inside docx (like Velocity-Scripting-engine). All users/emloyees may receive letters/contracts etc. (as Word and/or PDF-files) in ther personal boxes via serial execution. +
+- Word-Templating (Merlin): Word templating for letters, information, contracts etc. with serial execution including variables, if-else-expressions etc. inside docx (like Velocity-Scripting-engine). All users/emloyees may receive letters/contracts etc. (as Word and/or PDF-files) in their personal boxes via serial execution. +
   example template files included for a quick start.
 - Log viewer added (for admins as well as for users for tracking own activity for mass updates of time-sheets, usage of Merlin or Datev-imports)
 - Gender for users added: Used by Merlin (word templating) for creation of personalized letters, contracts etc.

site/_data/navigation_boxes.yml

@@ -1,7 +1,7 @@
 # Boxes include navigation
 
 - title: Scalable
-  desc: A professional project management, financial and adminstrative controlling platform for teams from small to large.
+  desc: A professional project management, financial and administrative controlling platform for teams from small to large.
   icon: settings
   #doc: installation
 

site/_docs/adminguide.adoc

@@ -209,7 +209,7 @@ ProjectForge works with Groovy templates for generating e-mails (as
 notifications). You'll find the templates inside your web archive of the
 ProjectForge
 installation: `plugins/projectforge-business-X.X.X.jar/mail/.` You can
-modify any template of this directory if needed by simply copiing the
+modify any template of this directory if needed by simply copying the
 file(s) you want to modify into your ProjectForge application dir, which
 is also the destination of `application.properties:`
 
@@ -528,10 +528,10 @@ projectforge.phoneLookupKey=*******SECRET********
 
 If you work with accounting records (DATEV) you may be want to have
 business assessments (BWA in German). The business assessments of DATEV
-constist of rows. Each row has a line number (no) and a title (for
+consists of rows. Each row has a line number (no) and a title (for
 displaying). The `accountRange` defines which DATEV accounts matches the
 row. Please note, that a record is assigned to the first row found.  +
-If the priorty of a row is not high, the row will not be shown in the
+If the priority of a row is not high, the row will not be shown in the
 short form of business assessments. The value defines row amounts which
 are calculated (see example below).
 
@@ -585,17 +585,17 @@ password change.
 
 ==== 2FA (two-factor-authentication)
 
-2FA (two factor autentication) is supported:
+2FA (two factor authentication) is supported:
 
  * by using RFC6238, used by e. g. Google or Microsoft Authenticator.
  * SMS if configured
  * Fido2/WebAuthn (e. g. Yubikey)
 
 You may specify the expiry periods of 2FA for different expiry periods URL's by shortcuts for
 predefined sets of uri matchers and/or own regular expressions (as uri matchers).
-A web filter checks for every request, if there is a 2FA is required and
-if the last successfull 2FA of the current session is not older than the specified expiry period.
-The timestamp of a sucessfull 2FA is stored in the user's session as well as in any user's
+A web filter checks for every request, if a 2FA is required and if the last
+successful 2FA of the current session is not older than the specified expiry period.
+The timestamp of a successful 2FA is stored in the user's session as well as in any user's
 stay-logged-in-session.
 
 Recoomended example configuration:
@@ -623,7 +623,7 @@ Rules
 * If expressions do start with `/` they will be replaced by their regex: `/rs/user` -> `^/rs/user.+++*+++`:
 Any uri *starting* with `/rs/user` is matching.
 * Empty entries means: no 2nd factor
-* Regular expressions and shortcuts should be seperated by ';'.
+* Regular expressions and shortcuts should be separated by ';'.
 * Supported shortcuts are `ADMIN`, `HR`, `FINANCE`, `ORGA`, `SCRIPTING`, `MY_ACCOUNT`, `PASSWORD`
 containing a bunch of regex.
 * You may also use `WRITE:<entity-name>` for specifying only all write access calls of an entity (rest calls of React and
@@ -765,7 +765,7 @@ assigned in ProjectForge to the same ProjectForge group.
 
 ===== LDAP entries
 
-See figures [.external-link]#3# and [.external-link]#4# for detailled
+See figures [.external-link]#3# and [.external-link]#4# for detailed
 information of how does ProjectForge stores and expect LDAP fields and
 object classes.
 
@@ -779,7 +779,7 @@ fields `uidNumber, gidNumber, homeDirectory` and `loginShell` are only
 used and managed if configured).
 The field `employeeNumber` is used by ProjectForge for storing the
 primary key of the ProjectForge user entry in LDAP (for a better
-syncronization). So the renaming of user names should work.
+synchronization). So the renaming of user names should work.
 |===
 
 image::/uploads/adminguide/LDAP-group-entry.png[image]
@@ -789,7 +789,7 @@ image::/uploads/adminguide/LDAP-group-entry.png[image]
 |Figure 4: |ProjectForge uses the fields and object classes shown in
 this figure for groups. The field `businessCategory` is used by
 ProjectForge for storing the primary key of the ProjectForge group entry
-in LDAP (for a better syncronization). So the renaming of group names
+in LDAP (for a better synchronization). So the renaming of group names
 should work.
 |===
 
@@ -798,7 +798,7 @@ should work.
 ProjectForge supports the management of POSIX accounts with the
 data `uidNumber,` `gidNumber,` `homeDirectory,` and `loginShell.`
 
-You can adminster the POSIX account data in the UserEditPage after
+You can administer the POSIX account data in the UserEditPage after
 configuring the *`application.properties`* like the above example.
 Pleaser refer the tool-tips for further information:
 
@@ -949,7 +949,7 @@ Refer the migration guide for required, manual changes.
 
 === Re-indexing the database
 
-Should be done after setup: Use the adminstration menu.
+Should be done after setup: Use the administration menu.
 
 === Analysing tools
 
@@ -1053,7 +1053,7 @@ ____
 If you want to use productive data in your develepment system for
 testing, it's recommended to set all e-mail addresses of the users to
 your developers e-mail. Also all passwords can be easily set
-to `test123` if you user folliwing sql statement in your test database
+to `test123` if you user following sql statement in your test database
 (not productive!):
 ____
 
@@ -1216,7 +1216,7 @@ automatically enabled are described here.
 The plugins-jar must be in another folder(plugins) next to the
 ProcetForgeJar.
 
-The plugins are managed under Adminstration --> Plugins in the
+The plugins are managed under Administration --> Plugins in the
 ProjectForge web app. After the activation, they have to restart
  ProjectForge.
 

site/_docs/development.adoc

@@ -71,7 +71,7 @@ With ProjectForge 7.x Kotlin and ReactJS is introduced.
   ** Smart operations on collections (map, find, sort etc.)
   ** Immutable objects, classes and functions as default.
   ** Null safety
-  ** Compability with JAVA code.
+  ** Compatibility with JAVA code.
 * Java and Kotlin will both exist. Only most BaseDO classes were migrated and new functionality will mostly be written in Kotlin.
 
 Please note: Kotlin must be compiled with target 1.8 (Java version) but is fully runnable on Java 9, 10 and 11 VMs.

site/_docs/installation.adoc

@@ -123,7 +123,7 @@ ProjectForge is only available on port 8080 from localhost due to security reaso
 
 [NOTE]
 ====
-Please be aware, that after your first start of ProjectForge, your page might be public and be configured by anybody else! So proceed immediatelyly with the configuration if your new ProjectForge instance is
+Please be aware, that after your first start of ProjectForge, your page might be public and be configured by anybody else! So proceed immediately with the configuration if your new ProjectForge instance is
 public available.
 ====
 
@@ -139,7 +139,7 @@ h|User name | The user name of the initial admin user of ProjectForge.
 h|Password | Admin's password.
 h|Default time zone | Default time zone for all users, if not configured by an user und MyAccount.
 h|Calendar domain | ProjectForge provides calendar and events. For having world-wide unique event id's, choose here your personal name.
-h|Administrators | ProjectForge sends e-mails to this address(es) in the case of special errors. You can specify one ore more (coma separated) addresses (RFC822).
+h|Administrators | ProjectForge sends e-mails to this address(es) in the case of special errors. You can specify one or more (coma separated) addresses (RFC822).
 h|Feed-back | If this e-mail is given then a feedback panel will be shown if an error occurs. The user has the possibility to send an e-mail feedback (e. g. JIRA-system or help desk).
 |===
 
@@ -213,10 +213,10 @@ All of the commands below should be run with `root` privileges.
 ==== Configure Nginx
 
 To use NGINX as a reverse proxy, it's necessary to create a configuration file. The standard path for NGINX configurations is `/etc/nginx/sites-available/`, so let's create the file link:misc/nginx_sites-available_projectforge[`/etc/nginx/sites-available/projectforge`].
-If you want to use `.htaccess` to blok access to the installation, you need to remove the comment character (`#`) in front of the `auth_basic` and `auth_basic_file` parameters.
+If you want to use `.htaccess` to block access to the installation, you need to remove the comment character (`#`) in front of the `auth_basic` and `auth_basic_file` parameters.
 If you want to use HSTS (which makes browsers show an error page when the SSL certificate is invalid and/or nonexistent), remove the comment character (`#`) in front of the `add_header Strict-Transport-Security` parameter.
 
-**Remeber to replace *projectforge.example.com* with the actual domain you'll run ProjectForge on!**
+**Remember to replace *projectforge.example.com* with the actual domain you'll run ProjectForge on!**
 
 
 To activate the NGINX configuration, you'll need to symlink the configuration file we just created to `/etc/nginx/sites-enabled`. This can be done by using the following command:
@@ -281,7 +281,7 @@ Daily backups (not monthly) will be deleted after 30 days.
 Refer config file for all options: [https://github.com/micromata/projectforge/blob/develop/projectforge-business/src/main/resources/application.properties]
 
 == Supported Java versions
-.Java Compability (2021/04/12)
+.Java Compatibility (2021/04/12)
 [cols="1,1,1,3"]
 |===
 |Java version | V7.5+ | V8.0+ | Comments