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 2008/04/05 18:57:45 UTC

svn commit: r645137 [1/2] - in /roller/branches/roller_4.0/apps/weblogger: docs/installguide/ docs/installguide/generated/ docs/installguide/generated/html/ src/java/org/apache/roller/weblogger/config/

Author: snoopdave
Date: Sat Apr  5 09:57:38 2008
New Revision: 645137

URL: http://svn.apache.org/viewvc?rev=645137&view=rev
Log:
Fix for ROL-1664:
   https://issues.apache.org/roller/browse/ROL-1664

Removes unnecessary property from roller.properties
And makes suggested corrections installation guide.

Added:
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_1aff87fc.png   (with props)
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_37b6f681.png   (with props)
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_56e2b432.png   (with props)
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3584ba77.png   (with props)
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m40d84ba8.png   (with props)
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/roller-install-guide.txt
Modified:
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf
    roller/branches/roller_4.0/apps/weblogger/docs/installguide/roller-install-guide.odt
    roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties

Modified: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html?rev=645137&r1=645136&r2=645137&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html (original)
+++ roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html Sat Apr  5 09:57:38 2008
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE></TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Solaris x86)">
+	<META NAME="GENERATOR" CONTENT="NeoOffice 2.2  (Unix)">
 	<META NAME="CREATED" CONTENT="20070706;11182000">
-	<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
-	<META NAME="CHANGED" CONTENT="20071023;23392500">
+	<META NAME="CHANGED" CONTENT="20080405;12351900">
 	<META NAME="KEYWORDS" CONTENT="OpenDS Directory Server Administration Framework">
 	<STYLE TYPE="text/css">
 	<!--
@@ -41,7 +40,7 @@
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
 <P CLASS="western" ALIGN=RIGHT STYLE="margin-bottom: 0in; background: transparent">
-<IMG SRC="roller-install-guide_html_490f4977.png" NAME="graphics1" ALIGN=BOTTOM WIDTH=210 HEIGHT=85 BORDER=0></P>
+<IMG SRC="" NAME="graphics1" ALIGN=BOTTOM WIDTH=210 HEIGHT=85 BORDER=0></P>
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
 <BR>
 </P>
@@ -145,10 +144,9 @@
 Roller Weblogger</B></FONT></FONT></P>
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
 <FONT FACE="Helvetica, sans-serif"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Version
-4.0 </B></FONT></FONT>
-</P>
+4.0.1</B></FONT></FONT></P>
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
-<SDFIELD TYPE=DOCINFO SUBTYPE=CHANGE FORMAT=DATE SDNUM="1033;1033;MMMM YYYY">October 2007</SDFIELD></P>
+<SDFIELD TYPE=DOCINFO SUBTYPE=CHANGE FORMAT=DATE SDNUM="1033;1033;MMMM YYYY">April 2008</SDFIELD></P>
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
 <BR>
 </P>
@@ -261,7 +259,7 @@
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
 The general format of this document was based on the documentation
 template used by the OpenDS project which in turn was based on the
-templates used by the <A HREF="http://www.OpenOffice.org/">OpenOffice.org</A>
+templates used by the <A HREF="http://www.OpenOffice.org/"></A><A HREF="http://www.OpenOffice.org/"></A><A HREF="http://www.OpenOffice.org/">OpenOffice.org</A><A HREF="http://www.OpenOffice.org/"></A><A HREF="http://www.OpenOffice.org/"></A>
 project.</P>
 <P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0in; background: transparent">
 <BR>
@@ -330,7 +328,7 @@
         <FONT SIZE=2 STYLE="font-size: 11pt">database.jdbc.username=<I><B>scott</B></I></FONT>
         <FONT SIZE=2 STYLE="font-size: 11pt">database.jdbc.password=<I><B>tiger</B></I></FONT>
         <FONT SIZE=2 STYLE="font-size: 11pt">mail.configurationType=properties</FONT>
-        <FONT SIZE=2 STYLE="font-size: 11pt">mail.hostname=</FONT><TT><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><I><B>smtp-server.example.com</B></I></FONT></FONT></TT>
+        <FONT SIZE=2 STYLE="font-size: 11pt">mail.hostName=</FONT><TT><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><I><B>smtp-server.example.com</B></I></FONT></FONT></TT>
 <TT>        <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">mail.username=</SPAN></SPAN></FONT></FONT></TT><TT><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><I><B>scott</B></I></FONT></FONT></TT>
 <TT>        <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">mail.password=</SPAN></SPAN></FONT></FONT></TT><TT><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><I><B>tiger</B></I></FONT></FONT></TT>
 </PRE><P CLASS="western">
@@ -347,7 +345,7 @@
 The Roller WAR directory is in the installation directory under
 <FONT FACE="Courier New, monospace">webapp/roller</FONT>.</P>
 <P CLASS="western"><B>STEP 6: Browse to Roller and get Rollin'</B>
-(probably at <A HREF="http://localhost:8080/roller">http://localhost:8080/roller</A>).
+(probably at <A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller">http://localhost:8080/roller</A><A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller"></A>).
 If Roller is up and running, then proceed to Section 8 Getting
 started with Roller. If Roller isn't up and running and you can 't
 figure out why, then try the normal installation procedure starting
@@ -390,7 +388,7 @@
 for email notification, So, if you like to use Roller's e-mail
 notification features, you'll need to download those jars and place
 them in Tomcat's classpath. Download them from Sun
-(</FONT></FONT><A HREF="http://java.sun.com/products/javamail"><FONT FACE="Times New Roman, serif"><FONT SIZE=3>http://java.sun.com/products/javamail</FONT></FONT></A><FONT FACE="Times New Roman, serif"><FONT SIZE=3>)
+(</FONT></FONT><A HREF="http://java.sun.com/products/javamail"></A><A HREF="http://java.sun.com/products/javamail"></A><A HREF="http://java.sun.com/products/javamail"><FONT FACE="Times New Roman, serif"><FONT SIZE=3>http://java.sun.com/products/javamail</FONT></FONT></A><A HREF="http://java.sun.com/products/javamail"></A><A HREF="http://java.sun.com/products/javamail"></A><FONT FACE="Times New Roman, serif"><FONT SIZE=3>)
 and place them in Tomcat's </FONT></FONT><FONT FACE="Courier New, monospace"><FONT SIZE=3>common/lib</FONT></FONT><FONT FACE="Times New Roman, serif"><FONT SIZE=3>
 directory.</FONT></FONT></P>
 <H2 CLASS="western">3.2Tomcat: URI encoding needed for I118N</H2>
@@ -399,7 +397,7 @@
 configuration is necessary. You must ensure that Tomcat's URI
 encoding is set to UTF-8. You can do this by editing the Tomcat
 configuration file </SPAN></FONT></FONT><FONT FACE="Courier New"><FONT SIZE=3><SPAN STYLE="font-style: normal">conf/server.xml</SPAN></FONT></FONT><FONT FACE="Times New Roman, serif"><FONT SIZE=3><SPAN STYLE="font-style: normal">
-and adding </SPAN></FONT></FONT><FONT FACE="Courier New, monospace"><FONT SIZE=3><SPAN STYLE="font-style: normal">URIEncoding=&rdquo;UTF-8&rdquo;</SPAN></FONT></FONT><FONT FACE="Times New Roman, serif"><FONT SIZE=3><SPAN STYLE="font-style: normal">
+and adding </SPAN></FONT></FONT><FONT FACE="Courier New, monospace"><FONT SIZE=3><SPAN STYLE="font-style: normal">URIEncoding=”UTF-8”</SPAN></FONT></FONT><FONT FACE="Times New Roman, serif"><FONT SIZE=3><SPAN STYLE="font-style: normal">
 to each connector element, as shown below:</SPAN></FONT></FONT></P>
 <PRE>   &lt;Connector port=&quot;8080&quot;
       maxThreads=&quot;150&quot; minSpareThreads=&quot;25&quot; maxSpareThreads=&quot;75&quot;
@@ -416,8 +414,8 @@
 attribute to those connectors as well.</FONT></FONT></P>
 <H1 CLASS="western">4Download and un-package Roller</H1>
 <P CLASS="western">Download the Apache Roller release file from
-<A HREF="http://roller.apache.org/">http://roller.apache.org</A>. If
-you're a Windows user download the .zip file and use your favorite
+<A HREF="http://roller.apache.org/"></A><A HREF="http://roller.apache.org/"></A><A HREF="http://roller.apache.org/">http://roller.apache.org</A><A HREF="http://roller.apache.org/"></A><A HREF="http://roller.apache.org/"></A>.
+If you're a Windows user download the .zip file and use your favorite
 ZIP program to unzip the release into a directory on your computer's
 disk. Unix users can download the .tar.gz file and use GNU tar to
 un-package. 
@@ -425,7 +423,7 @@
 <H2 CLASS="western">4.1Installation directory layout</H2>
 <P CLASS="western">Once you've unpackaged the files you'll find a
 directory structure like this:</P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_m7709e33.png" NAME="graphics2" ALIGN=LEFT WIDTH=257 HEIGHT=379 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P CLASS="western"><IMG SRC="" NAME="graphics2" ALIGN=LEFT WIDTH=257 HEIGHT=379 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P CLASS="western">The <FONT FACE="Courier New, monospace">LICENCE.txt</FONT>
 and <FONT FACE="Courier New, monospace">NOTICE.txt</FONT> files
@@ -504,7 +502,7 @@
 	drivers instead of the newer 3.1.X series.</P>
 	<LI><P CLASS="western">Make sure you enable MySQL's UTF-8 support.
 	See this page for
-	details:<BR><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL">http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL</A>
+	details:<BR><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL"></A><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL"></A><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL">http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL</A><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL"></A><A HREF="http://rollerweblogger.org/wiki/Wiki.jsp?page=SetupUTF8onMySQL"></A>
 		</P>
 	<LI><P CLASS="western">For Oracle users, use the 10g (10.1.0.2
 	higher) drivers which should be packaged as ojdbc14.jar, even if
@@ -547,7 +545,7 @@
 exists but its tables are not, it will offer to run the database
 creation scripts. If find finds that the tables are there, but they
 are not up-to-date Roller will offer to upgrade them for you. Once
-your Roller installation is complete and you are ready to go &ldquo;live&rdquo;
+your Roller installation is complete and you are ready to go “live”
 then you should set<FONT FACE="Courier New, monospace">
 installation.type=manual</FONT>.</P>
 <H2 CLASS="western">6.1MySQL example</H2>
@@ -609,13 +607,13 @@
 <P CLASS="western">You can deploy to Tomcat as either a directory or
 a WAR file. The screens-hot below shows directory-based deployment
 options.</P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_m6a96024.png" NAME="graphics3" ALIGN=LEFT WIDTH=594 HEIGHT=588 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P CLASS="western"><IMG SRC="" NAME="graphics3" ALIGN=LEFT WIDTH=594 HEIGHT=588 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P CLASS="western"><SPAN STYLE="background: transparent">Once Roller
 is deployed, you'll see that it's listed among the other
 applications. There's a <B>/roller</B> link to Roller itself and
 there are options to start, stop, reload and undeploy.</SPAN></P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_m21a69a6a.png" NAME="graphics4" ALIGN=LEFT WIDTH=596 HEIGHT=77 BORDER=0><BR CLEAR=LEFT><SPAN STYLE="background: transparent">If
+<P CLASS="western"><IMG SRC="" NAME="graphics4" ALIGN=LEFT WIDTH=596 HEIGHT=77 BORDER=0><BR CLEAR=LEFT><SPAN STYLE="background: transparent">If
 Roller doesn't start-up, look for the problem in the logs. You can
 find them in Tomcat's </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="background: transparent">logs</SPAN></FONT><SPAN STYLE="background: transparent">
 directory. The Tomcat log file is </SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="background: transparent">catalina.out</SPAN></FONT><SPAN STYLE="background: transparent">
@@ -625,13 +623,13 @@
 <P CLASS="western">You can also deploy to Glassfish as either a
 directory or a WAR file. The screenshot below shows directory-based
 deployment options.</P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_54a5dedd.png" NAME="graphics5" ALIGN=LEFT WIDTH=594 HEIGHT=548 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P CLASS="western"><IMG SRC="roller-install-guide_html_56e2b432.png" NAME="graphics5" ALIGN=LEFT WIDTH=594 HEIGHT=548 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P CLASS="western"><SPAN STYLE="background: transparent">Once Roller
 is deployed, you'll see that it's listed among the other
 applications. There's a <B>Launch</B> link to Roller itself and there
 are buttons to enable, display and redeploy.</SPAN></P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_me1768f1.png" NAME="graphics6" ALIGN=LEFT WIDTH=591 HEIGHT=106 BORDER=0><BR CLEAR=LEFT><SPAN STYLE="background: transparent">If
+<P CLASS="western"><IMG SRC="roller-install-guide_html_1aff87fc.png" NAME="graphics6" ALIGN=LEFT WIDTH=591 HEIGHT=106 BORDER=0><BR CLEAR=LEFT><SPAN STYLE="background: transparent">If
 Roller doesn't start-up, look for the problem in the logs. You can
 find them in your Glassfish domain's  <FONT FACE="Courier New, monospace">logs</FONT>
 directory. The Glassfish log file is <FONT FACE="Courier New, monospace">server.log</FONT>
@@ -646,7 +644,7 @@
 </H2>
 <P CLASS="western">Navigate to Roller, if you are using a default
 Tomcat or Glassfish installation then then URL of Roller is probably
-<A HREF="http://localhost:8080/roller">http://localhost:8080/roller</A>.
+<A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller">http://localhost:8080/roller</A><A HREF="http://localhost:8080/roller"></A><A HREF="http://localhost:8080/roller"></A>.
 You will see either a web page of error messages, a web page offering
 to create database tables for you or web page asking you to complete
 the installation by registering an admin user and creating a
@@ -658,10 +656,10 @@
 JDBC driver class name, connection URL, username or password. Or
 perhaps your database is not running. Use the information provided to
 determine what is wrong, fix it and then redeploy Roller.</P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_79ee0277.png" NAME="graphics7" ALIGN=LEFT WIDTH=485 HEIGHT=276 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P CLASS="western"><IMG SRC="roller-install-guide_html_37b6f681.png" NAME="graphics7" ALIGN=LEFT WIDTH=485 HEIGHT=276 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <H4 CLASS="western">Automatic tables creation</H4>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_2bf00c9b.png" NAME="graphics8" ALIGN=LEFT WIDTH=466 HEIGHT=106 BORDER=0><BR CLEAR=LEFT>If
+<P CLASS="western"><IMG SRC="roller-install-guide_html_m40d84ba8.png" NAME="graphics8" ALIGN=LEFT WIDTH=466 HEIGHT=106 BORDER=0><BR CLEAR=LEFT>If
 your database configuration is good but Roller cannot find its
 database tables, then Roller will offer to create those pages
 automatically for you. If you give the go-ahead, Roller will run the
@@ -673,7 +671,7 @@
 front-page weblog then it will display the Completing Your
 Installation below that explains how to register your first user,
 create your first weblog and setup your site's front page.</P>
-<P CLASS="western"><IMG SRC="roller-install-guide_html_m61aa845.png" NAME="graphics9" ALIGN=LEFT WIDTH=440 HEIGHT=326 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P CLASS="western"><IMG SRC="roller-install-guide_html_m3584ba77.png" NAME="graphics9" ALIGN=LEFT WIDTH=440 HEIGHT=326 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P CLASS="western">You have to decide what you want as the front-page
 of your Roller site. If you are using Roller to run your personal
@@ -686,8 +684,8 @@
 multiple weblogs, then you'll probably want to display an aggregated
 front-page combining all weblogs on the site. In that case, create a
 weblog to serve as the front-page, set it as the front-page weblog
-and make sure you set the &ldquo;aggregated front-page&rdquo; setting
-on the Server Admin page.   
+and make sure you set the “aggregated front-page” setting on the
+Server Admin page.   
 </P>
 <H4 CLASS="western">Don't forget: Reset the <FONT FACE="Courier New, monospace">installation.type</FONT>
 flag</H4>
@@ -704,7 +702,7 @@
 refer to the Roller Template Guide. If you can't find what you want
 in the documentation then subscribe to the Roller user mailing list
 and ask your questions there:
-<A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists</A><BR>
+<A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists"></A><A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists"></A><A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists</A><A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists"></A><A HREF="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists"></A><BR>
   
 </P>
 <H1 CLASS="western">9Configuration tips and tricks</H1>
@@ -714,7 +712,7 @@
 server-provided resources.</P>
 <H2 CLASS="western">9.1Setting up Roller's Planet feed aggregator</H2>
 <P CLASS="western">Roller includes a RSS/Atom feed aggregator that
-makes it possible to run a site like <A HREF="http://blogs.sun.com/">http://blogs.sun.com</A>
+makes it possible to run a site like <A HREF="http://blogs.sun.com/"></A><A HREF="http://blogs.sun.com/"></A><A HREF="http://blogs.sun.com/">http://blogs.sun.com</A><A HREF="http://blogs.sun.com/"></A><A HREF="http://blogs.sun.com/"></A>
 which provides weblogs for thousands of writers and an aggregated
 front-page that displays the most recent posts form those plus dozens
 of Sun bloggers from other sites such as blogger.com, typepad.com and
@@ -731,13 +729,14 @@
 Whether you override that property or not, <B>you must create the
 cache directory</B>. Planet will not work unless the cache directory
 exists and is writable by Roller.</P>
-<H4 CLASS="western">STEP 2: Enable Planet Roller properties</H4>
+<H4 CLASS="western">STEP 2: Enable Planet via Roller custom
+properties</H4>
 <P CLASS="western">Enable Planet by adding the following to your
 <FONT FACE="Courier New, monospace">roller-custom.properties</FONT>
 file:</P>
 <PRE>   <FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New, monospace">planet.aggregator.enabled=</FONT><FONT FACE="Courier New, monospace"><B>true</B></FONT></FONT>
 
-   <FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New, monospace"># Tasks which are enabled.  Only tasks listed here will be run.<BR>   tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,\<BR>   TurnoverReferersTask,PingQueueTask,</FONT><FONT FACE="Courier New, monospace"><B>RefreshPlanetRollerTask,SyncWebsitesTask</B></FONT></FONT>
+   <FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New, monospace"># Tasks which are enabled.  Only tasks listed here will be run.<BR>   tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,\<BR>   TurnoverReferersTask,PingQueueTask,</FONT><FONT FACE="Courier New, monospace"><B>RefreshRollerPlanetTask,SyncWebsitesTask</B></FONT></FONT>
    
    <FONT SIZE=2 STYLE="font-size: 11pt"># Set of page models specifically for site-wide rendering</FONT>
    <FONT SIZE=2 STYLE="font-size: 11pt">rendering.siteModels=\</FONT>
@@ -746,16 +745,36 @@
 <BR><BR>
 </P>
 <P CLASS="western"><FONT SIZE=3>Those property settings enable Planet
-and enable the Planet tasks, both the <I>RefreshPlanetTask</I>, which
-runs every hour and fetches all RSS/Atom feed subsciptions, and the
-<I>SyncWebsitesTask</I>, which runs every midnight and ensures that
-each weblog in the Roller system is represented by a subscription in
-the Planet aggregator. To enable usage of the PlanetModel in the
-front-page weblog, we also override the <FONT FACE="Courier New, monospace">rendering.siteModels</FONT>
+and enable the Planet tasks, both the <I>RefreshRollerPlanetTask</I>,
+which runs every hour and fetches all RSS/Atom feed subsciptions, and
+the <I>SyncWebsitesTask</I>, which runs every midnight and ensures
+that each weblog in the Roller system is represented by a
+subscription in the Planet aggregator. To enable usage of the
+PlanetModel in the front-page weblog, we also override the
+<FONT FACE="Courier New, monospace">rendering.siteModels</FONT>
 property.</FONT></P>
+<P CLASS="western"><BR><BR>
+</P>
+<H4 CLASS="western"><BR><BR>
+</H4>
+<H4 CLASS="western" STYLE="page-break-before: always">STEP 3:
+Configure Planet via Planet custom properties</H4>
+<P CLASS="western"><FONT SIZE=3>Create a new file called
+<FONT FACE="Courier New, monospace">planet-custom.properties</FONT>
+and place it in the same directory as your existing
+<FONT FACE="Courier New, monospace">roller-custom.properties</FONT>
+file. Here's what you need to put in this configuration file:</FONT></P>
+<OL>
+	<LI><P CLASS="western"><FONT SIZE=3>The exact same database
+	properties that you put in your Roller custom properties file.</FONT></P>
+	<LI><P CLASS="western"><FONT SIZE=3>Add a property called <FONT FACE="Courier New, monospace">cache.dir
+	</FONT>that points to the directory that you'd like Planet to use
+	for caching it's RSS and Atom newsfeeds. The default setting is:<BR>
+	    <FONT FACE="Courier New, monospace">cache.dir=${user.home}/roller_data/planetcache</FONT></FONT></P>
+</OL>
 <P CLASS="western"><FONT SIZE=3>Once you've made those property
 settings restart Roller and proceed to the next step.</FONT></P>
-<H4 CLASS="western">Display your Planet aggregations</H4>
+<H4 CLASS="western">STEP 4: Display your Planet aggregations</H4>
 <P CLASS="western">You can use Roller's UI to add external RSS/Atom
 feeds to the Planet setup. To display these feeds you'll need to do a
 little template customization. The easier way to get started is to
@@ -765,8 +784,8 @@
 the Front-Page theme and customize it. Edit the weblog template and
 look for the part that mentions PLANET-entries. Comment-out the
 SITE-WIDE part and un-comment the PLANET-entries part. The double
-hash &ldquo;##&rdquo; marks indicate a commented-out line. The code
-should look like this:<BR></SPAN><BR><BR>
+hash “##” marks indicate a commented-out line. The code should
+look like this:<BR></SPAN><BR><BR>
 </P>
 <PRE><SPAN STYLE="background: transparent">   <FONT FACE="Courier New, monospace"><FONT SIZE=3>## 1) SITE-WIDE entries (the default)</SPAN></FONT></FONT>
 <SPAN STYLE="background: transparent">   <FONT FACE="Courier New, monospace"><FONT SIZE=3><B>##</B>set($pager = $site.getWeblogEntriesPager($since, $maxResults))</SPAN></FONT></FONT>
@@ -778,10 +797,10 @@
 will be display your Planet entries. You can find your Planet feeds
 at the following URLs:</SPAN></P>
 <UL>
-	<LI><P CLASS="western"><SPAN STYLE="background: #ffff00"><A HREF="http://localhost:8080/roller/planetrss"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">Main
-	Planet feed<BR></SPAN></FONT></A><A HREF="http://localhost:8080/roller/planetrss"><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="background: #ffffff">http://localhost:8080/roller/planetrss</SPAN></FONT></FONT></A></SPAN></P>
-	<LI><P CLASS="western"><SPAN STYLE="background: #ffff00"><A HREF="http://localhost:8080/roller/rollerrss"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">Per
-	group feed<BR></SPAN></FONT></A><A HREF="http://localhost:8080/roller/rollerrss"><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="background: #ffffff">http://localhost:8080/roller/planetrss?group=&lt;group-name&gt;</SPAN></FONT></FONT></A></SPAN></P>
+	<LI><P CLASS="western"><SPAN STYLE="background: #ffff00"><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">Main
+	Planet feed<BR></SPAN></FONT></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="background: #ffffff">http://localhost:8080/roller/planetrss</SPAN></FONT></FONT></A><A HREF="http://localhost:8080/roller/planetrss"></A><A HREF="http://localhost:8080/roller/planetrss"></A></SPAN></P>
+	<LI><P CLASS="western"><SPAN STYLE="background: #ffff00"><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">Per
+	group feed<BR></SPAN></FONT></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><SPAN STYLE="background: #ffffff">http://localhost:8080/roller/planetrss?group=&lt;group-name&gt;</SPAN></FONT></FONT></A><A HREF="http://localhost:8080/roller/rollerrss"></A><A HREF="http://localhost:8080/roller/rollerrss"></A></SPAN></P>
 </UL>
 <H2 CLASS="western">9.2Changing keys in security.xml</SPAN></H2>
 <P CLASS="western">Starting with version 2.1, Roller uses the Acegi
@@ -935,7 +954,7 @@
 the new template system.</SPAN></P>
 <H4 CLASS="western">New URL structure</H4>
 <P CLASS="western"><SPAN STYLE="background: transparent">The most
-significant change is the new URL structure &ndash; we've completely
+significant change is the new URL structure – we've completely
 change all of the Roller weblog URLs. We continue to support old
 Roller URLs, but they are forwarded to the new system. That ensures
 that nobody will get a 404 when accessing your weblog using an old
@@ -959,8 +978,8 @@
 </P>
 <P CLASS="western"><SPAN STYLE="background: transparent">So, if you
 are upgrading and you want your weblogs to work, you <I>must</I>
-override this Roller property to enable the old &ldquo;legacy&rdquo;
-template system to work:</SPAN></P>
+override this Roller property to enable the old “legacy” template
+system to work:</SPAN></P>
 <P CLASS="western"><A NAME="DDE_LINK"></A><FONT FACE="Courier New"><SPAN STYLE="background: transparent">	rendering.legacyModels.enabled=true</SPAN></FONT></P>
 <P CLASS="western"><SPAN STYLE="background: transparent">See <B>Section
 11</B> for information on overriding Roller startup properties.</SPAN></P>
@@ -1000,14 +1019,14 @@
 BrushedMetal, Sotto and a new Frontpage themes, which is just for
 site-wide front-page weblogs) . All other themes have been removed
 from Roller and moved to the Roller Support project at Java.net
-(<A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A>).
+(<A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A><A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/"></A>).
 If you or your users use any other themes, then you'll need to
 download and install them according to the instructions on that site.</SPAN></P>
 <H4 CLASS="western">Non-core plugins removed</H4>
 <P CLASS="western"><SPAN STYLE="background: transparent">The same
 applies to plugins. The JSPWiki, Textile and Read More plugins have
 also been moved to the Roller Support project at Java.net
-(<A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A>)
+(<A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A><A HREF="http://roller.dev.java.net/"></A><A HREF="http://roller.dev.java.net/"></A>)
 to become part of a community maintained repository. If you or your
 users use any other themes, then you'll need to download and install
 them according to the instructions on that site.</SPAN></P>

Added: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_1aff87fc.png
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_1aff87fc.png?rev=645137&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_1aff87fc.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_37b6f681.png
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_37b6f681.png?rev=645137&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_37b6f681.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_56e2b432.png
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_56e2b432.png?rev=645137&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_56e2b432.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3584ba77.png
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3584ba77.png?rev=645137&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3584ba77.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m40d84ba8.png
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m40d84ba8.png?rev=645137&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m40d84ba8.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf?rev=645137&r1=645136&r2=645137&view=diff
==============================================================================
Binary files - no diff available.

Modified: roller/branches/roller_4.0/apps/weblogger/docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/docs/installguide/roller-install-guide.odt?rev=645137&r1=645136&r2=645137&view=diff
==============================================================================
Binary files - no diff available.