diff options
| author | Zhe Sun <31067185+ZheSun88@users.noreply.github.com> | 2019-05-23 09:43:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 09:43:31 +0300 |
| commit | 0b7457325200162961cae52e7d871db928dc3cd9 (patch) | |
| tree | 880bbb73259b135e53ee753c2591099e480c70f4 /documentation/components/components-customcomponent.asciidoc | |
| parent | bb4898cdfb4f5d2bd34904eb1920b837ac9a3c37 (diff) | |
| download | vaadin-framework-0b7457325200162961cae52e7d871db928dc3cd9.tar.gz vaadin-framework-0b7457325200162961cae52e7d871db928dc3cd9.zip | |
Update broken docs syntax in github (#11596)
* Add delay to the unstable test
* Add delay for unstable tests
* Update broken docs syntax in github
* Merge branch 'master' into ZheSun88-patch-1
* Update doc reference syntax
* Merge branch 'ZheSun88-patch-1' of github.com:vaadin/framework into ZheSun88-patch-1
# Conflicts:
# documentation/components/components-overview.asciidoc
* Merge branch 'master' into ZheSun88-patch-1
* use .asciidoc
* Merge remote-tracking branch 'origin/ZheSun88-patch-1' into ZheSun88-patch-1
* use .asciidoc
* Merge branch 'master' into ZheSun88-patch-1
Diffstat (limited to 'documentation/components/components-customcomponent.asciidoc')
| -rw-r--r-- | documentation/components/components-customcomponent.asciidoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/components/components-customcomponent.asciidoc b/documentation/components/components-customcomponent.asciidoc index 96024d0ace..5adca246c8 100644 --- a/documentation/components/components-customcomponent.asciidoc +++ b/documentation/components/components-customcomponent.asciidoc @@ -13,7 +13,7 @@ composite components. In many applications, such composite components make up the majority of the user interface. As described earlier in -<<dummy/../../../framework/application/application-architecture#application.architecture.composition,"Compositing +<<../application/application-architecture#application.architecture.composition,"Compositing Components">>, you have two basic ways to create a composite - either by extending a layout component or by using a composition component (a [classname]#Composite# or a [classname]#CustomComponent#), which typically @@ -87,5 +87,5 @@ composition. Even further, you can create entirely new low-level components, by integrating pure client-side components or by extending the client-side functionality of built-in components. Development of new components is covered in -<<dummy/../../../framework/gwt/gwt-overview.asciidoc#gwt.overview,"Integrating +<<../gwt/gwt-overview.asciidoc#gwt.overview,"Integrating with the Server-Side">>. |