Author: irooskov(a)redhat.com Date: 2012-03-08 22:21:32 -0500 (Thu, 08 Mar 2012) New Revision: 39398 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml trunk/documentation/guides/GettingStartedGuide/en-US/master.xml Log: updated with major reorganisations Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>5.0.0</edition> -<pubsnumber>13</pubsnumber> +<pubsnumber>14</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -16,6 +16,8 @@ <xi:include href="jsp_application.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> <xi:include href="rad_jsf_application.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> <xi:include href="project_examples.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<xi:include href="uninstalling.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> +</xi:include> <xi:include href="gsg_faq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> <!--<xi:include href="further_reading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include&g... <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -9,10 +9,10 @@ <keyword>JBoss</keyword> </keywordset> </chapterinfo> - <title>Getting Started with JBoss Developer Studio</title> + <title>First launch of the JBoss Developer Studio</title> <section id="Welcome"> - <title>Welcome to JBoss Developer Studio</title> + <title>Welcome</title> <para>In this section we'll show you how to work with the welcome page of the <property>JBoss Developer Studio</property>.</para> <para>The welcome page is the first page you see when you first launch <property>JBoss Developer Studio</property>. </para> @@ -92,33 +92,11 @@ </section> - <section id="Upgrading"> - <?dbhtml filename="Upgrading.html"?> - <title>Upgrading</title> - <para>Because JBoss Developer Studio 4.0x and 5.0 use different versions of Eclipse, it is not possible to directly upgrade from an older version to JBoss Developer Studio 5.0.</para> - <note> - <title>Tip</title> - <para>It is possible to run JBoss Developer Studio 4.0x and 5.0 side by side, as long as they have been installed into separate directories.</para> - </note> - - </section> - - <section id="Uninstalling"> - <?dbhtml filename="Uninstalling.html"?> - <title>Uninstalling</title> - <itemizedlist> - <listitem> - <para>Make sure <property>JBoss Developer Studio</property> is not running</para> - </listitem> - <listitem> - <para>Uninstall your current version of <property>JBoss Developer Studio</property> by running the Uninstaller</para> - </listitem> - </itemizedlist> - </section> - <xi:include href="usage_reporting.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> - <section id="Support"> + <!-- Don't need the Support section, we have the 'feedback' chapter for that --> + +<!-- <section id="Support"> <?dbhtml filename="Support.html"?> <title>Support</title> <para> @@ -140,7 +118,7 @@ <para> <property>JBoss Developer Studio</property> subscribers can get additional support on our <ulink url="https://network.jboss.com/jbossnetwork/login.html">Support Portal</ulink>. </para> - </section> + </section> --> <!-- <section id="OtherRelevantResourcesOnTheTopic33"> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -632,7 +632,8 @@ </figure> </section> </section> - <section id="extras_site"> + <!-- Commenting out as we recommend using JBoss Central now and there is no point in mentioning two ways to achieve the one thing if we only want users doing things a certain way --> +<!-- <section id="extras_site"> <title>Accessing the additional supported tooling</title> <para> A number of components are supported, but do not come as part of the standard installation. These extra components are available for individual installation through the JBoss Developer Studio extras site. To access the extras site, select <menuchoice> @@ -706,19 +707,23 @@ At the time of the JBoss Developer Studio 5.0 release, the technical preview site does not contain any components. </para> </note> - -<!-- <note> - <title>Note</title> - <para> - If you are prompted for credentials when accessing the Tech Preview Update Site, enter the username and password that were supplied in an email or shown in the Update Guide available on the <ulink url="http://access.redhat.com">Customer Service Portal</ulink>. If you experience any issues accessing the Tech Preview Update Site please contact technical support. - </para> - </note> --> - </section> + </section> --> + + <section id="Upgrading"> + <?dbhtml filename="Upgrading.html"?> + <title>Upgrading</title> + <para>Because JBoss Developer Studio 4.0x and 5.0 use different versions of Eclipse, it is not possible to directly upgrade from an older version to JBoss Developer Studio 5.0.</para> + <note> + <title>Tip</title> + <para>It is possible to run JBoss Developer Studio 4.0x and 5.0 side by side, as long as they have been installed into separate directories.</para> + </note> + + </section> <section> <title>Updating JBoss Developer Studio</title> <para> - Updates to JBoss Developer Studio can be installed by selecting <menuchoice><guimenuitem>Help</guimenuitem><guimenuitem>Check For Updates</guimenuitem></menuchoice> from within Eclipse. You may be prompted for a username and password. These are the same credentials that are required to access the Tech Preview update site (see <xref linkend="tech_previews"/>). + Updates to JBoss Developer Studio can be installed by selecting <menuchoice><guimenuitem>Help</guimenuitem><guimenuitem>Check For Updates</guimenuitem></menuchoice> from within Eclipse. <!-- You may be prompted for a username and password. These are the same credentials that are required to access the Tech Preview update site (see <xref linkend="tech_previews"/>). --> </para> </section> <!--section id="jbds_jbosstools"> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/manage.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -11,9 +11,8 @@ </keywordset> </chapterinfo> - <title condition="jbds">Manage JBoss AS from JBoss Developer Studio</title> - <title condition="jbt">Manage JBoss AS with JBoss Tools</title> - + <title condition="jbds">Manage a JBoss Server within JBoss Developer Studio</title> + <title condition="jbt">Manage a JBoss Server within JBoss Tools</title> <para> In this chapter we&apos;ll focus more on how to operate the <property>JBoss AS</property> from <property condition="jbds">JBoss Developer Studio</property><property condition="jbt">JBoss Tools</property>. </para> @@ -38,7 +37,7 @@ <section id="JBossbundled"> <?dbhtml filename="JBossbundled.html"?> - <title condition="jbds">How to Manage the JBoss AS Bundled in JBoss Developer Studio</title> + <title condition="jbds">How to Manage the JBoss Server Bundled in JBoss Developer Studio</title> <title condition="jbt">How to Manage JBoss AS with JBoss Tools</title> <para>This section covers the basics of working with the <property>JBoss Server</property> supported directly by <property>JBoss Developer Studio</property> via bundled AS plug-in. The server points to @@ -112,7 +111,7 @@ <section id="StoppingJBoss"> <?dbhtml filename="StoppingJBoss.html"?> - <title>Stopping JBoss Server</title> + <title>Stopping the JBoss Server</title> <para>To stop the server, click the <guibutton>Stop</guibutton> button icon in <property>Servers</property> or right click the server name and press <guimenuitem>Stop</guimenuitem>. </para> @@ -152,7 +151,7 @@ <section id="JBossInstances"> <?dbhtml filename="JBossInstances.html"?> - <title>How to Use Your Own JBoss AS Instance with JBoss Developer Studio</title> + <title>How to Use Your Own JBoss Server Instance with JBoss Developer Studio</title> <para>Although <property>JBoss Developer Studio</property> works closely with <property>JBoss EAP 5</property> we do not ultimately tie you to any particular server for deployment. There are some servers that Studio supports directly (via the @@ -161,7 +160,7 @@ server</property>. First of all you need to install it.</para> <section id="JBossInstalling"> <?dbhtml filename="JBossInstalling.html"?> - <title>JBoss AS Installation</title> + <title>JBoss Server Installation</title> <itemizedlist> <listitem> <para>Download the binary package of JBoss AS, e.g. <property>JBoss 4.2.3</property> and save Modified: trunk/documentation/guides/GettingStartedGuide/en-US/master.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/master.xml 2012-03-09 01:09:42 UTC (rev 39397) +++ trunk/documentation/guides/GettingStartedGuide/en-US/master.xml 2012-03-09 03:21:32 UTC (rev 39398) @@ -13,7 +13,7 @@ <!ENTITY gsg_faq SYSTEM "gsg_faq.xml"> <!ENTITY further_reading SYSTEM "further_reading.xml"> <!ENTITY project_examples SYSTEM "project_examples.xml"> - +<!ENTITY uninstalling SYSTEM "uninstalling.xml"> <!ENTITY usage_stats_intro SYSTEM "usage_stats_jbt_intro.xml"> @@ -69,6 +69,7 @@ &jsp_application; &rad_jsf_application; &project_examples; + &uninstalling; &gsg_faq; &further_reading;