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/portal/portal-liferay.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/portal/portal-liferay.asciidoc')
| -rw-r--r-- | documentation/portal/portal-liferay.asciidoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/portal/portal-liferay.asciidoc b/documentation/portal/portal-liferay.asciidoc index f3a32372c6..677a0458c3 100644 --- a/documentation/portal/portal-liferay.asciidoc +++ b/documentation/portal/portal-liferay.asciidoc @@ -13,7 +13,7 @@ globally in Liferay so that the resources are shared between all Vaadin portlets, as self-contained WARs where each portlet carries their own resources or as OSGi bundles in Liferay 7. -For Liferay 7 and OSGi portlets, see <<dummy/../../../framework/portal/portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. This is the recommended approach when using Vaadin 8.1 or later and Liferay 7. +For Liferay 7 and OSGi portlets, see <<portal-osgi#portal.osgi,"OSGi Portlets on Liferay 7">>. This is the recommended approach when using Vaadin 8.1 or later and Liferay 7. Currently, the latest Maven archetype supports the OSGi approach. The material below applies mostly to non-OSGi portlets. @@ -115,7 +115,7 @@ image::img/liferay-maven-profile.png[] == Creating a Portlet Project with Maven Creation of Vaadin a Maven project is described in -<<dummy/../../../framework/getting-started/getting-started-maven#getting-started.maven,"Using +<<../getting-started/getting-started-maven#getting-started.maven,"Using Vaadin with Maven">>. For a Liferay project, you should use the [literal]#++vaadin-archetype-liferay-portlet++#. |