Browse Source

DOC-655: switch from master to main branch (#1765)

* DOC-655: switch from master to main branch

* DOC-655: update werker configuration
pull/1771/head
Tyler Kelly 5 years ago
committed by GitHub
parent
commit
294c695ce1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 2
      _includes/configuration/valid-elements.md
  3. 2
      _includes/feedback.html
  4. 2
      _includes/live-demos/premiumskinsandicons-bootstrap/style.css
  5. 2
      _includes/template/bodycontents.html
  6. 6
      wercker.yml

2
README.md

@ -1,6 +1,6 @@
# TinyMCE documentation
[![wercker status](https://app.wercker.com/status/4d4c743635332430f9d25acae1be5218/s/master "wercker status")](https://app.wercker.com/project/bykey/4d4c743635332430f9d25acae1be5218)
[![wercker status](https://app.wercker.com/status/4d4c743635332430f9d25acae1be5218/s/main "wercker status")](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

2
_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

2
_includes/feedback.html

@ -9,7 +9,7 @@
Well, that's awkward <i class="em em-sweat_smile"></i>. Would you mind
<a class="link-burrito" data-action="feedback-open-issue" href="https://github.com/tinymce/tinymce-docs/issues/new?body=%0A%0A%0A{{ issue_body | url_encode }}&title={{ issue_title | url_encode }}" target="_blank">opening an issue</a>
or
<a class="link-burrito" data-action="feedback-edit" href="https://github.com/tinymce/tinymce-docs/tree/master/{{ page.path }}" target="_blank">helping us out</a>?
<a class="link-burrito" data-action="feedback-edit" href="https://github.com/tinymce/tinymce-docs/tree/main/{{ page.path }}" target="_blank">helping us out</a>?
</p>
<p class="feedback-yes">
Thanks for the feedback!

2
_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 *,

2
_includes/template/bodycontents.html

@ -184,7 +184,7 @@
<!-- Disabled since there is no git link -->
{% else %}
<a class="contribute link-garlic"
href="https://github.com/tinymce/tinymce-docs/tree/master/{{ page.path }}">Contribute to this page<i></i></a>
href="https://github.com/tinymce/tinymce-docs/tree/main/{{ page.path }}">Contribute to this page<i></i></a>
{% endif %}
{% if page.controls %}
{% assign controls = page.controls | split:',' %}

6
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:

Loading…
Cancel
Save