Merge branch 'develop' of https://github.com/karaka-management/Documentation into develop

.github/workflows/image.yml

@@ -19,6 +19,6 @@ jobs:
         uses: actions/checkout@master
 
       - name: Compress Images
-        uses: calibreapp/image-actions@master
+        uses: calibreapp/image-actions@main
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}

administration/permissions.md

@@ -39,7 +39,7 @@ These permissions can be assigned on multiple levels (descending in the followin
 * Unit/Organization
 * Application
 * Module
-* Type
+* Category
 * Element
 * Component
 
@@ -55,9 +55,9 @@ Every unit/organization can have multiple applications. One application could fo
 
 Different modules provide different features, by defining the modules permissions can be managed more granular. A sales person for example doesn't need access to R&D for example.
 
-### Type
+### Category
 
-Often a module provides multiple features or functionalities. The type can be used to give accounts even more specific permissions. In a organization an account may be allowed to create new invoices for customers but is not allowed to create a new customer.
+Often a module provides multiple features or functionalities. The category can be used to give accounts even more specific permissions. In a organization an account may be allowed to create new invoices for customers but is not allowed to create a new customer.
 
 ### Element
 

setup/first_steps.md

@@ -45,7 +45,7 @@ When you assign the above mentioned permissions to a group you will see that you
 * The `Unit` this permission is for (after the installation you only have one unit but you maybe want to have additional units/sub-organizations later on)
 * The `App` this permission is for (after the installation you only have the `Backend` and the `Api` but in the future you may have additional apps, which sometimes even get provided by other modules e.g. `TicketApp`)
 * The `Module` this permission is for (e.g. the group only has create/write permissions for a certain module)
-* The `Type` is the module specific and can be found in the module help. This can be e.g. news-article in the News module, account in the Admin module etc.
+* The `Category` is  module specific and can be found in the module help. This can be e.g. news-article in the News module, account in the Admin module etc.
 * The `Element` is the specific model/element (e.g. a specific news article). This is represented by the element ID/number.
 * The `Component` is the specific component of a element/model (e.g. the title of a news article).
 
@@ -62,5 +62,3 @@ By default only admin users can create new accounts. However it is possible to a
 If a admin user creates a new account you must decide if the user/account should also be allowed to login/have a profile or if this account is just an internal account. 
 
 If the user should be allowed to login/active user you should click on `Create Profile` to also create a profile for the user. Upon doing this the user will receive a registration email in the same way as if he registered by himself. The registration email contains a preliminary password which the user should change.
-
-## 

setup/install.md

@@ -32,9 +32,7 @@ sudo add-apt-repository ppa:ondrej/php
 sudo apt-get update
 
 sudo apt-get install software-properties-common apache2 mysql-server
-```
 
-```sh
 sudo a2enmod rewrite
 sudo a2enmod headers
 ```
@@ -66,6 +64,8 @@ Some modules in the application may need text recognition of scanned files (e.g.
 ###### Windows
 
 Download and install [tesseract](https://tesseract-ocr.github.io/tessdoc/Downloads.html).
+Download and install [pdftotext](https://www.xpdfreader.com/pdftotext-man.html).
+Download and install [pdftoppm](https://www.xpdfreader.com/pdftoppm-man.html).
 
 ###### Linux
 
@@ -196,4 +196,4 @@ The web subdirectory by default is `/`. If you installed the application in a su
 
 ##### Install
 
-After clicking install you will either receive a message that something went wrong e.g. some configurations are wrong (please fix them) or the installation will redirect you to the login if everything went smoothly. Please make sure to delete the `Install` directory so that no-one else can use it.
+After clicking install you will either receive a message that something went wrong e.g. some configurations are wrong (please fix them) or the installation will redirect you to the login if everything went smoothly. Please make sure to delete the `Install` directory so that no-one else can use it.