From b9ceb23071094841e8001f439666926aff25983f Mon Sep 17 00:00:00 2001 From: Tyler Kelly Date: Thu, 19 Nov 2020 16:06:44 +1000 Subject: [PATCH] DOC-655: switch from master to main branch (#95) * DOC-655: switch from master to main branch * DOC-655: update werker conf --- README.md | 2 -- _includes/configuration/valid-elements.md | 2 +- _includes/feedback.html | 2 +- _includes/template/bodycontents.html | 2 +- wercker.yml | 6 +++++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b393c30..5950cf5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # TinyMCE documentation -[![wercker status](https://app.wercker.com/status/4d4c743635332430f9d25acae1be5218/s/master "wercker status")](https://app.wercker.com/project/bykey/4d4c743635332430f9d25acae1be5218) - This project maintains the documentation for TinyMCE at [https://www.tiny.cloud/docs-4x/](https://www.tiny.cloud/docs-4x/). If you have any modifications you wish to contribute, fork this project, make the changes diff --git a/_includes/configuration/valid-elements.md b/_includes/configuration/valid-elements.md index f1ffee5..b043d75 100644 --- a/_includes/configuration/valid-elements.md +++ b/_includes/configuration/valid-elements.md @@ -3,7 +3,7 @@ The valid_elements option defines which elements will remain in the edited text when the editor saves. You can use this to limit the returned HTML to a subset. -This option contains a comma separated list of element conversion chunks. Each chunk contains information about how one element and its attributes should be treated. The default rule set for this option is a mixture of the full [HTML5](http://www.w3.org/html/wg/drafts/html/master/) and [HTML4](http://www.w3.org/TR/REC-html40/) specification or the HTML5 or HTML4 specification depending on the configured [schema]({{ site.baseurl }}/configure/content-filtering/#schema). +This option contains a comma separated list of element conversion chunks. Each chunk contains information about how one element and its attributes should be treated. The default rule set for this option is a mixture of the full [HTML5](https://html.spec.whatwg.org/) and [HTML4](http://www.w3.org/TR/REC-html40/) specification or the HTML5 or HTML4 specification depending on the configured [schema]({{ site.baseurl }}/configure/content-filtering/#schema). If you just want to add or change some behavior for a few items, use the [extended_valid_elements]({{ site.baseurl }}/configure/content-filtering/#extended_valid_elements) option diff --git a/_includes/feedback.html b/_includes/feedback.html index d9c4b05..c3747df 100644 --- a/_includes/feedback.html +++ b/_includes/feedback.html @@ -9,7 +9,7 @@ Well, that's awkward . Would you mind opening an issue or - helping us out? + helping us out?

Thanks for the feedback! diff --git a/_includes/template/bodycontents.html b/_includes/template/bodycontents.html index 37ab9fd..b2065bf 100644 --- a/_includes/template/bodycontents.html +++ b/_includes/template/bodycontents.html @@ -184,7 +184,7 @@ {% else %} Contribute to this page + href="https://github.com/tinymce/tinymce-docs-4x/tree/main/{{ page.path }}">Contribute to this page {% endif %} {% if page.controls %} {% assign controls = page.controls | split:',' %} diff --git a/wercker.yml b/wercker.yml index e066651..4797a34 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,8 @@ -box: jointiny/tiny-cloud-docs-build:latest +box: + id: jointiny/tiny-cloud-docs-build + username: $DOCKER_USER + password: $DOCKER_PASSWORD + tag: latest no-response-timeout: 30 build: