You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/26 16:34:50 UTC

svn commit: r511858 - in /incubator/roller/trunk/docs/installguide: generated/roller-install-guide.html generated/roller-install-guide.pdf roller-install-guide.odt

Author: snoopdave
Date: Mon Feb 26 07:34:49 2007
New Revision: 511858

URL: http://svn.apache.org/viewvc?view=rev&rev=511858
Log:
- Better explanation of email setup
- Changed references to 3.0 to 3.2
- Added prominent note about not editing roller.properties directly
- Change Hibernate dialect in roller-custom.properties not Hibernate config
 

Modified:
    incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html
    incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf
    incubator/roller/trunk/docs/installguide/roller-install-guide.odt

Modified: incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html?view=diff&rev=511858&r1=511857&r2=511858
==============================================================================
--- incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html (original)
+++ incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html Mon Feb 26 07:34:49 2007
@@ -7,7 +7,7 @@
 	<META NAME="AUTHOR" CONTENT="Dave Johnson">
 	<META NAME="CREATED" CONTENT="20060123;11164600">
 	<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
-	<META NAME="CHANGED" CONTENT="20061216;10482600">
+	<META NAME="CHANGED" CONTENT="20070226;10243900">
 	<STYLE>
 	<!--
 		@page { size: 8.5in 11in; margin: 0.5in }
@@ -356,8 +356,9 @@
 Activation jars.</P>
 <H3 CLASS="western"><A NAME="DDE_LINK4"></A>STEP 3.1: Download and
 install Hibernate</H3>
-<P CLASS="western">Roller <I>requires</I> the Hibernate persistence
-library, which you must download separately from Roller. 
+<P CLASS="western"><A NAME="DDE_LINK"></A>Roller <I>requires</I>
+<B>Hibernate Version 3.1.2</B>, which you must download separately
+from Roller. 
 </P>
 <P CLASS="western">	Download Hibernate 3.1.2 from SourceForge</P>
 <P CLASS="western">	<A HREF="http://prdownloads.sourceforge.net/hibernate/hibernate-3.1.2.tar.gz">http://prdownloads.sourceforge.net/hibernate/hibernate-3.1.2.tar.gz</A></P>
@@ -404,7 +405,7 @@
 	Hibernate configuration file to use the MySQL5 dialect (see Section
 	8.3 for details on that).</P>
 	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><A NAME="st"></A>For
-	Oracle users, we recommend that you use the 10g (<A HREF="http://10.1.0.2/" TARGET="_blank" ONCLICK="return top.js.OpenExtLink(window,event,this)">10.1.0.2</A>
+	Oracle users, we recommend that you use the 10g (<A HREF="http://10.1.0.2/" TARGET="_blank">10.1.0.2</A>
 	or higher) drivers which should<BR>be packaged as ojdbc14.jar --
 	even if operating on Oracle 9 server.</P>
 </UL>
@@ -453,7 +454,6 @@
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/derby/creatdb.sql</FONT></FONT></P>
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/db2/creatdb.sql</FONT></FONT></P>
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/oracle/creatdb.sql</FONT></FONT></P>
-	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/oracle/creatdb.sql</FONT></FONT></P>
 </UL>
 <P CLASS="western">Here are some examples to show you how you might
 create the Roller tables in MySQL:</P>
@@ -492,15 +492,17 @@
 roller -h 127.0.0.1 -u scott -ptiger</FONT></P>
 <H2 CLASS="western" STYLE="page-break-before: always"><A NAME="section-InstallationGuide_2.x-STEP5DeployRollerToYourApplicationServer5"></A><A NAME="ref-InstallationGuide_2.x-5"></A>
 STEP 5: Deploy Roller to your application server</H2>
-<P CLASS="western">To deploy Roller to your application server you
-need to inform your application server:</P>
+<P CLASS="western">To deploy Roller you will need to inform your
+application server:</P>
 <UL>
 	<LI><P CLASS="western" STYLE="margin-bottom: 0in">Where to find the
-	Roller installation directory  
-	</P>
-	<LI><P CLASS="western">How to configure the Roller datasource under
-	the JNDI name <FONT FACE="Courier New">jdbc/rollerdb </FONT>
+	Roller installation directory</P>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in">How to configure
+	the Roller database data-source under the JNDI name <FONT FACE="Courier New">jdbc/rollerdb
+	</FONT>
 	</P>
+	<LI><P CLASS="western">How to configure the Roller email session
+	under the JNDI name <FONT FACE="Courier New, monospace">mail/Session</FONT></P>
 </UL>
 <P CLASS="western" STYLE="margin-bottom: 0in">For Tomcat you can do
 this by creating what's known as a context configuration file named
@@ -521,7 +523,8 @@
 to point to your database and the database username and password too.</P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Context path=&quot;/roller&quot; docBase=&quot;<B>/usr/local/apache-roller-3.0-incubating/webapp/roller</B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
+<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Context path=&quot;/roller&quot; </FONT></FONT>
+  <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">docBase=&quot;<B>/usr/local/apache-roller-incubating-3.1/webapp/roller</B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Resource name=&quot;jdbc/rollerdb&quot; auth=&quot;Container&quot; type=&quot;javax.sql.DataSource&quot; /&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;ResourceParams name=&quot;jdbc/rollerdb&quot;&gt;</FONT></FONT>
     <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;parameter&gt;</FONT></FONT>
@@ -555,10 +558,7 @@
       <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/parameter&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/ResourceParams&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">--&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western">
-<BR><BR>
-</P>
-<P CLASS="western" STYLE="margin-bottom: 0in; page-break-before: always">
+<FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New">&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western" STYLE="margin-bottom: 0in; page-break-before: always">
 <B>Example context configuration file for Tomcat 5.5.X users</B></P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
@@ -569,7 +569,8 @@
 to point to your database and the database username and password too.</P>
 <P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=3>&lt;Context path=&quot;/roller&quot; docBase=&quot;<B><FONT SIZE=2 STYLE="font-size: 11pt">/usr/local/apache-roller-3.0-incubating/webapp/roller</FONT></B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
+<PRE><FONT FACE="Courier New"><FONT SIZE=3>&lt;Context path=&quot;/roller&quot; </FONT></FONT>
+  <FONT FACE="Courier New"><FONT SIZE=3>docBase=&quot;<B><FONT SIZE=2 STYLE="font-size: 11pt">/usr/local/apache-roller-<FONT SIZE=2 STYLE="font-size: 11pt">incubating-</FONT>3.1/webapp/roller</FONT></B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=3>&lt;Resource name=&quot;jdbc/rollerdb&quot; auth=&quot;Container&quot; </FONT></FONT>
       <FONT FACE="Courier New"><FONT SIZE=3>type=&quot;javax.sql.DataSource&quot;</FONT></FONT>
     <FONT FACE="Courier New"><FONT SIZE=3>driverClassName=&quot;com.mysql.jdbc.Driver&quot;</FONT></FONT>
@@ -587,11 +588,22 @@
      <FONT FACE="Courier New"><FONT SIZE=3>mail.smtp.host=&quot;mailhost.example.com&quot; /&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=3>--&gt;</FONT></FONT>
 <FONT FACE="Courier New"><FONT SIZE=3>&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western">
-<B>NOTES</B></P>
+<BR><BR>
+</P>
+<P CLASS="western"><B>NOTES</B></P>
 <UL>
-	<LI><P CLASS="western">If Roller starts up fine but later fails and
-	you find an error like the one below in your roller.log file then
-	try dropping your <FONT FACE="Courier New">maxActive</FONT>,
+	<LI><P CLASS="western"><B>Email configuration</B>. If you want to
+	use email notification of comments, group blogging invitations and
+	other events, you'll have  to enable that in your application
+	server. For Tomcat, you can do that by uncommenting the indicated
+	sections of the context configuration file above. No matter what
+	application server you use, you'll also have to uncomment the
+	<FONT FACE="Courier New, monospace">mail/Session</FONT> resource
+	reference <FONT FACE="Courier New, monospace">&lt;resource-ref&gt;</FONT>
+	near the end of the roller/WEB-INF/web.xml file.</P>
+	<LI><P CLASS="western"><B>The max_user_connections error</B>. If
+	Roller starts up fine but later fails and you find an error like the
+	one below in your roller.log file then try dropping your <FONT FACE="Courier New">maxActive</FONT>,
 	<FONT FACE="Courier New">maxIdle</FONT>, and <FONT FACE="Courier New">removeAbandoned</FONT>
 	values. Depending on your database configuration you may have to go
 	pretty low, such as setting <FONT FACE="Courier New">maxActive</FONT>
@@ -599,9 +611,11 @@
 	<FONT FACE="Courier New">removeAbandonedTimeout</FONT> to 60. 
 	</P>
 </UL>
-<P CLASS="western" STYLE="font-style: normal"><FONT FACE="Courier New"><FONT SIZE=2>	User
-scott@localhost has more than 'max_user_connections' active
-connections</FONT></FONT></P>
+<UL>
+	<LI><P CLASS="western" STYLE="font-style: normal"><FONT FACE="Courier New"><FONT SIZE=2>	User
+	scott@localhost has more than 'max_user_connections' active
+	connections</FONT></FONT></P>
+</UL>
 <P CLASS="western"><BR><BR>
 </P>
 <P CLASS="western"><BR><BR>
@@ -751,9 +765,10 @@
 <B>NOTE</B>: the default <FONT FACE="Courier New">roller.properties</FONT>
 file is shown in Appendix B.</P>
 <H4 CLASS="western"><A NAME="section-ConfigurationGuide_2.x-WhereToDefineCustomProperties"></A>
-Where to define custom properties</H4>
-<P CLASS="western" STYLE="margin-bottom: 0in">There are three ways
-you can alter the default configuration for Roller. 
+Don't edit roller.properties directly! Create an override file
+instead</H4>
+<P CLASS="western" STYLE="margin-bottom: 0in">There are two ways you
+can alter the default configuration for Roller. 
 </P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
@@ -859,37 +874,29 @@
 	</UL>
 </UL>
 <H3 CLASS="western"><SPAN STYLE="background: transparent">STEP 8.3:
-Verify the database dialet setting in the Hibernate configuration
+Verify the database dialect setting in the Hibernate configuration
 file</SPAN></H3>
 <P CLASS="western"><SPAN STYLE="background: transparent">If you're
 using MySQL 4.X for Roller, then you can skip this step.</SPAN></P>
 <P CLASS="western"><SPAN STYLE="background: transparent">If you're
-using some other database with Roller, then you must check the
-Hibernate dialect setting in the file
-<FONT FACE="Courier New">WEB-INF/classes/hibernate.cfg.xml</FONT>. 
-In that file, you'll see the section of code shown below. The line
-shown in bold is the current dialect setting. If you want to switch
-to another database, move the MySQLDialect line inside the<FONT FACE="Courier New">
-&lt;!-- --&gt;</FONT> comments and replace it with the line for your
-database of choice. </SPAN>
-</P>
-<P CLASS="western"><BR><BR>
+using some other database with Roller, then you must override the
+Hibernate dialect. In your roller-custom.properties override file,
+override the <SPAN STYLE="font-weight: medium"><FONT SIZE=2><FONT FACE="Courier New">hibernate.dialect</FONT></FONT><FONT SIZE=3><FONT FACE="Times New Roman, serif">
+property. For example, to set the dialect for MySQL 5, you would add
+this to your override file:</FONT></FONT></SPAN></SPAN></P>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><SPAN STYLE="background: transparent">
+  <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">hibernate.dialect=org.hibernate.dialect.MySQL5Dialect</SPAN></FONT></FONT></P>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;!-- select SQL dialect, MySQL 3.X or 4.X by default --&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><B>&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.MySQLDialect&lt;/property&gt;</B></FONT></FONT>
-
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;!--</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">If you want to use HSQLDB, PostgreSQL, DB2 or Derby, Oracle, SQLServer then use the right dialect   </FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.HQLDBDialect&lt;/property&gt; </FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.PostgreSQLDialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.DB2Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.DerbyDialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.Oracle9Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.SQLServerDialect&lt;/property&gt;</FONT></FONT>
-
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">For MySQL 5.X, use the MySQL5 dialect and J/Connector 3.1.X</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.MySQL5Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">--&gt;</FONT></FONT></PRE><P CLASS="western" STYLE="margin-bottom: 0in">
+<P CLASS="western" STYLE="font-weight: medium"><FONT FACE="Courier New"><FONT SIZE=2><SPAN STYLE="background: transparent"><FONT SIZE=3><FONT FACE="Times New Roman, serif">Here
+are all of the available dialect settings:</FONT></FONT></SPAN></FONT></FONT></P>
+<PRE>   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.HQLDBDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.PostgreSQLDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.DB2Dialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.DerbyDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.Oracle9Dialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.SQLServerDialect</FONT></FONT>
+</PRE><P CLASS="western" STYLE="margin-bottom: 0in">
 <BR>
 </P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
@@ -956,11 +963,11 @@
 	</P>
 </UL>
 <H3 CLASS="western"><SPAN STYLE="background: transparent">Important
-notes about Roller 3.0</SPAN></H3>
+notes for those upgrading from Roller 2.x to Roller 3.1</SPAN></H3>
 <P CLASS="western"><SPAN STYLE="background: transparent"><B>WARNING!</B>
-Roller 3.0 is a major release and makes some big changes to the way
-that Roller works. If you're upgrading you need to be aware of the
-new URL structure and the new template system.</SPAN></P>
+Roller 3.0 was a major release and made some big changes to the way
+that Roller works. If you're upgrading from the 2.x series you need
+to be aware of the new URL structure and the new template system.</SPAN></P>
 <P CLASS="western"><I><B><SPAN STYLE="background: transparent">The
 new URL structure</SPAN></B></I></P>
 <P CLASS="western"><SPAN STYLE="background: transparent">The most
@@ -1062,7 +1069,7 @@
 <PRE>   <FONT FACE="Courier New"><FONT SIZE=3>% cd $CATALINA_HOME/webapps</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mkdir /somewhere/safe/roller-old</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mv roller /somewhere/safe/roller-old</FONT></FONT></PRE><H3 CLASS="western">
-<A NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A NAME="ref-UpgradeGuide_2.1-2"></A>
+<A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="ref-UpgradeGuide_2.1-2"></A>
 UPGRADE STEP 2: Install the new Roller 
 </H3>
 <P CLASS="western">Follow the normal installation instructions to
@@ -1077,7 +1084,7 @@
 	the installation, we'll do that later 
 	</P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
 UPGRADE STEP 3: Copy resources and update configs 
 </H3>
 <H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.1CopyYourOldResourcesAndOtherFilesYouveAdded"></A>
@@ -1099,26 +1106,36 @@
 </P>
 <H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.3ReviewConfigurationProperties"></A>
 3.3 Review configuration properties</H4>
-<P CLASS="western">Review properties as described in STEP #8 of the
-installation guide.</P>
+<P CLASS="western"><A NAME="DDE_LINK5"></A>Review properties as
+described in Section 8.0 of the installation guide. 
+</P>
 <UL>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><B>WARNING: In
-	Roller 2.3 we changed the Roller package names from org.roller to
-	org.apache.roller. Because of this you MUST review your
-	roller-custom.properties file, search for the string &ldquo;org.roller&rdquo;and
-	replace all occurances of it with &ldquo;org.apache.roller&rdquo;.</B></P>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: Make sure you set the right Hibernate dialect for your
+	database in your roller-custom.properties file as discussed in
+	Section 8.3.</P>
 </UL>
-<P CLASS="western" STYLE="margin-bottom: 0in"><BR>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
+</P>
+<UL>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: In Roller 2.3 we changed the Roller package names from
+	org.roller to org.apache.roller. Because of this you MUST review
+	your roller-custom.properties file, search for the string
+	&ldquo;org.roller&rdquo;and replace all occurances of it with
+	&ldquo;org.apache.roller&rdquo;.</P>
+</UL>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
 <UL>
-	<LI VALUE=1><P CLASS="western" STYLE="margin-bottom: 0in"><B>WARNING:
-	The files required for Roller's JSPWiki plugin, Ekit editor and
-	Javascript enhanced editor have been removed from the Roller
+	<LI VALUE=1><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: The files required for Roller's JSPWiki plugin, Ekit editor
+	and Javascript enhanced editor have been removed from the Roller
 	distribution. If you'd like to continue to use these plugins, please
 	visit the Roller Support project on Java.Net
-	(http://roller.dev.java.net).</B></P>
+	(http://roller.dev.java.net).</P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
 UPGRADE STEP 4: Upgrade the database 
 </H3>
 <P CLASS="western">Use the appropriate database upgrade script to
@@ -1165,7 +1182,7 @@
 <P CLASS="western">If you're upgrading from an earlier release you'll
 have to run each of the older scripts in order to upgrade your
 database.</P>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
 UPGRADE STEP 5: Startup your app server 
 </H3>
 <P CLASS="western">Use the standard Tomcat <FONT FACE="Courier New">startup.sh</FONT>

Modified: incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf?view=diff&rev=511858&r1=511857&r2=511858
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/trunk/docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/docs/installguide/roller-install-guide.odt?view=diff&rev=511858&r1=511857&r2=511858
==============================================================================
Binary files - no diff available.