ipa_haller_jan: QFQ-Wiki. refs #15634

ipa_haller_jan: QFQ-Wiki. refs #15634

Documentation/Wiki.rst

@@ -104,12 +104,17 @@ Once a wiki page has been created, content can be added/edited. In general, ther
    For example, if you click on a `<h2>`, every subsequent `<h3>`, `<h4>`, etc. up to the next `<h2>` or `<h1>` will be copied into the editor.
    It is important to note that this functionality can only be guaranteed if the headings are not nested within other elements.
 
+Macros
+------
+
 The are macros that can be used within the editor:
 
 * `{{toc}}`: Creates a table of contents with links to the headings on the current page. If no heading are found, `{{toc}}` is returned.
 * `{{childPages}}`: Generates a list of links to the child pages of the current page. If no child pages are found, `{{childPages}}` is returned.
-* `{{wikiPage#Heading}}`: Creates a link to a wiki page within the same wiki. If the wiki page is not found, `{{wikiPage#Heading}}` is returned.
-* `{{pageSlug/wikiPage#Heading}}`: Creates a link to a wiki page in another wiki. If the wiki page is not found, `{{pageSlug/wikiPage#Heading}}` is returned.
+* `{{<wikiPage>#<Heading>}}`: Creates a link to a wiki page within the same wiki by replacing `<wikiPage>` with the name of the
+  wiki page and `<Heading>` with the title of the paragraph. If the wiki page is not found, `{{<wikiPage>#<Heading>}}` is returned.
+* `{{<pageSlug>/<wikiPage>#<Heading>}}`: Creates a link to a wiki page in another wiki by replacing `<pageSlug>` with the page slug of the wiki, `<wikiPage>` with
+  the name of the wiki page and `<Heading>` with the title of the paragraph. If the wiki page is not found, `{{<pageSlug>/<wikiPage>#<Heading>}}` is returned.
 * `{{collapse([Text is shown])}}`
   Text is hidden.
   `{{collapse}}`
@@ -121,12 +126,12 @@ The are macros that can be used within the editor:
 
 .. important::
 
-   `Using links (`{{wikiPage#Heading}}` and `{{pageSlug/wikiPage#Heading}}`) `Heading` is used as the link text.
+   `Using links (`{{<wikiPage>#<Heading>}}` and `{{<pageSlug>/<wikiPage>#<Heading>}}`) `Heading` is used as the link text.
    This means that `#` must be used, but the heading can theoretically be omitted. In this case the full link will be displayed.
 
 .. tip::
 
-   It is possible to upload images to the editor with "drag and drop" or the upload feature. Images are stored under `fileadmin/imageUploadDir/wiki`.
+   It is possible to upload images to the editor with "drag and drop" or the upload feature. Images are stored under `fileadmin/imageUploadDir/wiki/pageSlug`.
 
 History
 -------
@@ -138,8 +143,3 @@ Print
 -----
 
 The option `Print` in the dropdown menu creates a PDF of the wiki page.
-
-.. note::
-
-   Collapsed text will not be displayed in the PDF. There is currently a bug where if the user is logged into Typo3,
-   information from Typo3 is included in the PDF. To fix this, simply log out of Typo3 and the information will be gone.