From 294c695ce1761687dc776d639d35ff7f0deff18e Mon Sep 17 00:00:00 2001
From: Tyler Kelly
Date: Thu, 19 Nov 2020 16:17:46 +1000
Subject: [PATCH] DOC-655: switch from master to main branch (#1765)
* DOC-655: switch from master to main branch
* DOC-655: update werker configuration
---
README.md | 2 +-
_includes/configuration/valid-elements.md | 2 +-
_includes/feedback.html | 2 +-
.../live-demos/premiumskinsandicons-bootstrap/style.css | 2 +-
_includes/template/bodycontents.html | 4 ++--
wercker.yml | 6 +++++-
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 25473063f..2ebe9acc2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# TinyMCE documentation
-[](https://app.wercker.com/project/bykey/4d4c743635332430f9d25acae1be5218)
+[](https://app.wercker.com/project/bykey/4d4c743635332430f9d25acae1be5218)
This project maintains the documentation for TinyMCE at
[https://www.tiny.cloud/docs](https://www.tiny.cloud/docs). If you have any
diff --git a/_includes/configuration/valid-elements.md b/_includes/configuration/valid-elements.md
index 772743932..8dbe9de64 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 d9c4b052a..c3747dfdd 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/live-demos/premiumskinsandicons-bootstrap/style.css b/_includes/live-demos/premiumskinsandicons-bootstrap/style.css
index d8bb9c7e2..666a9c098 100644
--- a/_includes/live-demos/premiumskinsandicons-bootstrap/style.css
+++ b/_includes/live-demos/premiumskinsandicons-bootstrap/style.css
@@ -22,7 +22,7 @@
* Bootstrap v4.3.1 (https://getbootstrap.com/)
* Copyright 2011-2019 The Bootstrap Authors
* Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
.dcs *,
diff --git a/_includes/template/bodycontents.html b/_includes/template/bodycontents.html
index 543820a74..291834c81 100644
--- a/_includes/template/bodycontents.html
+++ b/_includes/template/bodycontents.html
@@ -109,7 +109,7 @@
aside div#optimize-top {
display: none;
visibility: hidden;
- }
+ }
}
aside div#optimize-top {
@@ -184,7 +184,7 @@
{% else %}
Contribute to this page
+ href="https://github.com/tinymce/tinymce-docs/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 6bb42f7fb..3eea797f5 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: