Formatting fixes mainly to chapters 1-4.

Change-Id: Ie7699ae777791689e0026e241efdf46274776bff

1 files changed, 18 insertions, 26 deletions

diff --git a/documentation/getting-started/getting-started-idea.asciidoc b/documentation/getting-started/getting-started-idea.asciidoc
index 4461d80656..c0961dc534 100644
--- a/documentation/getting-started/getting-started-idea.asciidoc
+++ b/documentation/getting-started/getting-started-idea.asciidoc
@@ -31,17 +31,14 @@ used application servers.
 In the following, we configure Apache Tomcat:
 
 . Download and extract Tomcat installation package to a local directory, as
-instructed in
-<<dummy/../../../framework/getting-started/getting-started-environment#getting-started.environment.tomcat,"Installing
-Apache Tomcat">>.
+instructed in <<dummy/../../../framework/getting-started/getting-started-environment#getting-started.environment.tomcat,"Installing Apache Tomcat">>.
 
 . Select "Configure > Settings".
 
 . Select "IDE Settings > Application Servers".
 
-. Select "+ > Tomcat Server" to add a Tomcat server, or any of the other supported
-servers. A WebSocket-enabled server, such as Glassfish or TomEE, is required for
-server push.
+. Click [guibutton]#+# and select [guilabel]#Tomcat Server# to add a Tomcat server, or any of the other supported servers.
+A WebSocket-enabled server, such as Glassfish or TomEE, is required for server push.
 
 . In the Tomcat Server dialog, specify the home directory for the server.
 
@@ -140,15 +137,16 @@ server using a run/debug configuration.
 . Select [menuchoice]#New Project#
 
 . In the [guilabel]#New Project# window, select [menuchoice]#Maven#
-
 //&lt;?dbfo-need height="8cm" ?&gt;
-. Enter a project name, location, and the Java SDK to be used for the project.
-Vaadin requires at least Java 6. Click [guibutton]#Next#.
 
+. Enter a project name, location, and the Java SDK to be used for the project.
+Vaadin requires at least Java 6.
 +
 image::img/idea-maven-newproject-1.png[]
-
++
+Click [guibutton]#Next#.
 //&lt;?dbfo-need height="6cm" ?&gt;
+
 . Give a Maven [guilabel]#GroupID#, [guilabel]#ArtifactID#, and a
 [guilabel]#Version# for the project, or use the defaults.
 
@@ -156,8 +154,8 @@ image::img/idea-maven-newproject-1.png[]
 image::img/idea-maven-newproject-2.png[]
 
 . Check [guilabel]#Create from archetype#
-
 //&lt;?dbfo-need height="6cm" ?&gt;
+
 . If the Vaadin archetype is not in the list, click [guibutton]#Add archetype#,
 enter [guilabel]#GroupId# [literal]#++com.vaadin++#, [guilabel]#ArtifactId#
 [literal]#++vaadin-archetype-application++#, and [guilabel]#Version#
@@ -170,8 +168,8 @@ endif::web[]
 
 +
 Click [guibutton]#OK# in the dialog.
-
 //&lt;?dbfo-need height="8cm" ?&gt;
+
 . Select the [literal]#++com.vaadin:vaadin-archetype-application++#.
 
 ifdef::web[]
@@ -181,17 +179,17 @@ endif::web[]
 
 +
 Click [guibutton]#Next#.
-
 //&lt;?dbfo-need height="8cm" ?&gt;
-. Review the general Maven settings and settings for the new project. You may need
-to override the settings, especially if you are creating a Maven project for the
-first time. Click [guibutton]#Finish#.
+
+. Review the general Maven settings and settings for the new project.
+You may need to override the settings, especially if you are creating a Maven project for the first time.
 
 ifdef::web[]
 +
 image::img/idea-maven-newproject-5.png[]
 endif::web[]
-
++
+Click [guibutton]#Finish#.
 
 Creating the Maven project takes some time as Maven fetches the dependencies.
 Once done, the project is created and the Maven POM is opened in the editor.
@@ -226,11 +224,10 @@ launch a Vaadin Maven application on the light-weight Jetty web server.
 
 . Select "Run > Edit Configurations".
 
-. Select "+ > Maven" to create a new Maven run/debug configuration.
+. Click [guibutton]#+# and select menu:Maven[] to create a new Maven run/debug configuration.
 
-. Enter a [guilabel]#Name# for the run configuration. For the [guilabel]#Command
-line#, enter " [literal]#++package jetty:run++# to first compile and package the
-project, and then launch Jetty to run it.
+. Enter a [guilabel]#Name# for the run configuration.
+For the [guilabel]#Command line#, enter "`package jetty:run`# to first compile and package the project, and then launch Jetty to run it.
 
 ifdef::web[]
 +
@@ -253,8 +250,3 @@ Compiling the project takes some time on the first time, as it compiles the
 widget set and theme. Once the run console pane informs that Jetty Server has
 been started, you can open the browser at the default URL
 http://localhost:8080/.
-
-
-
-
-