Merge remote-tracking branch 'origin/elvill_work' into crose_work

extension/Documentation/UsersManual/Index.rst

@@ -624,7 +624,7 @@ extraDeleteForm
 '''''''''''''''
 
 Depending on the database definition, it might be necessary to delete the primary record *and* corresponding slave records.
-To not repeat such 'slave record delete definition', an 'extraDeleteForm' could be specified. If the user open's a record
+To not repeat such 'slave record delete definition', an 'extraDeleteForm' can be specified. If the user opens a record
 in a form and clicks on the 'delete' button, a defined 'extraDeleteForm'-form will be used to delete primary and slave
 records instead of using the current form.
 E.g. if there are multiple different forms to work on the same table, all of theses forms might reference to the same
@@ -988,7 +988,7 @@ Type: radio
 
   * '''emptyItemAtStart''': Existence of this item inserts an empty entry at the beginning of the selectlist.
   * '''emptyItemAtEnd''': Existence of this item inserts an empty entry at the end of the selectlist.
-  * '''emptyHide''': Existence of this item hides the empty entry. This is usefull for e.g. Enums, which have a en empty
+  * '''emptyHide''': Existence of this item hides the empty entry. This is useful for e.g. Enums, which have a en empty
     entry and the empty value should not be an option to be selected.
 
 Type: select
@@ -1019,7 +1019,7 @@ Type: select
 
   * '''emptyItemAtStart''': Existence of this item inserts an empty entry at the beginning of the selectlist.
   * '''emptyItemAtEnd''': Existence of this item inserts an empty entry at the end of the selectlist.
-  * '''emptyHide''': Existence of this item hides the empty entry. This is usefull for e.g. Enums, which have a en empty
+  * '''emptyHide''': Existence of this item hides the empty entry. This is useful for e.g. Enums, which have an empty
     entry and the empty value should not be an option to be selected.
 
 Type: subrecord
@@ -1074,7 +1074,7 @@ will be rendered inside the form as a HTML table.
   * *form*: Target form, e.g. *form=person*
   * *page*: Target page with detail form. If none specified, use the current page.
   * *title*: Title displayed over the table in the current form.
-  * *extraDeleteForm*: Optional. The per row delete Button will reference such form (for deleting) instead of *form* (default).
+  * *extraDeleteForm*: Optional. The per row delete Button will reference the form specified here (for deleting) instead of the default (*form*).
   * *detail*: Mapping of values from the primary form to the target form (defined via `form=...`).
 
     * Syntax::
@@ -1207,7 +1207,7 @@ sqlInsert / sqlUpdate / sqlDelete
 '''''''''''''''''''''''''''''''''
 
   * Save values of a form to different record(s), optionally on different table(s).
-  * Typically usefull on 'afterSave' - be carefull when using it earlier, e.g. beforeLoad.
+  * Typically useful on 'afterSave' - be careful when using it earlier, e.g. beforeLoad.
 
 FormElement.’‘’parameter’‘’:
 
@@ -1447,8 +1447,8 @@ Text across several lines
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 To make SQL queries, or QFQ records in general, more readable, it's possible to split a line across several lines. Lines
-with keywords are on their own (`QFQ Keywords (Bodytext)`_) starts a new line - if a line is not a 'keyword' line, it will
-be appended at the last keyword line. 'Keyword' lines are detected on:
+with keywords are on their own (`QFQ Keywords (Bodytext)`_ start a new line). If a line is not a 'keyword' line, it will
+be appended to the last keyword line. 'Keyword' lines are detected on:
 
  * <level>.<keyword> =
  * {
@@ -1506,7 +1506,7 @@ last character of that line must be one of '{}[]()<>'. The corresponding braces
 
 Per QFQ tt-content record, only one type of nesting braces can be used.
 
-Be carefull to:
+Be careful to:
 
 * write nothing else than whitespaces/newline behind an **open brace**
 * the **closing brace** has to be alone on a line. ::
@@ -1620,7 +1620,7 @@ Special column names
 +------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |_exec                   |Run batch files or executables on the webserver.                                                                                                                                             |
 +------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|_vertical               |Render Text vertically. This is usefull for tables with limited column width.                                                                                                                |
+|_vertical               |Render Text vertically. This is useful for tables with limited column width.                                                                                                                 |
 +------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 |_img                    |Display images.                                                                                                                                                                              |
 +------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -2732,7 +2732,7 @@ records not exist, the form should create it.
 
 Form primary table: Person
 
-Form salve table: Address
+Form slave table: Address
 
 Relation: `Person.id = Address.personId`
 
@@ -2774,7 +2774,7 @@ Form: Person Wizard - firstname, single note
 --------------------------------------------
 
 Requirement: A form that displays the column 'firstname' from table 'Person' and 'note' from table 'Note'.
-If the records not exist, the form should create it.
+If the records don't exist, the form should create it.
 Column Person.noteId points to Note.id
 
 Form primary table: Person
@@ -2881,4 +2881,4 @@ FAQ
 
  * Q: A variable {{<var>}} is shown as empty string, but there should be a value.
 
-   * A: The sanatize rule is violeted and therefore the value has been removed. Set {{<var>:<store>:all}} as a test.
\ No newline at end of file
+   * A: The sanatize rule is violeted and therefore the value has been removed. Set {{<var>:<store>:all}} as a test.