From 66e38f1c0f4019667ce588033f2253dce27f3019 Mon Sep 17 00:00:00 2001 From: shikha Date: Tue, 27 Nov 2018 15:30:58 +1000 Subject: [PATCH] Attribution Requirements content --- _data/nav.yml | 1 + _includes/configuration/branding.md | 4 ++- .../attribution-requirements.md | 25 +++++++++++++++++++ general-configuration-guide/get-support.md | 2 +- .../system-requirements.md | 2 +- tash | 25 +++++++++++++++++++ 6 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 general-configuration-guide/attribution-requirements.md create mode 100644 tash diff --git a/_data/nav.yml b/_data/nav.yml index 6c23f82..7ba074c 100644 --- a/_data/nav.yml +++ b/_data/nav.yml @@ -12,6 +12,7 @@ - url: "spell-checking" - url: "filter-content" - url: "localize-your-language" + - url: "attribution-requirements" - url: "system-requirements" - url: "get-support" diff --git a/_includes/configuration/branding.md b/_includes/configuration/branding.md index 95985a6..c013d9c 100644 --- a/_includes/configuration/branding.md +++ b/_includes/configuration/branding.md @@ -1,6 +1,8 @@ ## branding -This option allows you to disable the "Powered by TinyMCE" branding. +Use the **branding** option to disable the "**Powered by Tiny**" displayed in the status bar for [product attribution]({{site.baseurl}}/general-configuration-guide/attribution-requirements/). + +> Note: The "**Powered by Tiny**" product attribution is required for users on the Tiny Cloud Starter plan. Product attribution is **optional** for users on the Developer, Pro, or Custom packages. **Type:** `Boolean` diff --git a/general-configuration-guide/attribution-requirements.md b/general-configuration-guide/attribution-requirements.md new file mode 100644 index 0000000..ab97cce --- /dev/null +++ b/general-configuration-guide/attribution-requirements.md @@ -0,0 +1,25 @@ +--- +layout: default +title: 12. Attribution Requirements +description: TinyMCE Terms of Service. +keywords: legal attribution requirements logo branding +--- +Tiny Cloud is available to anyone wanting to integrate TinyMCE into their own website or application. Use of Tiny Cloud is governed by the [Terms of Service](https://about.tiny.cloud/legal/tiny-cloud-services-subscription-agreement/). Among other things, these terms require adhering to specific guidelines on how branding for Tiny must be handled. The purpose of this document is to highlight these requirements. + +There is a **POWERED BY TINY** attribution in the status bar that is enabled by default for all Tiny Cloud users. The Tiny Cloud Starter plan is meant to support small projects and give back to the community. This option cannot be disabled on a free user account. However, it is **optional** for users on other paid tiers to include attribution and link back to Tiny via a logo or text to let the world know that their editor is powered by Tiny. + +When including attribution, the following requirements must be met: + +* "**POWERED BY TINY**" to be stated or the [Tiny logo](https://www.tiny.cloud/_guidelines/) placed in a readily visible location whenever the editor is loaded. +* The word "**Tiny**" or the Tiny logo should have a hyperlink to https://www.tiny.cloud/. +* The location of the product attribution is to be: + * In the top right-hand corner of the status bar of the TinyMCE editor; or + * An alternate location adjacent to the TinyMCE editor that is no less prominent. + +The editor demo on the [Tiny homepage](https://www.tiny.cloud/) displays the status bar product attribution. + + + +Have questions about this? [Contact us](https://support.tiny.cloud/hc/en-us/requests/new) for help. diff --git a/general-configuration-guide/get-support.md b/general-configuration-guide/get-support.md index d179ae2..a24883d 100644 --- a/general-configuration-guide/get-support.md +++ b/general-configuration-guide/get-support.md @@ -1,6 +1,6 @@ --- layout: default -title: 12. Get Support & FAQ +title: 14. Get Support & FAQ description: Community and pro-grade support options. keywords: forum forums url absolute relative security xss --- diff --git a/general-configuration-guide/system-requirements.md b/general-configuration-guide/system-requirements.md index 7b18a4b..5ad5167 100644 --- a/general-configuration-guide/system-requirements.md +++ b/general-configuration-guide/system-requirements.md @@ -1,6 +1,6 @@ --- layout: default -title: 11. System Requirements +title: 13. System Requirements description: Official TinyMCE browser support. keywords: browser compatibility explorer ie safari firefox chrome edge --- diff --git a/tash b/tash new file mode 100644 index 0000000..3e6126a --- /dev/null +++ b/tash @@ -0,0 +1,25 @@ +diff --git a/_includes/configuration/visual.md b/_includes/configuration/visual.md +index 3e79790..ed53534 100644 +--- a/_includes/configuration/visual.md ++++ b/_includes/configuration/visual.md +@@ -1,6 +1,10 @@ + ## visual +  +-This true/false option gives you the ability to turn on/off the visual aid for tables with no borders. If the border of a table is set to `0`, then TinyMCE adds a dotted line around the table by default. ++This true/false option gives you the ability to enable or disable the `visual` aid. ++ ++This setting also allows `visual` aid to override the `Menu` settings. For instance, you can enable or disable `visual` aid even if the `Menu` is set to `False`. ++ ++If the border of a table is set to `0`, then TinyMCE adds a dotted line around the table by default. +  + **Type:** `Boolean` +  +@@ -12,7 +16,7 @@ This true/false option gives you the ability to turn on/off the visual aid for t +  + ```js + tinymce.init({ +- selector: 'textarea', // change this value according to your HRML ++ selector: 'textarea', // change this value according to your HTML + visual: false + }); + ```