You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2010/11/05 23:37:37 UTC

svn commit: r1031866 - /incubator/river/site/trunk/content/

Author: sijskes
Date: Fri Nov  5 22:37:36 2010
New Revision: 1031866

URL: http://svn.apache.org/viewvc?rev=1031866&view=rev
Log: (empty)

Modified:
    incubator/river/site/trunk/content/committers.mdtext
    incubator/river/site/trunk/content/community.mdtext
    incubator/river/site/trunk/content/development-top-link.mdtext
    incubator/river/site/trunk/content/development.mdtext
    incubator/river/site/trunk/content/documentation.mdtext
    incubator/river/site/trunk/content/downloads.mdtext
    incubator/river/site/trunk/content/found-a-bug.mdtext
    incubator/river/site/trunk/content/index.mdtext
    incubator/river/site/trunk/content/javadoc.mdtext
    incubator/river/site/trunk/content/license.mdtext
    incubator/river/site/trunk/content/mailing-lists.mdtext
    incubator/river/site/trunk/content/river-users.mdtext
    incubator/river/site/trunk/content/sidenav.mdtext
    incubator/river/site/trunk/content/source-code.mdtext
    incubator/river/site/trunk/content/user-guide-basic-river-services.mdtext
    incubator/river/site/trunk/content/user-guide-glossary.mdtext
    incubator/river/site/trunk/content/user-guide-river-jar-artifacts.mdtext
    incubator/river/site/trunk/content/user-guide-socketfactories.mdtext
    incubator/river/site/trunk/content/using.mdtext

Modified: incubator/river/site/trunk/content/committers.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/committers.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/committers.mdtext (original)
+++ incubator/river/site/trunk/content/committers.mdtext Fri Nov  5 22:37:36 2010
@@ -1,6 +1,6 @@
 Title: Committers
 
-{excerpt:hidden=true}List of people with commit access to the Apache River repository{excerpt}
+
 
 The people listed below are the set of committers to the Apache River project. They have all made significant contributions over time to Jini technology and the Jini Community.
 

Modified: incubator/river/site/trunk/content/community.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/community.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/community.mdtext (original)
+++ incubator/river/site/trunk/content/community.mdtext Fri Nov  5 22:37:36 2010
@@ -1,5 +1,5 @@
 Title: Community
 
-{excerpt:hidden=true}River Community Links{excerpt}
+
 
 {children:all=true|excerpt=true}
\ No newline at end of file

Modified: incubator/river/site/trunk/content/development-top-link.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/development-top-link.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/development-top-link.mdtext (original)
+++ incubator/river/site/trunk/content/development-top-link.mdtext Fri Nov  5 22:37:36 2010
@@ -1,3 +1,3 @@
 Title: Development Top Link
 
-[Development] 
\ No newline at end of file
+[Development]
\ No newline at end of file

Modified: incubator/river/site/trunk/content/development.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/development.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/development.mdtext (original)
+++ incubator/river/site/trunk/content/development.mdtext Fri Nov  5 22:37:36 2010
@@ -1,7 +1,8 @@
 Title: Development
 
-{excerpt:hidden=true}River Development{excerpt}
+
 
 # Apache River Development
 
+
 {children:all=true|excerpt=true}
\ No newline at end of file

Modified: incubator/river/site/trunk/content/documentation.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/documentation.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/documentation.mdtext (original)
+++ incubator/river/site/trunk/content/documentation.mdtext Fri Nov  5 22:37:36 2010
@@ -1,9 +1,10 @@
 Title: Documentation
 
-{excerpt:hidden=true}Apache River Documentation{excerpt}
+
 
 # Apache River Documentation
 
+
 The original Jini documentation (including the formal specifications) can be found [here|http://incubator.apache.org/river/doc/index.html].  For more general help and information please see the list of topics below.
 
 ||Document ||Description |

Modified: incubator/river/site/trunk/content/downloads.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/downloads.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/downloads.mdtext (original)
+++ incubator/river/site/trunk/content/downloads.mdtext Fri Nov  5 22:37:36 2010
@@ -1,28 +1,33 @@
 Title: Downloads
 
-{excerpt:hidden=true}Downloads for the Apache River project{excerpt}
+
 
 # Apache River Downloads
 
+
 Use the links below to download Apache River releases from one of our mirrors. You should verify the integrity of the files using the signatures and checksums available from this page.
 
 Apache River releases are available under the [Apache License, Version 2.0|http://www.apache.org/licenses/LICENSE-2.0]. See the NOTICE.txt file contained in each release artifact for applicable copyright attribution notices.
 
 ## Apache River v2.1.2 (incubating)
 
+
 * Source code: [apache-river-2.1.2-incubating-src.zip|http://www.apache.org/dyn/closer.cgi/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip] ([PGP|http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.asc], [SHA1|http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.sha])
 * Binary: [apache-river-2.1.2-incubating-bin.zip|http://www.apache.org/dyn/closer.cgi/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip] ([PGP|http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.asc], [SHA1|http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.sha])
 
 ## Release Archive
 
+
 Only current, recommended releases are available on www.apache.org and the mirror sites. Older releases, when available, can be obtained from the [archive site|http://archive.apache.org/dist/incubator/river/].
 
 ## Nightly Snapshots
 
+
 Being worked on - none yet.
 
 ## PGP Signatures
 
+
 All of the release distribution packages have been digitally signed (using PGP or GPG) by the Apache Group members that constructed them. There will be an accompanying distribution.asc file in the same directory as the distribution. The PGP keys can be found in the MIT key repository (hkp://pgp.mit.edu), the OpenPGP Public Key repository (hkp://subkeys.pgp.net), and within this project's KEYS file, which is located within each download directory.
 
 Always use the signature files to verify the authenticity of the distribution, e.g.,

Modified: incubator/river/site/trunk/content/found-a-bug.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/found-a-bug.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/found-a-bug.mdtext (original)
+++ incubator/river/site/trunk/content/found-a-bug.mdtext Fri Nov  5 22:37:36 2010
@@ -1,9 +1,10 @@
 Title: Found a Bug
 
-{excerpt:hidden=true}How to report a bug you find in Apache River{excerpt}
+
 
 ## Found a Bug?
 
+
 If you think you've found a problem with Apache River you can search JIRA, our issue-tracking system, to see if the problem has already been noted (visit [JIRA|http://issues.apache.org/jira/browse/RIVER]). If the issue is not listed there, you can add a new JIRA issue describing it, please include detailed steps to reproduce the problem. Often it is best to raise an issue not yet listed in JIRA first on the River Developer mailing list (see [Mailing Lists]) before adding it directly in JIRA.
 
 If you have a fix for the issue, you can generate a patch file to send the fix to us. You need to check out the current source code from Subversion, make the necessary changes, and then do a full build. And, of course, confirm that the problem is actually fixed. Then, go to the base directory of your RIVER checkout, and run a command like {{svn diff > fix-for-my-bug.patch}} to generate a patch file.

Modified: incubator/river/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/index.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/index.mdtext (original)
+++ incubator/river/site/trunk/content/index.mdtext Fri Nov  5 22:37:36 2010
@@ -1,15 +1,23 @@
-Title: Apache River
+Title: Index
+
+## Welcome to Apache River 
 
-# Welcome to Apache River
 
 Welcome to Apache River, a project furthering the development and advancement of Jini technology.
 
 Jini is a service oriented architecture that defines a programming model which both exploits and extends Java technology to enable the construction of secure, distributed systems consisting of federations of services and clients. Jini technology can be used to build adaptive network systems that are scalable, evolvable and flexible as typically required in dynamic computing environments.
 
-Apache River is an effort undergoing incubation at [The Apache Software Foundation] (ASF), sponsored by the [Apache Incubator] PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+Apache River is an effort undergoing incubation at [The Apache Software Foundation|http://www.apache.org/] (ASF), sponsored by the [Apache Incubator|http://incubator.apache.org/] PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+## News
+
 
-# News
+{blog-posts:5} 
 
-TODO.
+## Resources
 
 
+ * Apache Incubator [Proposal for the River project | http://wiki.apache.org/incubator/RiverProposal]
+ * [Jini.org | http://www.jini.org]
+ * [Jini project area on Java.net | http://jini.dev.java.net]
+ * Jan Newmarch's [Guide to Jini Technologies | http://jan.newmarch.name/java/jini/tutorial/Jini.xml]
\ No newline at end of file

Modified: incubator/river/site/trunk/content/javadoc.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/javadoc.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/javadoc.mdtext (original)
+++ incubator/river/site/trunk/content/javadoc.mdtext Fri Nov  5 22:37:36 2010
@@ -2,5 +2,6 @@ Title: Javadoc
 
 # Apache River Javadoc
 
+
 The javadocs generated from the latest, unreleased version of River can be browsed at:
 [http://hudson.zones.apache.org/hudson/view/River/job/River-trunk/javadoc/]
\ No newline at end of file

Modified: incubator/river/site/trunk/content/license.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/license.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/license.mdtext (original)
+++ incubator/river/site/trunk/content/license.mdtext Fri Nov  5 22:37:36 2010
@@ -1,9 +1,10 @@
 Title: License
 
-{excerpt:hidden=true}River license: Apache License v2.0{excerpt}
+
 
 ## Apache License v2.0
 
+
 {noformat}
 
                              Apache License

Modified: incubator/river/site/trunk/content/mailing-lists.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/mailing-lists.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/mailing-lists.mdtext (original)
+++ incubator/river/site/trunk/content/mailing-lists.mdtext Fri Nov  5 22:37:36 2010
@@ -1,12 +1,13 @@
 Title: Mailing Lists
 
-# Project Mailing Lists
 
-These are the mailing lists that have been established for the Apache River project. For each list, there is a subscribe, unsubscribe, and an archive link.
 
-|Name|Subscribe|Unsubscribe|Post|Archive|
-|----|---------|-----------|----|-------|
-|River Developer List|[river-dev-subscribe](mailto:river-dev-subscribe@incubator.apache.org)|[river-dev-unsubscribe](mailto:river-dev-unsubscribe@incubator.apache.org)|[river-dev](mailto:river-dev@incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-river-dev/)|
-|River User List|[river-user-subscribe](mailto:river-user-subscribe@incubator.apache.org)|[river-user-unsubscribe](mailto:river-user-unsubscribe@incubator.apache.org)|[river-user](mailto:river-user@incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-river-user/)|
-|River Commits List|[river-commits-subscribe](mailto:river-commits-subscribe@incubator.apache.org)|[river-commits-unsubscribe](mailto:river-commits-unsubscribe@incubator.apache.org)|[river-commits](mailto:river-commits@incubator.apache.org)|[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-river-commits/)|
+## Project Mailing Lists
+
+
+These are the mailing lists that have been established for the Apache River project. For each list, there is a subscribe, unsubscribe, and an archive link.
 
+||Name||Subscribe||Unsubscribe||Post||Archive||
+|River Developer List|[river-dev-subscribe|mailto:river-dev-subscribe@incubator.apache.org]|[river-dev-unsubscribe|mailto:river-dev-unsubscribe@incubator.apache.org]|[river-dev|mailto:river-dev@incubator.apache.org]|[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/incubator-river-dev/]
+|River User List|[river-user-subscribe|mailto:river-user-subscribe@incubator.apache.org]|[river-user-unsubscribe|mailto:river-user-unsubscribe@incubator.apache.org]|[river-user|mailto:river-user@incubator.apache.org]|[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/incubator-river-user/]
+|River Commits List|[river-commits-subscribe|mailto:river-commits-subscribe@incubator.apache.org]|[river-commits-unsubscribe|mailto:river-commits-unsubscribe@incubator.apache.org]|[river-commits|mailto:river-commits@incubator.apache.org]|[mail-archives.apache.org|http://mail-archives.apache.org/mod_mbox/incubator-river-commits/]|
\ No newline at end of file

Modified: incubator/river/site/trunk/content/river-users.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/river-users.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/river-users.mdtext (original)
+++ incubator/river/site/trunk/content/river-users.mdtext Fri Nov  5 22:37:36 2010
@@ -2,4 +2,5 @@ Title: River Users
 
 # River Users
 
+
 The following a list companies and projects which successfully use River (or the original Jini code).
\ No newline at end of file

Modified: incubator/river/site/trunk/content/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/sidenav.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/sidenav.mdtext (original)
+++ incubator/river/site/trunk/content/sidenav.mdtext Fri Nov  5 22:37:36 2010
@@ -1,6 +1,7 @@
 Title: SideNav
 
-h3. [Community]
+### [Community]
+
 
 - [Get Involved]
 - [River Users]
@@ -11,7 +12,8 @@ h3. [Community]
 - [Committers]
 - [Found a Bug]?
 
-h3. [Development]
+### [Development]
+
 
 - [Javadoc]
 - [Source Code]
@@ -19,7 +21,8 @@ h3. [Development]
 - [Issue Tracker|https://issues.apache.org/jira/browse/RIVER]
 - [Wiki|http://wiki.apache.org/river/]
 
-h3. Search
+### Search
+
 
 {html}
 <DIV>

Modified: incubator/river/site/trunk/content/source-code.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/source-code.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/source-code.mdtext (original)
+++ incubator/river/site/trunk/content/source-code.mdtext Fri Nov  5 22:37:36 2010
@@ -2,12 +2,14 @@ Title: Source Code
 
 # River source code
 
+
 River uses [Subversion|http://subversion.tigris.org/] to manage its source code. Instructions on Subversion use can be found [here|http://svnbook.red-bean.com].
 
 The source code for the various deliverables of Apache River can be freely browsed at [http://svn.apache.org/viewvc/incubator/river/]. 
 
 ## Anonymous access
 
+
 The Apache River source can be checked out anonymously with this command (for the jtsk deliverable):
 
 {noformat}
@@ -16,6 +18,7 @@ svn checkout http://svn.apache.org/repos
 
 ## Access from behind a firewall
 
+
 For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via HTTPS:
 
 {noformat}
@@ -24,6 +27,7 @@ svn checkout https://svn.apache.org/repo
 
 ## Access through a proxy
 
+
 The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)
 
 There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.
@@ -38,6 +42,7 @@ http-proxy-port = 3128
 
 ## Submitting a Patch
 
+
 If you make changes to River, and would like to contribute the to the project, you should create a patch and post it to the [River JIRA issue tracker|http://issues.apache.org/jira/browse/RIVER]. To create a patch, simply execute the following command:
 
 {noformat}
@@ -48,6 +53,7 @@ If you've added new files, remember to "
 
 ## Developer Access
 
+
 Everyone can access the River Subversion repository via HTTPS, but River Committers must checkout the Subversion repository via HTTPS.
 
 {noformat}

Modified: incubator/river/site/trunk/content/user-guide-basic-river-services.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/user-guide-basic-river-services.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/user-guide-basic-river-services.mdtext (original)
+++ incubator/river/site/trunk/content/user-guide-basic-river-services.mdtext Fri Nov  5 22:37:36 2010
@@ -2,6 +2,7 @@ Title: User Guide - Basic River Services
 
 # Getting Started With River
 
+
 This document is going to explain how you can use the inbuilt "simple" services that come with River.  More specifically;
 
 # A Lookup Service (the "reggie" implementation)
@@ -13,6 +14,7 @@ The instructions assume that you're buil
 If you are going to use the latest release then you will still need to download (from the SVN trunk) some of the Windows BAT files mentioned below.  *nix sh scripts of those same batch files will appear shortly.
 
 ## Environment Setup
+
 The following instructions all assume that you have checked out River to some directory which is throughout referred to as {{$RIVER_HOME}}.  Further, you have changed directory into {{$RIVER_HOME/examples/hello}}.
 
 *IMPORTANT:* Run all scripts from the {{hello}} directory
@@ -20,6 +22,7 @@ The following instructions all assume th
 # Use Ant to build River; I.e. {{ant all.build}}
 
 ## Running Code Which Uses River Services
+
 Since River uses dynamic code downloading, we need to grant various permissions to our JVM to allow that.  In the interest of simplicity, we are going to grant everything every permission.  In the real world, this would obviously not be recommended.
 
 To grant these permissions we need to create a policy file:
@@ -47,36 +50,45 @@ System.setSecurityManager(new RMISecurit
 
 ## Starting the HTTP server
 
-h3. What?  Wait, why do I need to do that?
+
+### What?  Wait, why do I need to do that?
+
 When services get marshalled for sending over the wire, the first part of their stream is the codebase URL.  This URL tells the downloading JVM where to load the supporting JARs from.  Often (although not always) in the River/Jini world this code base harks back to some HTTP server.  There is a simple HTPP server packaged inside River which can be used for this.  That's what we're going to start.
 
 See [3.2 How codebase is used in Java RMI|http://download.oracle.com/javase/1.5.0/docs/guide/rmi/codebase.html] for more details.
 
-h3. Instructions
+### Instructions
+
 # Change to directory to {{$RIVER_HOME/examples/hello/}}
 # Execute the script; {{scripts/httpd.bat}}
 
-h3. Testing it
+### Testing it
+
 To test that the HTTP server is running correctly use wget or your web browser on the following URL
 
 - http://localhost:8080/reggie-dl.jar
 
 ## Starting a Service Registrar (Lookup Service)
 
-h3. What?  Wait, why do I need to do that?
+
+### What?  Wait, why do I need to do that?
+
 Typically, in an environment which uses River/Jini services, a Lookup Service will be used.  This Lookup Service is then used by your code to find River/Jini services.  Lookup Services always know the current state of the subnet or federated space.
 
 Broadly speaking (although not 100% accurately) you need a Lookup Service in order to be able to find other services to use.
 
 ## Instructions
 
+
 # Change directory to $RIVER_HOME/examples/hello
 # Execute the script {{scripts/jrmp-reggie.bat}}
 
-h3. Testing it
+### Testing it
+
 There are two ways to find our Lookup Service.  Remember that the interface which fulfills the role of a Lookup Service is {{ServiceRegistrar}}.
 
-h4. Unicast
+#### Unicast
+
 If we know where our Lookup Service is running, we can use unicast to connect straight to it.
 
 {code:title=Unicast|borderStyle=solid}
@@ -89,7 +101,8 @@ Assuming you don't get a {{NullPointerEx
 
 The {{LookupLocator}} takes a String representing a "jini URL".  This jini URL is made up from the Strings "{{jini://}}" a hostname and (optionally) "{{:}}" and a port number.  4160 is the default port and is specified in the Lookup Service configuration file.  The scripts in the {{examples/hello}} directory will use the default port unless you have changed it.  See [DJ.5.5 Address and Port Mappings for TCP and Multicast UDP|http://incubator.apache.org/river/doc/specs/html/discovery-spec.html] for more details.
 
-h4. Multicast
+#### Multicast
+
 If we know only that "some lookup services are on the subnet somewhere" then we can use multicast to find them.
 
 {code:title=Multicast|borderStyle=solid}
@@ -116,14 +129,18 @@ This approach can be modified if you kno
 
 ## Starting a Java Space
 
-h3. What?  Wait, why do I need to do that?
+
+### What?  Wait, why do I need to do that?
+
 Finding a Lookup Service is only useful if there are some other services on the network which you want to use, so now we're going to start a Java Space, and find that.  Using the Java Space is outside the scope of this document, although the "how" is relativily straight forward.
 
-h3. Instructions
+### Instructions
+
 # Change directory to $RIVER_HOME/examples/hello
 # Execute the script {{scripts/jrmp-outrigger-group.bat}}
 
-h3. Testing it
+### Testing it
+
 {code:title=Finding A Javaspace with a ServiceRegistrar|borderStyle=solid}
 ServiceTemplate template = new ServiceTemplate(null, new Class[] { JavaSpace.class }, new Entry[0]);
 
@@ -142,14 +159,18 @@ As before, a lack of {{NullPointerExcept
 
 ## Starting a Transaction Service
 
-h3. What?  Wait, why do I need to do that?
+
+### What?  Wait, why do I need to do that?
+
 Because you'd like to find something that will give you a nice distributed transaction.
 
-h3. Instructions
+### Instructions
+
 # Change directory to $RIVER_HOME/examples/hello
 # Execute the script {{scripts/jrmp-mahalo-group.bat}}
 
-h3. Testing it
+### Testing it
+
 Testing it is done in the same way as for the Java Space.  However, the constructor of the {{ServiceTemplate}} changes.
 
 {code:title=Transaction Manager ServiceTemplate|borderStyle=solid}

Modified: incubator/river/site/trunk/content/user-guide-glossary.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/user-guide-glossary.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/user-guide-glossary.mdtext (original)
+++ incubator/river/site/trunk/content/user-guide-glossary.mdtext Fri Nov  5 22:37:36 2010
@@ -2,6 +2,7 @@ Title: User Guide - Glossary
 
 # User Guide - Glossary
 
+
 ||Term ||Description| |
 |4160 | This is the default Jini port which Lookup Service use |
 |{anchor:lus}Lookup Service | A type of service which knows, at all times, what other services are available in the sub-net or in the federated space |

Modified: incubator/river/site/trunk/content/user-guide-river-jar-artifacts.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/user-guide-river-jar-artifacts.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/user-guide-river-jar-artifacts.mdtext (original)
+++ incubator/river/site/trunk/content/user-guide-river-jar-artifacts.mdtext Fri Nov  5 22:37:36 2010
@@ -2,6 +2,7 @@ Title: User Guide - River JAR Artifacts
 
 # Use Guide - River JAR Artifacts
 
+
 The following is an extract from Brian Murphy's [post|http://mail-archives.apache.org/mod_mbox/incubator-river-dev/201008.mbox/%3cAANLkTi=bfA5q-n_5f-ft1Pv+VKt2ZV2MUEbX2GN4+TTD@mail.gmail.com%3e] on the developer mailing list highlight some of the history behind the River/Jini JAR artifacts.
 
 {quote}For those who might be wondering about artifacts like jini-core.jar, jini-ext.jar, sun-util.jar, etc., although there have been previous postings discussing how they are no longer needed, it might help some of the new folks on the list to hear a repeat of the history of those artifacts; and why they should not be used, and why they should probably be removed from the build.

Modified: incubator/river/site/trunk/content/user-guide-socketfactories.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/user-guide-socketfactories.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/user-guide-socketfactories.mdtext (original)
+++ incubator/river/site/trunk/content/user-guide-socketfactories.mdtext Fri Nov  5 22:37:36 2010
@@ -2,4 +2,5 @@ Title: User Guide - SocketFactories
 
 # Using a SocketFactory with a TcpEndpoint
 
+
 The SocketFactory needs to be Serializable. Make sure the hashcode of the SocketFactory stays the same during de-serialization. Otherwise you end up with multiple connections, and a lot of threads on the serverside. This is caused by the use of the hashcode of the SocketFactory in the hashcode of the endpoint. When it is not stable, seemingly equal endpoints do not get interned as the same endpoint.
\ No newline at end of file

Modified: incubator/river/site/trunk/content/using.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/using.mdtext?rev=1031866&r1=1031865&r2=1031866&view=diff
==============================================================================
--- incubator/river/site/trunk/content/using.mdtext (original)
+++ incubator/river/site/trunk/content/using.mdtext Fri Nov  5 22:37:36 2010
@@ -1,7 +1,8 @@
 Title: Using
 
-{excerpt:hidden=true}Using River{excerpt}
+
 
 # Using Apache River
 
+
 {children:all=true|excerpt=true}
\ No newline at end of file