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 2006/02/01 17:51:28 UTC

svn commit: r374113 - in /incubator/roller/branches/roller_2.1/docs/userguide: ./ generated/ generated/html/

Author: snoopdave
Date: Wed Feb  1 08:50:16 2006
New Revision: 374113

URL: http://svn.apache.org/viewcvs?rev=374113&view=rev
Log:
Added back the sections on Roller, Planet and ping admin

Added:
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_4879cc9c.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_62ac32cd.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_6aedbe24.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m3a18f583.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4b577c06.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4fe3f61b.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5327a1d1.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m54dbe4ad.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5eead6e8.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6046b9c9.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6732908.png   (with props)
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_mf310db2.png   (with props)
Modified:
    incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210.html
    incubator/roller/branches/roller_2.1/docs/userguide/generated/roller-user-guide-210.pdf
    incubator/roller/branches/roller_2.1/docs/userguide/roller-user-guide-210.odt

Modified: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210.html
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210.html?rev=374113&r1=374112&r2=374113&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210.html (original)
+++ incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210.html Wed Feb  1 08:50:16 2006
@@ -7,7 +7,7 @@
 	<META NAME="AUTHOR" CONTENT="Dave Johnson">
 	<META NAME="CREATED" CONTENT="20051209;11500200">
 	<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
-	<META NAME="CHANGED" CONTENT="20060126;20370000">
+	<META NAME="CHANGED" CONTENT="20060201;11355800">
 	<META NAME="SDFOOTNOTE" CONTENT=";;;;P">
 	<META NAME="SDENDNOTE" CONTENT="ARABIC">
 	<STYLE>
@@ -33,6 +33,28 @@
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=7 STYLE="font-size: 40pt"><B>User
+		Guide</B></FONT></P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=7 STYLE="font-size: 32pt"><B>Apache
+		Roller</B></FONT></P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=5 STYLE="font-size: 20pt"><B>Version
+		2.1-incubating</B></FONT></P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
+		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
@@ -43,8 +65,6 @@
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
-		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=7 STYLE="font-size: 40pt"><B>Roller
-		User Guide</B></FONT></P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
@@ -53,10 +73,6 @@
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
-		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=6 STYLE="font-size: 26pt">Roller
-		Weblogger</FONT></P>
-		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=5 STYLE="font-size: 20pt">Version
-		2.1-incubating</FONT></P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 		</P>
 		<P ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
@@ -106,91 +122,143 @@
 		<P STYLE="page-break-before: always"><BR><BR>
 		</P>
 		<DIV ID="Table of Contents1" DIR="LTR">
-			<DIV ID="Table of Contents1_Head" DIR="LTR">
+			<DIV ID="Table of Contents2_Head" DIR="LTR">
 				<P STYLE="margin-top: 0.17in; margin-bottom: 0.2in; page-break-after: avoid">
 				<FONT FACE="Albany, sans-serif"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Table
 				of Contents</B></FONT></FONT></P>
 			</DIV>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>1
-			- Introduction	4</B></FONT></P>
+			- Introduction	5</B></FONT></P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>2
-			- Getting started with Roller	4</B></FONT></P>
+			- Getting started with Roller	5</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>2.1 -
-			Getting started with a new Roller installation	4</P>
+			Getting started with a new Roller installation	5</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>2.2 -
-			Getting started with an existing Roller installation	4</P>
+			Getting started with an existing Roller installation	5</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>2.3 -
-			Accepting an invitation to join a weblog	5</P>
+			Accepting an invitation to join a weblog	6</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>2.4 -
-			Getting around in Roller	5</P>
+			Getting around in Roller	6</P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>3
-			- Creating and editing your weblog	8</B></FONT></P>
+			- Creating and editing your weblog	9</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.1 -
-			Creating and editing a weblog entries	9</P>
+			Creating and editing a weblog entries	10</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.2 -
-			Finding and editing weblog entries	11</P>
+			Finding and editing weblog entries	12</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.2.1 - Finding
+			old entries with the Create &amp; Edit:New Entry page 	12</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.2.2 - Finding
+			old entries with the Create &amp; Edit:Edit Entries page 	13</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.2.3 - Finding
+			old entries using the pages of your weblog 	13</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.2.4 - Finding
+			old entries with Roller's built-in search engine 	13</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.3 -
 			Weblog categories	14</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.3.1 - The
+			Weblog Category Chooser 	14</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.3.2 - RSS
+			Feed for Each Category 	14</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.3.3 - Adding,
+			Renaming, and Removing Weblog Categories 	14</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.4 -
 			Podcasting with Roller	15</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.4.1 - How to
+			create a podcast feed with Roller 	15</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.5 -
-			referrer rankings	17</P>
+			Referrer rankings	17</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.6 -
 			Comment notification via email	17</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.7 -
 			Comment management and moderation	17</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.8 -
-			Preventing weblog spam 	20</P>
+			Preventing weblog spam 	19</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.8.1 - Three
+			levels of blacklisting	19</P>
+			<P STYLE="margin-left: 0.39in; margin-bottom: 0in">3.8.2 - How to
+			add words and expressions to the blacklist	19</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>3.9 -
-			Sending trackbacks	21</P>
+			Sending trackbacks	20</P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>4
-			- Managing your weblog settings	22</B></FONT></P>
+			- Managing your weblog settings	21</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>4.1 -
-			Weblog settings	23</P>
+			Weblog settings	22</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>4.2 -
-			Weblog themes	26</P>
+			Weblog themes	25</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>4.3 -
-			Uploading Files	27</P>
+			Uploading Files	26</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>4.4 -
-			Setting up a group blog	28</P>
+			Setting up a group blog	27</P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>5
-			- Customizing your weblog's theme	30</B></FONT></P>
+			- Customizing your weblog's theme	29</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>5.1 -
-			Weblog and day templates 	32</P>
+			Weblog and day templates 	31</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>5.2 -
-			Define standard headers and footers with a decorator	34</P>
+			Define standard headers and footers with a decorator	33</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>5.3 -
-			Roller Macros and Variables 	35</P>
+			Roller Macros and Variables 	34</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>5.4 -
-			Creating and packaging your own Roller theme 	36</P>
+			Creating and packaging your own Roller theme 	35</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>5.5 -
-			Overriding Roller Macros 	37</P>
+			Overriding Roller Macros 	36</P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>6
-			- Managing your weblog's blogroll	38</B></FONT></P>
+			- Managing your weblog's blogroll	37</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>6.1 -
-			Adding new links to your blogroll	38</P>
+			Adding new links to your blogroll	37</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>6.2 -
-			Adding new links to your blogroll	39</P>
+			Adding new links to your blogroll	38</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>6.3 -
-			Adding new bookmark folders	40</P>
+			Adding new bookmark folders	39</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>6.4 -
-			Bookmark import and export via OPML	41</P>
+			Bookmark import and export via OPML	40</P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>7
-			- Using a blog client with Roller 	42</B></FONT></P>
+			- Using a blog client with Roller 	41</B></FONT></P>
 			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>8
-			- Using weblog pings	43</B></FONT></P>
+			- Using weblog pings	42</B></FONT></P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.1 -
-			Registering with an Aggregator	43</P>
+			Registering with an Aggregator	42</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.2 -
-			Ping Targets, Common and Custom	43</P>
+			Ping Targets, Common and Custom	42</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.3 -
-			Setting up Automated Pings	43</P>
+			Setting up Automated Pings	42</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.4 -
-			Sending a Manual Ping	45</P>
+			Sending a Manual Ping	44</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.5 -
-			Creating and Editing Custom Ping Targets	45</P>
+			Creating and Editing Custom Ping Targets	44</P>
 			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>8.6 -
-			More on Registering with an Aggregator	47</P>
+			More on Registering with an Aggregator	46</P>
+			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>9
+			- Roller administration	47</B></FONT></P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>9.1 -
+			Managing users	47</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>9.2 -
+			Configuring Roller	49</P>
+			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>10
+			- Weblog update ping administration	52</B></FONT></P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.1 -
+			Creating and editing common ping targets	52</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.2 -
+			How Roller Processes Weblog Update Pings	52</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.3 -
+			Configuration Properties Controlling Ping Processing	53</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.4 -
+			Suspending all ping processing	53</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.5 -
+			Controlling and disabling ping usage	53</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>10.6 -
+			Initialization of common ping targets	54</P>
+			<P STYLE="margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>11
+			- Planet Roller administration 	55</B></FONT></P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>11.1 -
+			Setting up the Planet aggregator	55</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>11.2 -
+			Configuring Planet Roller	56</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>11.3 -
+			Adding external subscriptions to Planet Roller	57</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>11.4 -
+			The Planet Roller main page	58</P>
+			<P STYLE="margin-left: 0.2in; margin-bottom: 0in"></SPAN>11.5 -
+			Adding custom groups to Planet	59</P>
 		</DIV>
 		<P><BR><BR>
 		</P>
@@ -201,52 +269,70 @@
 				Index</B></FONT></FONT></P>
 			</DIV>
 			<P STYLE="margin-bottom: 0in">Illustration 1: Main Menu with
-			invitation to join a group blog	5</P>
+			invitation to join a group blog	6</P>
 			<P STYLE="margin-bottom: 0in">Illustration 2: Status bar, no
-			weblog	6</P>
+			weblog	7</P>
 			<P STYLE="margin-bottom: 0in">Illustration 3: Status bar within
-			weblog	6</P>
+			weblog	7</P>
 			<P STYLE="margin-bottom: 0in">Illustration 4: Weblog navigation
-			bar	6</P>
+			bar	7</P>
 			<P STYLE="margin-bottom: 0in">Illustration 5: Weblog editor
-			navbar	7</P>
-			<P STYLE="margin-bottom: 0in">Illustration 6: Main menu	8</P>
-			<P STYLE="margin-bottom: 0in">Illustration 7: Weblog editor	9</P>
-			<P STYLE="margin-bottom: 0in">Illustration 8: Podcast URL field	12</P>
-			<P STYLE="margin-bottom: 0in">Illustration 9: Query and edit
-			entries page	13</P>
-			<P STYLE="margin-bottom: 0in">Illustration 10: Comment
-			management	14</P>
+			navbar	8</P>
+			<P STYLE="margin-bottom: 0in">Illustration 6: Main menu	9</P>
+			<P STYLE="margin-bottom: 0in">Illustration 7: Weblog editor	10</P>
+			<P STYLE="margin-bottom: 0in">Illustration 8: Edit entries page	12</P>
+			<P STYLE="margin-bottom: 0in">Illustration 9: Podcast URL field	16</P>
+			<P STYLE="margin-bottom: 0in">Illustration 10Comment (and
+			trackback) management page	18</P>
 			<P STYLE="margin-bottom: 0in">Illustration 11: Send trackback
-			control	15</P>
+			control	20</P>
 			<P STYLE="margin-bottom: 0in">Illustration 12: Result of sending
-			trackback	16</P>
+			trackback	20</P>
 			<P STYLE="margin-bottom: 0in">Illustration 13: Weblog preferences
-			menu	17</P>
-			<P STYLE="margin-bottom: 0in">Illustration 14: Weblog settings
-			page	18</P>
-			<P STYLE="margin-bottom: 0in">Illustration 15: Theme selection
-			page	20</P>
-			<P STYLE="margin-bottom: 0in">Illustration 16: Weblog permissions
-			page	22</P>
-			<P STYLE="margin-bottom: 0in">Illustration 17: Weblog templates
+			menu	21</P>
+			<P STYLE="margin-bottom: 0in">Illustration 14: Weblog  settings
+			page part 1	22</P>
+			<P STYLE="margin-bottom: 0in">Illustration 15: Weblog  settings
+			page part 2	24</P>
+			<P STYLE="margin-bottom: 0in">Illustration 16: Theme selection
 			page	25</P>
-			<P STYLE="margin-bottom: 0in">Illustration 18: Edit template
-			page	26</P>
-			<P STYLE="margin-bottom: 0in">Illustration 19: Theme directory
-			structure	31</P>
-			<P STYLE="margin-bottom: 0in">Illustration 20: Bookmarks
-			management page	32</P>
-			<P STYLE="margin-bottom: 0in">Illustration 21: Add folder form	33</P>
-			<P STYLE="margin-bottom: 0in">Illustration 22: w:bloggar	36</P>
-			<P STYLE="margin-bottom: 0in">Illustration 23: w:bloggar
-			configuration	36</P>
+			<P STYLE="margin-bottom: 0in">Illustration 17: Weblog permissions
+			page	27</P>
+			<P STYLE="margin-bottom: 0in">Illustration 18: Weblog templates
+			page	29</P>
+			<P STYLE="margin-bottom: 0in">Illustration 19: Edit template
+			page	30</P>
+			<P STYLE="margin-bottom: 0in">Illustration 20: Theme directory
+			structure	35</P>
+			<P STYLE="margin-bottom: 0in">Illustration 21: Bookmarks
+			management page	37</P>
+			<P STYLE="margin-bottom: 0in">Illustration 22: Add and edit
+			bookmark form	38</P>
+			<P STYLE="margin-bottom: 0in">Illustration 23: Add folder form	39</P>
 			<P STYLE="margin-bottom: 0in">Illustration 24: Automatic ping
-			configuration page	38</P>
-			<P STYLE="margin-bottom: 0in">Illustration 25: Edit ping target
-			form	40</P>
-			<P STYLE="margin-bottom: 0in">Illustration 26: Custom ping targets
-			page	40</P>
+			configuration page	43</P>
+			<P STYLE="margin-bottom: 0in">Illustration 25: Custom ping targets
+			page	45</P>
+			<P STYLE="margin-bottom: 0in">Illustration 26: Edit ping target
+			form	45</P>
+			<P STYLE="margin-bottom: 0in">Illustration 27: User admin page	47</P>
+			<P STYLE="margin-bottom: 0in">Illustration 28: User admin form	48</P>
+			<P STYLE="margin-bottom: 0in">Illustration 29: Config page: site
+			settings	49</P>
+			<P STYLE="margin-bottom: 0in">Illustration 30: Config page: user
+			settings	49</P>
+			<P STYLE="margin-bottom: 0in">Illustration 31: Config page: file
+			upload settings	50</P>
+			<P STYLE="margin-bottom: 0in">Illustration 32: Config  page:
+			newsfeed settings	50</P>
+			<P STYLE="margin-bottom: 0in">Illustration 33: Common weblog  ping
+			 targets	51</P>
+			<P STYLE="margin-bottom: 0in">Illustration 34: Planet config 
+			page	55</P>
+			<P STYLE="margin-bottom: 0in">Illustration 35: Planet
+			subscriptions page	56</P>
+			<P STYLE="margin-bottom: 0in">Illustration 36: Planet front
+			page	57</P>
 		</DIV>
 		<P STYLE="margin-bottom: 0in"><BR>
 		</P>
@@ -371,7 +457,7 @@
 		may also get an email message that informs you of the invitation.
 		To accept an invitation, login to Roller go to the Main Menu page
 		and you'll see something like this.</P>
-		<P><SPAN ID="Frame1" DIR="LTR" STYLE="float: left; width: 6.03in; height: 2in; border: none; padding: 0in; background: #ffffff">
+		<P><SPAN ID="Frame1" DIR="LTR" STYLE="float: left; width: 5.61in; height: 1.84in; border: none; padding: 0in; background: #ffffff">
 			<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_5c796a10.png" NAME="graphics1" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
 			1: Main Menu with invitation to join a group blog</I></FONT></P>
 		</SPAN><BR CLEAR=LEFT> 
@@ -507,7 +593,7 @@
 		</P>
 		<P> 
 		</P>
-		<P><SPAN ID="Frame7" DIR="LTR" STYLE="float: left; width: 6.5in; height: 5.86in; border: none; padding: 0in; background: #ffffff">
+		<P><SPAN ID="Frame7" DIR="LTR" STYLE="float: left; width: 6.13in; height: 5.67in; border: none; padding: 0in; background: #ffffff">
 			<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m4d036c80.png" NAME="graphics8" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
 			7: Weblog editor</I></FONT></P>
 		</SPAN><BR CLEAR=LEFT><BR><BR>
@@ -647,8 +733,9 @@
 		available to your readers on your weblog pages. They're available
 		to you too. 
 		</P>
-		<P><B>Finding old entries with the Create &amp; Edit:New Entry page</B>
-				</P>
+		<H3>3.2.1 - <B>Finding old entries with the Create &amp; Edit:New
+		Entry page</B> 
+		</H3>
 		<P>If you go to the <B>Create &amp; Edit:New Entry</B> page, you'll
 		see on the right a list of recent Pending Entries, Draft Entries,
 		and Recent Entries. You can edit any of these by simply clicking on
@@ -675,15 +762,11 @@
 		<P><SPAN ID="Frame28" DIR="LTR" STYLE="float: left; width: 6.85in; height: 4.58in; border: none; padding: 0in; background: #ffffff">
 			<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_58eca8b7.png" NAME="graphics11" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
 			8: Edit entries page</I></FONT></P>
-		</SPAN><BR CLEAR=LEFT> 
-		</P>
-		<P><BR><BR>
-		</P>
-		<P><BR><BR>
-		</P>
-		<P><B>Finding old entries with the Create &amp; Edit:Edit Entries
-		page</B> 
+		</SPAN><BR CLEAR=LEFT><BR><BR>
 		</P>
+		<H3>3.2.2 - <B>Finding old entries with the Create &amp; Edit:Edit
+		Entries page</B> 
+		</H3>
 		<P STYLE="font-weight: medium">You can use the Create &amp;
 		Edit:Edit Entries to find and edit your old posts. That includes
 		posts that have scrolled-off the bottom of the Pending, Draft and
@@ -694,8 +777,8 @@
 		period. You can edit any of the entries in the Weblog Entries list
 		by simply clicking on its title. 
 		</P>
-		<P><B>Finding old entries using the pages of your weblog</B> 
-		</P>
+		<H3>3.2.3 - <B>Finding old entries using the pages of your weblog</B>
+				</H3>
 		<P>You can also use the pages of your weblog to navigate into the
 		past and find old blog entries. If you do this when you are logged
 		in, then you'll see an <B>Edit</B> link on each weblog entry, which
@@ -719,8 +802,9 @@
 			navigate into the past by using URLs. 
 			</P>
 		</UL>
-		<P><B>Finding old entries with Roller's built-in search engine</B> 
-		</P>
+		<H3>3.2.4 - <B>Finding old entries with Roller's built-in search
+		engine</B> 
+		</H3>
 		<P>Roller also has a built in search engine, which you can use to
 		search for entries in the entire site, or in just your blog. If
 		you're logged in, when you find one of your old entries, it will
@@ -740,8 +824,8 @@
 		Currently, Roller only allows you to assign each weblog post to one
 		category. 
 		</P>
-		<P><B>The Weblog Category Chooser</B> 
-		</P>
+		<H3>3.3.1 - <B>The Weblog Category Chooser</B> 
+		</H3>
 		<P>When a user views your site, they can choose which category to
 		view. All of the stock Roller weblog templates include the Weblog
 		Category Chooser (displayed by the <FONT FACE="Courier New">#showWeblogCategoryChooser()</FONT>
@@ -749,16 +833,16 @@
 		which category to display or &quot;All&quot; for all categories of
 		posts. 
 		</P>
-		<P><B>RSS Feed for Each Category</B> 
-		</P>
+		<H3>3.3.2 - <B>RSS Feed for Each Category</B> 
+		</H3>
 		<P>Your weblog's main RSS newsfeed includes all categories, but
 		users can choose to subscribe to specific categories. All of the
 		stock Roller weblog templates display a list of your RSS feeds
 		(displayed by the <FONT FACE="Courier New">#showRSSLinks()</FONT>
 		macro), one for all categories and one for each separate category. 
 		</P>
-		<P><B>Adding, Renaming, and Removing Weblog Categories</B> 
-		</P>
+		<H3>3.3.3 - <B>Adding, Renaming, and Removing Weblog Categories</B>
+				</H3>
 		<P>You can change the names of your categories, add new categories,
 		and delete categories using the <B>Create &amp; Edit:Categories</B>
 		page of the Roller Editor UI. 
@@ -772,8 +856,8 @@
 		downloads the audio files that are referenced in your newsfeed and
 		copies them to an music player, such as an MP3 player. 
 		</P>
-		<P><B>How to create a podcast feed with Roller</B> 
-		</P>
+		<H3>3.4.1 - <B>How to create a podcast feed with Roller</B> 
+		</H3>
 		<P>In Roller a Podcast is like an attachment to a weblog entry. We
 		call it mediacasting in the Roller UI because it can be any type of
 		file and is not necessarily destined for play on an Apple iPod.
@@ -798,7 +882,7 @@
 			Roller, then the URL would look something like this: 
 			</P>
 		</UL>
-		<PRE STYLE="margin-bottom: 0.2in">	http://example.com/roller/resources/nina/mycast.mp3</PRE>
+		<PRE STYLE="margin-bottom: 0.2in">	<FONT FACE="Courier New">http://example.com/roller/resources/nina/mycast.mp3</FONT></PRE>
 		<UL>
 			<LI><P>Create a new Roller Weblog entry via <B>Create &amp;
 			Edit:New Entry</B> describing your new Podcast. You might want to
@@ -811,7 +895,7 @@
 		<PRE>	Hey now! I just created my first Podcast you can download it 
 	by clicking on this file name:
 
-	&lt;a href=&quot;http://example.com/roller/resources/nina/mycast.mp3&quot;&gt;mycast.mp3&lt;/a&gt;</PRE>
+<FONT FACE="Courier New">	&lt;a href=&quot;http://example.com/roller/resources/nina/mycast.mp3&quot;&gt;mycast.mp3&lt;/a&gt;</FONT></PRE>
 		<UL>
 			<LI><P>And the most important step: in the lower-half of the Edit
 			Weblog page, you'll see an expandable control labelled <I>+MediaCast
@@ -847,10 +931,16 @@
 			Nina would see the following enclosure in her newsfeed: 
 			</P>
 		</UL>
-		<PRE>	&lt;enclosure url=&quot;http://example.com/roller/resources/nina/mycast.mp3&quot; 
-		type=&quot;audio/x-mpeg&quot; length=&quot;3409127&quot; /&gt;</PRE><P>
+		<PRE><FONT FACE="Courier New">	&lt;enclosure url=&quot;http://example.com/roller/resources/nina/mycast.mp3&quot; </FONT>
+<FONT FACE="Courier New">		type=&quot;audio/x-mpeg&quot; length=&quot;3409127&quot; /&gt;</FONT></PRE><P>
 		That's all there is to podcasting with Roller.</P>
-		<H2 STYLE="page-break-before: always">3.5 - referrer rankings</H2>
+		<P><BR><BR>
+		</P>
+		<P><BR><BR>
+		</P>
+		<P><BR><BR>
+		</P>
+		<H2 STYLE="page-break-before: always">3.5 - Referrer rankings</H2>
 		<P>The <B>Weblog:referrer</B> referrer rankings page shows the hits
 		that are coming in from other websites and weblogs that have links
 		to your weblog and to specific entries in your weblog. By looking
@@ -961,16 +1051,15 @@
 		that case, anybody who tries to send a comment to your weblog via
 		trackback will receive and error messae and no comment will be
 		added.</P>
-		<P><SPAN STYLE="font-weight: medium">Your site administrator may
-		choose to enable a spam prevention measure known as <I>trackback
-		verification. </I>If that's the case, then each incoming trackback
-		will be verified. If the weblog that sent you the trackback does
-		not link to your weblog entry, then that trackback will be marked
-		as un-approved and pending. You'll have to visit the comment
-		management page to approve that trackback before it is displayed as
-		a comment on your weblog.</SPAN></P>
-		<H2 STYLE="page-break-before: always">3.8 - <B>Preventing weblog
-		spam</B> 
+		<P STYLE="margin-bottom: 0in"><SPAN STYLE="font-weight: medium">Your
+		site administrator may choose to enable a spam prevention measure
+		known as <I>trackback verification. </I>If that's the case, then
+		each incoming trackback will be verified. If the weblog that sent
+		you the trackback does not link to your weblog entry, then that
+		trackback will be marked as un-approved and pending. You'll have to
+		visit the comment management page to approve that trackback before
+		it is displayed as a comment on your weblog.</SPAN></P>
+		<H2>3.8 - <B>Preventing weblog spam</B> 
 		</H2>
 		<P>There are three forms of comment spam that can affect your
 		weblog:</P>
@@ -996,7 +1085,7 @@
 		in the previous section) to manage spam. That's not all. Roller
 		also includes a blacklisting feature, which can be used to fight
 		all three forms of spam.</P>
-		<P><B>Three levels of blacklisting</B></P>
+		<H3>3.8.1 - Three levels of blacklisting</H3>
 		<P><SPAN STYLE="font-weight: medium">Roller uses a <I>blacklist</I>,
 		a lists of words which are used to check incoming comments,
 		trackbacks and referrers for spam. The blacklist includes several
@@ -1026,8 +1115,7 @@
 		<P STYLE="font-weight: medium">Incoming comments and trackbacks are
 		checked against all three levels of blacklist. Incoming referrers,
 		however, are only checked against the levels 2 and 3 blacklist.</P>
-		<P STYLE="font-style: normal"><B>How to add words and expressions
-		to the blacklist</B></P>
+		<H3>3.8.2 - How to add words and expressions to the blacklist</H3>
 		<P STYLE="font-weight: medium">If you have a spam problem on your
 		weblog and you'd like to add words to the blacklist, it's probably
 		better for you to ask your administrator to add the words to the
@@ -1040,20 +1128,19 @@
 				page and scroll down to the blacklist fields</P>
 				<LI><P STYLE="font-weight: medium">Enter your spam words, one per
 				line</P>
-				<LI><P STYLE="font-weight: medium">Lines that begin with a left
-				parenthesis will be treated as regular expressions (see the  Java
-				API documentation for <FONT FACE="Courier New">javax.util.regex.Pattern</FONT>
+				<LI><P><SPAN STYLE="font-weight: medium">Lines that begin with a
+				left parenthesis will be treated as regular expressions (see the 
+				Java API documentation for <FONT FACE="Courier New">javax.util.regex.Pattern</FONT>
 				for a guide to regular expressions). Don't try to use a regular
-				expression unless you really know what you're doing.</P>
+				expression unless you really know what you're doing.</SPAN></P>
 			</UL>
 		</UL>
-		<H2 STYLE="page-break-before: always">3.9 - Sending trackbacks</H2>
+		<H2>3.9 - Sending trackbacks</H2>
 		<P>If you are writing about something you read on another weblog,
 		you want to let the author and readers of that weblog know that you
 		are doing so, and that other weblog is trackback enabled, then you
-		should send that weblog a trackback ping. 
-		</P>
-		<P>Here's a story that illustrates how trackback works: 
+		should send that weblog a trackback ping. Here's a story that
+		illustrates how trackback works: 
 		</P>
 		<UL>
 			<LI><P>You read an interesting blog entry on Otto's blog. You
@@ -1094,8 +1181,6 @@
 			on Otto's blog entry. 
 			</P>
 		</UL>
-		<P STYLE="margin-bottom: 0in"><BR>
-		</P>
 		<H1 CLASS="western" STYLE="page-break-before: always">4 - Managing
 		your weblog settings</H1>
 		<P>As a Roller user, you are free to customize the look-and-feel of
@@ -1958,7 +2043,6 @@
 		</UL>
 		<P><BR><BR>
 		</P>
-		<H2></H2>
 		<H2 STYLE="page-break-before: always">5.5 - Overriding Roller
 		Macros 
 		</H2>
@@ -2421,6 +2505,593 @@
 		</P>
 		<P><BR><BR>
 		</P>
+		<DIV ID="Section1" DIR="LTR">
+			<DIV ID="Section3" DIR="LTR">
+				<H1 CLASS="western" STYLE="page-break-before: always">9 - Roller
+				administration</H1>
+				<P>The section of the Roller user  guide is for users with the
+				global admin role. How do you get the admin role? The first user
+				created in a Roller system gets that role and then can grant it
+				to other users via the <B>Global Admin-&gt;User Admin</B> page,
+				which just happens to be the first topic we'll cover in the
+				section.</P>
+				<P>We'll also describe how to configure Roller via the <B>Global
+				Admin-&gt;Configuration </B>page and how to configure Roller's
+				custom ping facility via the <B>Global Admin-&gt;Ping Targets</B>
+				page.</P>
+				<H2>9.1 - Managing users</H2>
+				<P>The <B>Global Admin-&gt;User Admin</B> page, shown below,
+				allows you to find users, edit users and create new users. 
+				</P>
+				<P> 
+				</P>
+				<P><SPAN ID="Frame22" DIR="LTR" STYLE="float: left; width: 6.48in; height: 4.17in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m4b577c06.png" NAME="graphics12" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					27: User admin page</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<P>To find a user, just enter the user's username in the username
+				in the the Username field and click the edit button. If you don't
+				know the user's username, then start typing what you think might
+				be the first letters of her username or email address and the
+				list-box will be populated with all users whose usernames or
+				email addresses match. When you see the user you want in the list
+				box, click her and then click the Edit button to edit her user
+				information.</P>
+				<P>You can also create a new user by clicking the <B>create a new
+				user link</B>.</P>
+				<P><BR><BR>
+				</P>
+				<P>When a user is loaded into the <B>Global Admin-&gt;User Admin</B>
+				page, or when you create a new user, you'll see the form shown
+				below. You can set the user's full name, email address, locale
+				and timezone. You can also reset the user's password, if you
+				enter both a password and password confirmation fields.</P>
+				<P><BR><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><SPAN ID="Frame9" DIR="LTR" STYLE="float: left; width: 6.56in; height: 5.51in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m54dbe4ad.png" NAME="graphics18" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					28: User admin form</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">You can also <SPAN STYLE="font-weight: medium">disable
+				a user</SPAN>, which will prevent the user from logging into
+				Roller.</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">Or you can check the Administrator
+				checkbox to grant grant the user Global Admin privileges.</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">At the bottom of the page, there's
+				a <B>Users Weblogs</B> section, which you can use to edit any of
+				the user's weblogs. This feature is here to make it easy for
+				Global Admin's to help users who are having trouble with any of
+				Roller's features, so please use it for that reason only; don't
+				use it to invade your user's privacy.</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><B>There's one important
+				limitation: currently there is currently no way to delete a user.</B></P>
+				<H2 STYLE="page-break-before: always">9.2 - Configuring Roller</H2>
+				<P>The <B>Global Admin-&gt;Configuration</B> page allows you to
+				set Roller's runtime configuration properties. It is a big page,
+				so we will discuss each section separately below. 
+				</P>
+				<P> 
+				</P>
+				<P><SPAN ID="Frame29" DIR="LTR" STYLE="float: left; width: 6.44in; height: 2.3in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m4fe3f61b.png" NAME="graphics20" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					29: Config page: site settings</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<UL>
+					<LI><P STYLE="margin-bottom: 0in"><B>Site name</B>: name of the
+					site, to be included in site-wide newsfeeds (RSS and Atom) and
+					on the default front page of the Roller.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Short name</B>: short name
+					of the site, to be included as the link in the banner that
+					appears at the top of every page in the Roller editor/admin UI.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Site description</B>:
+					description of site, to be included in site-wide newsfeeds (RSS
+					and Atom) and on the default front page of the site.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Site Administrator's email
+					Address</B>: admin's email address, to be include in side-side
+					newsfeeds (RSS and Atom)</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Absolute URL to this site</B>:
+					to be used as basis for creating absolute URLs. Required for
+					Roller's Planet aggregator feature.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Suspend all ping
+					processing</B>: Allows you to turn off all (outgoing) weblogs
+					pings for all weblogs in the system.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Enable debug mode</B>:
+					currently not used.</P>
+					<P></P>
+				</UL>
+				<P><SPAN ID="Frame30" DIR="LTR" STYLE="float: left; width: 6.49in; height: 1.86in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m3a18f583.png" NAME="graphics23" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					30: Config page: user settings</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT> 
+				</P>
+				<UL>
+					<LI><P STYLE="margin-bottom: 0in"><B>Allow New Users</B>: Set
+					this to enable the <I>register as new user</I> link on the main
+					page. If you turnoff user creation, you'll only be able to
+					create new users via the <B>Global Admin-&gt;User Admin</B>
+					page.</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>External registration URL</B>:
+					Controls the URL of Roller's &ldquo;Register as new users&rdquo;
+					link. If you use an external system to create Roller users and
+					blogs, set the URL of that system here. 
+					</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Editor pages</B>: this is
+					the list of weblog editors to be provided to users.</P>
+				</UL>
+				<P><BR><BR>
+				</P>
+				<P><SPAN ID="Frame37" DIR="LTR" STYLE="float: left; width: 6.33in; height: 2.4in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_6aedbe24.png" NAME="graphics39" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					31: Config: comments</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<UL>
+					<LI><P><B>Allow weblog comments</B>: By un-setting this  you can
+					turn off weblog comments on all weblogs in the system.</P>
+					<LI><P><B>Allow trackbacks</B>: By un-setting this  you can turn
+					off incoming trackbacks on all weblogs in the system.</P>
+					<LI><P><B>Autoformat comments</B>: If this is on, Roller will
+					auto-format comments by adding in line-breaks where appropriate.</P>
+					<LI><P><B>Escape comment HTML</B>: By setting this, you can
+					disallow HTML in comments and thereby protect your site from
+					malicious JavaScript and some forms of cross-site scripting.</P>
+					<LI><P><B>E-mail notification of comments</B>: set this to
+					enable email notification of new comments. This won't work
+					unless you configured Roller properly for sending email as
+					described in the Roller installation guide.</P>
+					<LI><P><B>Enable verification of trackback links</B>: Trackback
+					verification checks each incoming trackback to verify that the
+					site sending the trackback actually links to the specific weblog
+					entry that is the target of the trackback.</P>
+					<LI><P><B>Enable referrer linkback extraction</B>: NOT
+					RECOMMENDED. This is an experimental feature and it is not known
+					to be working correctly.</P>
+				</UL>
+				<P><BR><BR>
+				</P>
+				<P><SPAN ID="Frame31" DIR="LTR" STYLE="float: left; width: 6.38in; height: 1.94in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m5eead6e8.png" NAME="graphics24" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					32: Config page: file upload settings</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<UL>
+					<LI><P STYLE="margin-bottom: 0in"><B>Enable File Uploads</B>:
+					Are users allowed to upload files? 
+					</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Allowed Extensions</B>:
+					Comma-separated list of file extensions that users are allowed
+					to upload. 
+					</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Forbidden Extensions</B>:
+					Comma-separated list of file extensions that users are NOT
+					allowed to upload. 
+					</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Max File Size (MB)</B>:
+					Maximum size of file that users are allowed to upload. 
+					</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Max Directory Size (MB)</B>:
+					Total upload directory size per user. 
+					</P>
+					<P STYLE="margin-bottom: 0in"></P>
+				</UL>
+				<P> 
+				</P>
+				<P><SPAN ID="Frame32" DIR="LTR" STYLE="float: left; width: 6.43in; height: 1.2in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m6046b9c9.png" NAME="graphics25" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					33: Config  page: newsfeed settings</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<UL>
+					<LI><P STYLE="margin-bottom: 0in"><B>Default number of entries</B>:
+					default number of entries to appear in each newsfeed (RSS and
+					Atom).</P>
+					<LI><P STYLE="margin-bottom: 0in"><B>Maximum number of entries</B>:
+					maximum number of entries to be allowed in each newsfeed (RSS
+					and Atom).</P>
+				</UL>
+				<H1 CLASS="western" STYLE="page-break-before: always">10 - Weblog
+				update ping administration</H1>
+				<P>This section, intended for Roller administrators, describes
+				how Roller weblog update ping feature works and how to configure
+				and administer it.</P>
+				<H2>10.1 - Creating and editing common ping targets</H2>
+				<P>Common ping targets are ping targets that are shared by all
+				users. You can create and edit common ping targets using the
+				<B>Global Admin-&gt;Ping Targets</B> page. 
+				</P>
+				<P><BR><BR>
+				</P>
+				<P><SPAN ID="Frame33" DIR="LTR" STYLE="float: left; width: 6.39in; height: 3.53in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_mf310db2.png" NAME="graphics28" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					34: Common weblog  ping  targets</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<P>You can create and edit common ping in the same way that
+				regular users create and edit custom ping targets, but keep in
+				mind that common ping targets are shared amongst all users, and
+				that your changes affect all users using the ping target. 
+				</P>
+				<P>Administrators should make sure to test new common ping
+				targets after creating them. 
+				</P>
+				<H2>10.2 - How Roller Processes Weblog Update Pings</H2>
+				<P>Roller processes weblog update pings in the background. When a
+				user updates his or her weblog, Roller automatically queues any
+				required automated pings on a queue. Roller only keeps one ping
+				queue entry for a given user weblog and ping target. Subsequent
+				updates to a weblog occurring before the ping is processed will
+				not cause additional pings to be queued. 
+				</P>
+				<P>Roller makes a full pass through the ping queue at regular
+				intervals. (Configuration of this interval is discussed below) In
+				each pass, Roller will attempt to send every queued ping request
+				once. If any send fails (and provided the failure appears to be a
+				transient one), the ping request will be re-queued, until the
+				ping succeeds or a configured number of attempts has been made.
+				Note that when a ping request fails and is re-queued, it is
+				processed again only on subsequent ping passes. If the number of
+				attempts to reach a given ping target reaches the maximum without
+				succeeding, then an error message is logged and the ping request
+				is dropped. 
+				</P>
+				<P>There is currently no mechanism for alerting users of failing
+				ping targets (though we plan some improvements in subsequent
+				releases to provide condition information on the weblog
+				<B>Preferences-&gt;Pings</B> page, as well as a failure policy to
+				deactivate persistently failing ping targets). 
+				</P>
+				<H2>10.3 - Configuration Properties Controlling Ping Processing</H2>
+				<P>These properties control processing of the ping queue. They
+				are configured in the <TT><FONT FACE="Courier New">roller.properties</FONT></TT><FONT FACE="Courier New">
+				</FONT>file. 
+				</P>
+				<DL>
+					<DD STYLE="margin-left: 0.49in; margin-bottom: 0.2in"><FONT SIZE=2 STYLE="font-size: 11pt"><B>pings.queueProcessingIntervalMins
+					</B>The interval in minutes between ping queue processing runs.
+					This must be a value in the range 0 to 120. The default value is
+					5 minutes. We think the default value should work for most
+					sites, and is tolerable for most users. The number of users
+					publishing or updating entries in a given interval determines
+					the length of the queue, and Roller requires enough time in an
+					interval to process the queue once. We think that for all but
+					the largest and most active sites, it can probably be lowered as
+					low as 1 minute if desired. <B>IMPORTANT</B>: The value 0 (zero)
+					has a special meaning. If the processing interval is set to 0,
+					ping queue processing is disabled on the server. This can be
+					used to exclude all but one host from sending pings in a
+					clustered environment where multiple Roller servers are sharing
+					one database schema. <B>Make sure to retain one host in the
+					cluster that does process the ping queue!</B> If multiple hosts
+					in a cluster process the ping queue, you may send duplicate
+					pings and failing ping requests may drop out of the queue sooner
+					than the expected maximum (configured by the next parameter). If
+					no hosts in a cluster process the ping queue, auto ping requests
+					will accumulate in the queue and this will eventually cause the
+					database to run out of space, so don't try to use this as a way
+					to disable ping features. You can use the properties described
+					in the following sections to disable ping features. </FONT>
+					</DD><DD STYLE="margin-left: 0.49in; margin-bottom: 0.2in">
+					<FONT SIZE=2 STYLE="font-size: 11pt"><B>pings.maxPingAttempts
+					</B>The maximum number of ping attempts made before the ping
+					request will no longer be requeued and will instead be dropped
+					from the queue. The default value is 3. We think this value is
+					fine for most sites. </FONT>
+					</DD></DL>
+				<H2>
+				10.4 - Suspending all ping processing</H2>
+				<P>Administrators can suspend all ping processing at runtime by
+				checking the <B>Suspend ping processing?</B> checkbox under the
+				<B>Site Settings</B> heading on the <B>Global
+				Admin-&gt;Configuration</B> page and saving that form. 
+				</P>
+				<P>When this checkbox is set, all ping processing is suspended.
+				New automatic ping requests are not added to the queue, and
+				existing entries on the queue are not processed. Manual pings are
+				not sent either; they result in a message telling the user that
+				ping processing has been suspended. Suspending ping processing is
+				appropriate to temporarily stop all ping processing if problems
+				are encountered. 
+				</P>
+				<P>Unchecking the checkbox and saving allows normal ping
+				processing to resume. Note, however, that autopings for weblogs
+				that are updated while ping processing is suspended will never be
+				queued and hence never sent, but pings queued before the
+				suspension are sent once the suspension is lifted. 
+				</P>
+				<H2>10.5 - Controlling and disabling ping usage</H2>
+				<P>Since use of a ping target causes an outbound network
+				connection to the ping site, some administrators may not want to
+				allow users to create their own custom ping targets. It is
+				possible to enable or disable the use of custom ping targets
+				across the whole site and also to disable all ping usage. The
+				following two properties are used to control this. 
+				</P>
+				<DL>
+					<DD STYLE="margin-left: 0.49in; margin-bottom: 0.2in"><FONT SIZE=2 STYLE="font-size: 11pt"><B>pings.disallowCustomTargets.
+					</B>This property controls whether users are allowed to create
+					custom ping targets. If set to true, all existing custom ping
+					targets are <I>removed</I>, and the <B>Weblog:Custom Ping
+					Targets</B> page and the associated actions are disabled
+					preventing any configuration of custom ping targets. <B>Note:</B>
+					<I>Setting this to true this will cause the Roller server to
+					</I>remove <I>any custom ping targets that users have created
+					when Roller is next started.</I> </FONT>
+					</DD></DL>
+				<P>
+				Administrators may also wish to disable ping functionality
+				entirely. The following property, used in conjunction with the
+				above property, can be used to do this. 
+				</P>
+				<DL>
+					<DD STYLE="margin-left: 0.49in; margin-bottom: 0.2in"><FONT SIZE=2 STYLE="font-size: 11pt"><B>pings.disablePingUsage.
+					</B>This property controls whether users are allowed to set up
+					automatic pings or send manual pings. If set to true, all
+					existing autoping configurations are removed (i.e. disabled),
+					the weblog <B>Preferences-&gt;Pings</B> page and associated
+					actions are disabled, preventing any use of the ping features by
+					regular users. <B>Note:</B> <I>Setting this to true will cause
+					the Roller server to </I>remove <I>any autopings that users have
+					configured when Roller is next started.</I> </FONT>
+					</DD></DL>
+				<P>
+				If both of the above properties are set to true, all ping
+				functionality is effectively disabled for regular users. The
+				<B>Global Admin:Ping Targets</B> page is still accessible (to
+				administrators); you can use that page to clear out any common
+				targets if you wish. No user (including administrators) will be
+				able to configure automatic pings or send pings. Ping queue
+				processing continues but the queue will always be empty; you can
+				safely disable ping queue processing (by setting the processing
+				interval to zero) in this situation. 
+				</P>
+				<H2>10.6 - Initialization of common ping targets</H2>
+				<P>The initial set of common ping targets is determined by the
+				following configuration property. 
+				</P>
+				<DL>
+					<DD STYLE="margin-left: 0.49in; margin-bottom: 0.2in"><FONT SIZE=2 STYLE="font-size: 11pt"><B>pings.initialCommonTargets.
+					</B>This value is used to initialize the set of common ping
+					targets. The value consists of a comma-separated list of ping
+					targets, where each ping target is specified in the form </FONT>
+					</DD></DL>
+				<PRE STYLE="margin-bottom: 0.2in">          <FONT SIZE=2 STYLE="font-size: 11pt">{{name}{url}}</FONT></PRE>
+				<DL>
+					<DD STYLE="margin-bottom: 0.2in">
+					<FONT SIZE=2 STYLE="font-size: 11pt">This value is used every
+					time Roller starts <I>and finds an empty list of common ping
+					targets.</I> Normally, this is only the first time Roller is
+					started on a fresh or upgraded database; note, however, that if
+					you really want to maintain an empty list of common ping
+					targets, you will need to comment out this value or set it to an
+					empty string. </FONT>
+					</DD><DD STYLE="margin-left: 0in; margin-bottom: 0.2in">
+					<BR><BR>
+					</DD></DL>
+				<H1 CLASS="western" STYLE="page-break-before: always">
+				11 - Planet Roller administration 
+				</H1>
+				<P>This page describes the new Planet Roller feature. This
+				feature is disabled by default. You can enable it by overriding
+				the <TT>planet.aggregator.enabled </TT>(the Installation Guide
+				for details). 
+				</P>
+				<P>This new feature allows a you to add separately hosted blogs
+				to a Planet tab on the Roller front-page. Separately hosted blogs
+				can be running on any type of blog server, as long as it supports
+				RSS 0.93 or later and has item-level publication dates. 
+				</P>
+				<H2>11.1 - Setting up the Planet aggregator</H2>
+				<P>Before you can configure and use the Planet aggregator, you
+				must set it up. (this material will be moved into the
+				installation guide in a future release). Here are the three
+				steps:</P>
+				<P><B>STEP1: Enable the Planet aggregator </B>
+				</P>
+				<P>Set  <FONT FACE="Courier New">planet.aggregator.enabled=true</FONT>
+				in your Roller properties override file.</P>
+				<P>Enter a valid cache directory in the
+				<FONT FACE="Courier New">planet.aggregator.cache.dir</FONT>
+				property of your Roller properties override file. Make sure the
+				cache directory exists and is writable by the user who owns the
+				Roller process.</P>
+				<P><B>STEP 2: Setup the refresh-entries task</B></P>
+				<P>The RefreshEntriesTask is responsible for updating each of the
+				blogs in the Planet aggregator. You should set it up to run every
+				hour. There are two ways to do this. You can add it to the list
+				of hourly tasks run by Roller's built-in scheduler by adding the
+				following to your Roller properties override file:</P>
+				<P>   <FONT FACE="Courier New"><FONT SIZE=2># Comma separated
+				list of task classnames to be executed hourly</FONT></FONT></P>
+				<P>  
+				<FONT FACE="Courier New"><FONT SIZE=2>tasks.hourly=org.roller.presentation.planet.RefreshEntriesTask</FONT></FONT></P>
+				<P>However, some folks have found that the RefreshEntriesTask can
+				works best when run outside of Roller. If you want to do that
+				instead, you can use cron on UNIX or Windows Task scheduler to
+				run the task. For UNIX users, use the rollertask.sh script which
+				can be found in the Roller install directory under docs/examples.
+				You'll have to modify it to set your paths and your JDBC driver
+				jar.</P>
+				<P><B>STEP 3: Setup the sync-websites task</B></P>
+				<P>The SyncWebsitesTask ensures that every blog in the Roller
+				system is included in the Planet aggregator. It is intended to
+				run every night. Every time that it runs, it adds all new blogs
+				and removes all blogs that no longer exist. If you have a valid
+				technorati.license file your classpath, it will also rank the
+				blogs in the system using the Techorati system. To setup
+				sync-websites, add the following to your Roller propeties
+				override file.</P>
+				<P>   <FONT FACE="Courier New"><FONT SIZE=2># Daily Planet task:
+				syncs weblog list with Roller, refreshes Technorati stats</FONT></FONT></P>
+				<P>   <FONT FACE="Courier New"><FONT SIZE=2>tasks.daily=org.roller.presentation.planet.SyncWebsitesTask</FONT></FONT></P>
+				<P>As with the refresh-entries tasks, some have found that
+				sync-websites runs best outside of Roller. You can run it from
+				cron or Windows Task Scheduler too. And again, UNIX users can use
+				<FONT SIZE=2 STYLE="font-size: 10pt"><FONT FACE="Courier New">rollertask.sh</FONT></FONT>
+				to do this.</P>
+				<P><B>How do you get a Technorati license in your classpath? </B>You
+				can get an API key from the Technorati Developer Center. Place
+				the API key in a file (which no whitespace) named
+				<FONT FACE="Courier New">technorati.license</FONT> and place that
+				license in the <FONT FACE="Courier New">WEB-INF/classes</FONT>
+				directory of your Roller install.</P>
+				<H2><A NAME="section-AdministrationGuide_120-ConfiguringPlanetRoller"></A>
+				11.2 - Configuring Planet Roller</H2>
+				<P>If you've got Planet enabled, when you login as a global admin
+				you'll see a Planet Administration link on the Roller Main Menu
+				page. Click that link to view the <B>Planet Admin-&gt;Configuraiton</B>
+				page, shown below.</P>
+				<P><SPAN ID="Frame34" DIR="LTR" STYLE="float: left; width: 6.48in; height: 3.71in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_62ac32cd.png" NAME="graphics36" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					35: Planet config  page</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<P><A NAME="section-AdministrationGuide_120-ToConfigurePlanetRollerYouMust"></A>
+				<B>To configure Planet Roller, you must:</B></P>
+				<UL>
+					<LI><P>Ensure that your site has an absolute URL in the <B>Global
+					Admin-&gt;Configuration</B> page in the Site Settings section. 
+					</P>
+				</UL>
+				<UL>
+					<LI><P>If you are behind a proxy, you must enter proxy settings
+					in the <B>Planet Admin-&gt;Configuration</B> page. 
+					</P>
+				</UL>
+				<P STYLE="margin-bottom: 0in"><A NAME="section-AdministrationGuide_120-ThePlanetControlButtons"></A>
+				<B>The Planet Control buttons</B></P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P>The buttons at the bottom of the <B>Planet
+				Admin-&gt;Configuration</B> page can be used to kick off the
+				Planet Roller background tasks. Normally, these tasks will run on
+				a schedule and you will not have to touch these buttons. If you
+				are doing testing, you might need to use them to diagnose
+				problems -- so we've left them in the interface. 
+				</P>
+				<UL>
+					<LI><P><B>Refresh Entries</B>: this button will launch the
+					Refresh Entries task which updates every newsfeed in the system.
+					Normally this runs every hour. It can take several minutes to
+					complete and the only way to know that it is done is to watch
+					the log files (and have INFO level debugging turned on for the
+					<FONT FACE="Courier New">RefreshEntriesTask</FONT> class). 
+					</P>
+				</UL>
+				<UL>
+					<LI><P><B>Synchronize Websites</B>: this button will launch the
+					Synchronize Websites tasks which ensures that every Roller
+					website (i.e. blog) in the system is represented by a
+					subscription in Planet Roller. If any websites have been deleted
+					from the system, the the task will delete the corresponding
+					subscription. 
+					</P>
+				</UL>
+				<H2><A NAME="section-AdministrationGuide_120-AddingExternalSubscriptionsToPlanetRoller"></A>
+				11.3 - Adding external subscriptions to Planet Roller</H2>
+				<P>By default, Planet will include all of the blogs in the Roller
+				site. But the purpose of Planet is to allow externally hosted
+				blogs to be included on the front page.</P>
+				<P STYLE="margin-bottom: 0in"><B>Adding and removing external
+				blogs</B></P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P>To add an externally hosted blog to the Planet, use the <B>Planet
+				Admin-&gt;Subscriptions</B> page. To add a blog, enter it's
+				title, newsfeed URL and website URL. Normally, you must enter all
+				three field, but if you have a Technorati license in your
+				classpath you might be able to enter only the website URL and let
+				Roller figure out the rest (by using Technorati).</P>
+				<P>You can select an existing subscription and edit it or delete
+				it. The change will not be evident on the front page until the
+				next scheduled Refresh Entries task runs. 
+				</P>
+				<P>Note that Planet Roller only supports Atom and RSS newsfeeds
+				that include entry level date information. If you enter a
+				subscription that does not include dates, Planet Roller will
+				accept it, but you may not see entries from the feed because
+				Roller will assume that it's entries are one day old.</P>
+				<P><SPAN ID="Frame35" DIR="LTR" STYLE="float: left; width: 6.3in; height: 4.51in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_4879cc9c.png" NAME="graphics38" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					36: Planet subscriptions page</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR><BR>
+				</P>
+				<P><BR><BR>
+				</P>
+				<H2><A NAME="section-AdministrationGuide_120-ThePlanetRollerMainPage"></A>
+				11.4 - The Planet Roller main page</H2>
+				<P>The Planet Roller main page is shown below.</P>
+				<P STYLE="margin-bottom: 0in"><SPAN ID="Frame36" DIR="LTR" STYLE="float: left; width: 6.42in; height: 4.75in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m6732908.png" NAME="graphics37" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					37: Planet front page</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><A NAME="section-AdministrationGuide_120-RSSNewsfeed"></A>
+				<B>The planet newsfeeds</B></P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">Planet provides a newsfeed that
+				included posts from all blogs in the aggregator. You can get this
+				feed at the path /planetrss, so for example, for a default Roller
+				install the newsfeed URL would be:</P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">  
+				<FONT FACE="Courier New">http://localhost:8080/roller/planetrss</FONT></P>
+				<P><BR><BR>
+				</P>
+				<P><A NAME="section-AdministrationGuide_120-TechnoratiRankings"></A>
+				<B>Technorati Rankings</B></P>
+				<P>Because we cannot get hit counts for the external blogs in the
+				system, Planet Roller displays Technorati Rankings for all blogs
+				in the system instead. This only works right if you have a valid
+				Technorati license in your classpath.</P>
+				<P><BR><BR>
+				</P>
+				<H2 STYLE="page-break-before: always">11.5 - Adding custom groups
+				to Planet</H2>
+				<P STYLE="margin-bottom: 0in">You can also add custom aggregation
+				groups to planet. Just use the <B>Planet AdminCustom Groups</B>
+				page, shown below.</P>
+				<P><BR><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in"><SPAN ID="Frame38" DIR="LTR" STYLE="float: left; width: 6.39in; height: 4.27in; border: none; padding: 0in; background: #ffffff">
+					<P STYLE="margin-top: 0.08in"><IMG SRC="roller-user-guide-210_html_m5327a1d1.png" NAME="graphics41" ALIGN=LEFT WIDTH=100% BORDER=0><BR CLEAR=LEFT><FONT SIZE=2><I>Illustration
+					38: Planet custom groups page</I></FONT></P>
+				</SPAN><BR CLEAR=LEFT><BR>
+				</P>
+				<P>In the custom groups page shown above, you can see four custom
+				groups. Each of these groups has a set of subscriptions.
+				Currently, these custom groups are NOT displayed on the Planet
+				page. Someday we'd like to enable that, but for now they only way
+				to display those groups on the Planet page is to customize the
+				Java ServerPages (JSP) code that defines that page.</P>
+				<P>Custom groups aren't displayed on the Planet page, but they
+				are available in newsfeed form. So if you define groups named
+				&ldquo;mygroup1&rdquo; and &ldquo;mygroup2&rdquo; you'll find
+				that you have two new newsfeeds. For example:</P>
+				<P STYLE="margin-bottom: 0in">  
+				<FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New">http://localhost:8080/roller/planetrss?group=mygroup1</FONT></FONT></P>
+				<P STYLE="margin-bottom: 0in">  
+				<FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New">http://localhost:8080/roller/planetrss?group=mygroup2</FONT></FONT></P>
+				<P STYLE="margin-bottom: 0in"><BR>
+				</P>
+				<P STYLE="margin-bottom: 0in">And that brings us to the end of 
+				the Planet section and the end of the Roller user guide.</P>
+			</DIV>
+		</DIV>
 	</DIV>
 </DIV>
 </BODY>

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_4879cc9c.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_4879cc9c.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_4879cc9c.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_62ac32cd.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_62ac32cd.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_62ac32cd.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_6aedbe24.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_6aedbe24.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_6aedbe24.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m3a18f583.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m3a18f583.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m3a18f583.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4b577c06.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4b577c06.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4b577c06.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4fe3f61b.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4fe3f61b.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m4fe3f61b.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5327a1d1.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5327a1d1.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5327a1d1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m54dbe4ad.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m54dbe4ad.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m54dbe4ad.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5eead6e8.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5eead6e8.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m5eead6e8.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6046b9c9.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6046b9c9.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6046b9c9.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6732908.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6732908.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_m6732908.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_mf310db2.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_mf310db2.png?rev=374113&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.1/docs/userguide/generated/html/roller-user-guide-210_html_mf310db2.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/roller/branches/roller_2.1/docs/userguide/generated/roller-user-guide-210.pdf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/generated/roller-user-guide-210.pdf?rev=374113&r1=374112&r2=374113&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/branches/roller_2.1/docs/userguide/roller-user-guide-210.odt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.1/docs/userguide/roller-user-guide-210.odt?rev=374113&r1=374112&r2=374113&view=diff
==============================================================================
Binary files - no diff available.