summaryrefslogtreecommitdiffstats
path: root/documentation/introduction
diff options
context:
space:
mode:
authorZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-05-23 09:43:31 +0300
committerGitHub <noreply@github.com>2019-05-23 09:43:31 +0300
commit0b7457325200162961cae52e7d871db928dc3cd9 (patch)
tree880bbb73259b135e53ee753c2591099e480c70f4 /documentation/introduction
parentbb4898cdfb4f5d2bd34904eb1920b837ac9a3c37 (diff)
downloadvaadin-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/introduction')
-rw-r--r--documentation/introduction/intro-ide.asciidoc4
-rw-r--r--documentation/introduction/intro-overview.asciidoc8
-rw-r--r--documentation/introduction/intro-walkthrough.asciidoc4
3 files changed, 8 insertions, 8 deletions
diff --git a/documentation/introduction/intro-ide.asciidoc b/documentation/introduction/intro-ide.asciidoc
index 7f6fb0056f..e73341277f 100644
--- a/documentation/introduction/intro-ide.asciidoc
+++ b/documentation/introduction/intro-ide.asciidoc
@@ -31,5 +31,5 @@ It enables visual editing of declarative designs that you can use in your applic
See <<dummy/../../../designer/designer-overview#designer.overview, "Vaadin Designer">> for more information.
Using the Vaadin plug-in is the recommended way of installing Vaadin for development.
-Installing the IDEs and the plug-ins is covered in <<dummy/../../../framework/installing/installing-overview#installing, "Installing Development Tools">>.
-The creation of a new Vaadin project with each IDE is covered in <<dummy/../../../framework/getting-started/getting-started-first-project#getting-started.overview, "Creating a Vaadin Project">>.
+Installing the IDEs and the plug-ins is covered in <<installing-overview#installing, "Installing Development Tools">>.
+The creation of a new Vaadin project with each IDE is covered in <<../getting-started/getting-started-first-project#getting-started.overview, "Creating a Vaadin Project">>.
diff --git a/documentation/introduction/intro-overview.asciidoc b/documentation/introduction/intro-overview.asciidoc
index beed28ac6f..f6d779269a 100644
--- a/documentation/introduction/intro-overview.asciidoc
+++ b/documentation/introduction/intro-overview.asciidoc
@@ -51,7 +51,7 @@ application architecture makes our approach a very effective one.
Behind the server-driven development model, Vaadin makes the best use of AJAX (
__Asynchronous JavaScript and XML__, see
-<<dummy/../../../framework/architecture/architecture-technology#architecture.technology.ajax,"AJAX">>
+<<../architecture/architecture-technology#architecture.technology.ajax,"AJAX">>
for a description) techniques that make it possible to create Rich Internet
Applications (RIA) that are as responsive and interactive as desktop
applications.
@@ -76,11 +76,11 @@ Vaadin allows flexible separation between the appearance, structure, and
interaction logic of the user interface. You can design the layouts either
programmatically or declaratively, at the level of your choosing. The final
appearance is defined in __themes__ in CSS or Sass, as described in
-<<dummy/../../../framework/themes/themes-overview.asciidoc#themes.overview,"Themes">>.
+<<../themes/themes-overview.asciidoc#themes.overview,"Themes">>.
We hope that this is enough about the basic architecture and features of Vaadin
for now. You can read more about it later in
-<<dummy/../../../framework/architecture/architecture-overview.asciidoc#architecture.overview,"Architecture">>,
+<<../architecture/architecture-overview.asciidoc#architecture.overview,"Architecture">>,
or jump straight to more practical things in
-<<dummy/../../../framework/application/application-overview.asciidoc#application.overview,"Writing
+<<../application/application-overview.asciidoc#application.overview,"Writing
a Server-Side Web Application">>.
diff --git a/documentation/introduction/intro-walkthrough.asciidoc b/documentation/introduction/intro-walkthrough.asciidoc
index 185498f627..43ae6a9cb3 100644
--- a/documentation/introduction/intro-walkthrough.asciidoc
+++ b/documentation/introduction/intro-walkthrough.asciidoc
@@ -53,7 +53,7 @@ user interface component, which displays simple text, and sets the text to
The example also shows how to create a button and handle button click events.
Event handling is described in
-<<dummy/../../../framework/architecture/architecture-events#architecture.events,"Events and Listeners">> and on the practical side in <<dummy/../../../framework/application/application-events#application.events,"Handling Events with Listeners">>.
+<<../architecture/architecture-events#architecture.events,"Events and Listeners">> and on the practical side in <<../application/application-events#application.events,"Handling Events with Listeners">>.
In Java 8, you can implement listeners with lambda expressions, which simplifies the handler code significantly.
The result of the Hello World application, when opened in a browser, is shown in
@@ -65,6 +65,6 @@ image::img/HelloWorld.png[scaledwidth=70%]
To run a program, you need to package it as a web application WAR package and
deploy it to a server, as explained in
-<<dummy/../../../framework/application/application-environment#application.environment,"Deploying
+<<../application/application-environment#application.environment,"Deploying
an Application">>. During development, you typically deploy to an application
server integrated with the IDE.