Skip to content

Commit 68c4dc9

Browse files
authored
Docs update (#212)
1 parent 79f1bfa commit 68c4dc9

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
| Q | A |
2-
|---------------|----------------------------------------------------|
3-
| Branch? | dev-master for features / 4.x for bug fixes |
4-
| Bug fix? | yes/no |
5-
| New feature? | yes/no |
6-
| BC breaks? | no |
7-
| Deprecations? | yes/no |
8-
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> |
1+
| Q | A
2+
| ------------- | ---
3+
| Bug fix? | yes/no
4+
| New feature? | yes/no
5+
| BC breaks? | no
6+
| Deprecations? | yes/no
7+
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
98

109
<!--
1110
Write a short README entry for your feature/bugfix here (replace this comment block.)

docs/13_Wysiwyg_Editor.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CK-Editor Configuration
1+
# Wysiwyg Editor Configuration
22

33
The Toolbox Bundle allows you to override and specify the wysiwyg configuration.
44
There are several reasons for that:
@@ -34,6 +34,9 @@ toolbox:
3434
toolbar2: 'blocks | styles'
3535

3636
```
37+
> [!IMPORTANT]
38+
> If your extending style formats, you also have to extend the [html sanitize](https://pimcore.com/docs/platform/Pimcore/Documents/Editables/WYSIWYG/#extending-symfony-html-sanitizer-configuration)
39+
> otherwise you're applied data will be removed after persisting!
3740
3841
### Area Editor Configuration
3942
If you only need to modify the toolbar configuration for document areas, add this to your configuration:
@@ -51,7 +54,8 @@ toolbox:
5154
### Object Editor Configuration
5255
If you only need to modify the toolbar configuration for objects, add this to your configuration:
5356
54-
> **Note!** The object configuration does not respect different toolbox context environments at the moment.
57+
> [!NOTE]
58+
> The object configuration does not respect different toolbox context environments at the moment.
5559
> Objects are not restricted to any sites by nature which makes any context-binding quite impossible.
5660
5761
**Example**
@@ -66,10 +70,10 @@ toolbox:
6670
```
6771

6872
## TinyMce Editor Plugins
69-
Toolbox provides some CK-Editor Plugins:
73+
Toolbox provides some additional Editor Plugins:
7074

7175
### Google Opt Out
72-
![ck-editor-google-opt-out](https://user-images.githubusercontent.com/700119/37820009-9dd6a418-2e7f-11e8-94b4-99c7a001a3a9.png)
76+
![editor-google-opt-out](https://user-images.githubusercontent.com/700119/37820009-9dd6a418-2e7f-11e8-94b4-99c7a001a3a9.png)
7377

7478
Add a link to allow user to disable google analytics tracking.
7579
There is also a [frontend Javascript Plugin](./80_Javascript.md).

0 commit comments

Comments
 (0)