Skip to content

Commit

Permalink
Merge branch 'latest' into control-center-1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewVaadin authored Dec 19, 2024
2 parents 9e6fe63 + 9409ef0 commit f37bc15
Show file tree
Hide file tree
Showing 180 changed files with 7,048 additions and 3,454 deletions.
1 change: 0 additions & 1 deletion .github/styles/Vaadin/Abbr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ exceptions:
- RAM
- RFC
- SAP
- SASS
- SBOM
- SDK
- SPA
Expand Down
2 changes: 1 addition & 1 deletion .github/styles/Vaadin/ReferTo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ scope: raw
action:
name: replace
swap:
'refer to(?: the)? (?:<<|link|xref|https?)': see
'refer to(?: the)? (?:<<#?|link|xref|https?)': see
'check(?: out)?(?: the)? (?:<<|link|xref|https?)': see
'check this (?:<<|link|xref|https?)': see
6 changes: 3 additions & 3 deletions .github/styles/config/vocabularies/Docs/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ bun
[bB]undlers?
[cC]acheable
classpath
[cC]onfig
[cC]onfigurer
configurator
[cC]onfig(|uration|urer|urator)
[cC]onformant
[cC]ontainer-less
Coolors
Expand Down Expand Up @@ -205,6 +203,8 @@ WebDriver
webpack
websockets?
WebSphere
[wW]idgets?
widget's
WildFly
Workbox
Xcode
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Official documentation and code examples for Vaadin.

This repository does not generate the [vaadin.com/docs](https://vaadin.com/docs) or [hilla.dev/docs](https://hilla.dev/docs) websites. It only contains the content for them. The builds are done using [Vaadin Design System Publisher](https://vaadin.com/design-system-publisher).
This repository does not generate the [vaadin.com/docs](https://vaadin.com/docs) website. It only contains the content for them. The builds are done using [Vaadin Design System Publisher](https://vaadin.com/design-system-publisher).

## Contents

Expand Down
2 changes: 1 addition & 1 deletion articles/_commercial-banner.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ ifndef::commercial-banner-content[]
:commercial-banner-content: A commercial Vaadin subscription is required to use {commercial-feature} in your project.
endif::[]

.Commercial feature
.Commercial Feature
[.commercial.skip-search-index]
[NOTE]
====
Expand Down
2 changes: 1 addition & 1 deletion articles/_preview-banner.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ endif::[]

// Preview Feature behind a Feature Flag
ifdef::feature-flag[]
This is a preview version of {preview-feature}. It needs to be enabled with the {feature-flag-docs-link} `{feature-flag}`. Preview versions may lack some planned features, and breaking changes may be introduced in any Vaadin version. We encourage you to try it out and {feedback-link} to help us improve it.
This is a preview version of {preview-feature}. You need to enable it with the {feature-flag-docs-link} `{feature-flag}`. Preview versions may lack some planned features, and breaking changes may be introduced in any Vaadin version. We encourage you to try it out and {feedback-link} to help us improve it.
endif::[]

====
4 changes: 2 additions & 2 deletions articles/_vaadin-version.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:vaadin-version: 24.5.6
:vaadin-flow-version: 24.5.7
:vaadin-version: 24.6.0
:vaadin-flow-version: 24.6.0
:vaadin-seven-version: 7.7.38
:vaadin-eight-version: 8.20.0
23 changes: 0 additions & 23 deletions articles/building-apps/presentation-layer/design/index.adoc

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f37bc15

Please sign in to comment.