Browse Source

fix multiple issues

* fix #181 add content-formatting config option
* fix #189 change title of Plugins nav
pull/193/head
r12s 10 years ago
parent
commit
fef27a62b6
  1. 16
      _data/nav.yml
  2. 14
      configure/content-filtering.md
  3. 20
      configure/content-formatting.md
  4. 4
      plugins/index.md

16
_data/nav.yml

@ -79,7 +79,6 @@
pages:
- url: "#allow_conditional_comments"
- url: "#allow_html_in_named_anchor"
- url: "#block_formats"
- url: "#convert_fonts_to_spans"
- url: "#custom_elements"
- url: "#doctype"
@ -89,26 +88,29 @@
- url: "#entity_encoding"
- url: "#extended_valid_elements"
- url: "#fix_list_elements"
- url: "#font_formats"
- url: "#fontsize_formats"
- url: "#force_hex_style_colors"
- url: "#force_p_newlines-(deprecated)"
- url: "#forced_root_block"
- url: "#forced_root_block_attrs"
- url: "#formats"
- url: "#indentation"
- url: "#invalid_elements"
- url: "#invalid_styles"
- url: "#keep_styles"
- url: "#protect"
- url: "#remove_trailing_brs"
- url: "#schema"
- url: "#style_formats_merge"
- url: "#style_formats"
- url: "#valid_children"
- url: "#valid_classes"
- url: "#valid_elements"
- url: "#valid_styles"
- url: "content-formatting"
pages:
- url: "#block_formats"
- url: "#font_formats"
- url: "#fontsize_formats"
- url: "#formats"
- url: "#indentation"
- url: "#style_formats"
- url: "#style_formats_merge"
- url: "spelling"
pages:
- url: "#browser_spellcheck"

14
configure/content-filtering.md

@ -9,8 +9,6 @@ description: These settings change the way the editor handles the input and outp
{% include configuration/allow-html-in-named-anchor.md %}
{% include configuration/block-formats.md %}
{% include configuration/convert-fonts-to-spans.md %}
{% include configuration/custom-elements.md %}
@ -29,10 +27,6 @@ description: These settings change the way the editor handles the input and outp
{% include configuration/fix-list-elements.md %}
{% include configuration/font-formats.md %}
{% include configuration/fontsize-formats.md %}
{% include configuration/force-hex-style-colors.md %}
{% include configuration/force-p-newlines.md %}
@ -41,10 +35,6 @@ description: These settings change the way the editor handles the input and outp
{% include configuration/forced-root-block-attrs.md %}
{% include configuration/formats.md %}
{% include configuration/indentation.md %}
{% include configuration/invalid-elements.md %}
{% include configuration/invalid-styles.md %}
@ -57,10 +47,6 @@ description: These settings change the way the editor handles the input and outp
{% include configuration/schema.md %}
{% include configuration/style-formats-merge.md %}
{% include configuration/style-formats.md %}
{% include configuration/valid-children.md %}
{% include configuration/valid-classes.md %}

20
configure/content-formatting.md

@ -0,0 +1,20 @@
---
layout: default
title: Content Formatting
description_short: Learn how to create clean, maintainable and readable content.
description: These settings change the way the editor handles the input and output of content. This will help you to create clean, maintainable and readable content.
---
{% include configuration/block-formats.md %}
{% include configuration/font-formats.md %}
{% include configuration/fontsize-formats.md %}
{% include configuration/formats.md %}
{% include configuration/indentation.md %}
{% include configuration/style-formats.md %}
{% include configuration/style-formats-merge.md %}

4
plugins/index.md

@ -1,9 +1,11 @@
---
layout: default
title: Add Plugins
title: Add Plugins to TinyMCE
title_nav: Add Plugins to TinyMCE
description_short: This section will help you configure and extend your editor instance.
description: TinyMCE is an incredibly powerful, flexible and customizable rich text editor. This section will help you configure and extend your editor instance.
type: folder
---
{% assign links = site.data.nav[3].pages %}
{% include index.html links=links %}
Loading…
Cancel
Save