You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2015/04/06 07:53:59 UTC

svn commit: r1671485 [2/4] - in /jackrabbit/site/trunk: ./ src/site/markdown/ src/site/markdown/components/ src/site/markdown/concurrency-control/ src/site/markdown/deployment-models/ src/site/markdown/how-jackrabbit-works/ src/site/markdown/index-read...

Modified: jackrabbit/site/trunk/src/site/markdown/index-readers.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/index-readers.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/index-readers.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/index-readers.md Mon Apr  6 05:53:57 2015
@@ -1,24 +1,42 @@
-Title: Index readers
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Index readers
+=============
 Jackrabbit uses Lucene as the underlying index implementation and provides
 several extensions and customizations that help improve performance in an
 environment where changes to the index are frequent. The extensions also
 cover features that are not supported by Lucene, like hierarchical queries.
 
-{center}!index-readers-per-segment.jpg!{center}
+![Per Index Segment](index-readers/index-readers-per-segment.jpg)
 
-<a name="Indexreaders-CachingIndexReader"></a>
-## CachingIndexReader
 
-The CachingIndexReader is at the very bottom of the index reader stack in
+CachingIndexReader
+------------------
+The `CachingIndexReader` is at the very bottom of the index reader stack in
 Jackrabbit. It's main purpose is to cache the parent relationship of a
 node. Each node is represented with a document in the index and one of the
-fields is _:PARENT. The value of this field is the string representation of
+fields is `_:PARENT`. The value of this field is the string representation of
 the parent nodes UUID. In case of the root node the the parent field
 contains an empty string as its value. Several queries in Jackrabbit are
 hierarchical and check whether a node is a descendant of another node. For
 the very simple case, where one needs to know if a node is the child of
 another node, we can just look up both nodes (lucene documents) in the
-index and compare the parent field on one node with the _:UUID field of the
+index and compare the parent field on one node with the `_:UUID` field of the
 other. If they match the one is the child of the other node. When it comes
 to evaluating a descendant axis, this becomes much more expensive and will
 cause lots of document lookups in lucene. By caching the parent child
@@ -37,12 +55,12 @@ of the parent node. When a UUIDDocId is
 reader, which allows it to get the document number for the UUID and cache
 it for later reuse.
 
-<a name="Indexreaders-OverwritingDocId"></a>
-## Overwriting DocId
 
+Overwriting DocId
+-----------------
 It may happen that a PlainDocId is present in the cache of a
-CachingIndexReader but must be considered invalid in the context of a call.
-CachingIndexReader.getParent() may be called from a ReadOnlyIndexReader
+`CachingIndexReader` but must be considered invalid in the context of a call.
+`CachingIndexReader.getParent()` may be called from a ReadOnlyIndexReader
 instance which has the target of the PlainDocId in the set of deleted
 document. This indicates that the nodes has been deleted or modified. Thus
 it has traveled to another index segment. In this case the PlainDocId is
@@ -50,9 +68,9 @@ overwritten with a UUIDDocId. The opposi
 never overwritten with a PlainDocId because when a document is added to an
 index a new CachingIndexReader is created.
 
-<a name="Indexreaders-SharedIndexReader"></a>
-## SharedIndexReader
 
+SharedIndexReader
+-----------------
 The SharedIndexReader wraps a CachingIndexReader and adds a reference count
 facility. A SharedIndexReader is kept open for the entire lifetime of a
 PersistentIndex. Even if documents are marked deleted in the underlying
@@ -65,9 +83,9 @@ indexes while a query still operates on
 reference counts, closing the SharedIndexReader is delayed until all
 clients are finished with the  SharedIndexReader.
 
-<a name="Indexreaders-ReadOnlyIndexReader"></a>
-## ReadOnlyIndexReader
 
+ReadOnlyIndexReader
+-------------------
 The inconsistency introduced by the SharedIndexReader (considers deleted
 documents as still valid) is corrected by the ReadOnlyIndexReader. Whenever
 a new instance of this reader is created it copies the currently marked
@@ -75,9 +93,9 @@ deleted documents from the CommittableIn
 methods that attempt delete documents will throw a
 UnsupportedOperationException.
 
-<a name="Indexreaders-CommittableIndexReader"></a>
-## CommittableIndexReader
 
+CommittableIndexReader
+----------------------
 This is the index reader where documents are marked deleted in a
 PersistentIndex. As with the SharedIndexReader the CommittableIndexReader
 is kept open for the entire lifetime of the PersistentIndex. To achieve
@@ -86,23 +104,24 @@ forces the underlying native lucene inde
 committing changes whithout closing the index reader is otherwise not
 possible using the plain lucene index reader.
 
-<a name="Indexreaders-Combiningtheindexsegments"></a>
-## Combining the index segments
 
-{center}!index-readers-per-query-handler.jpg!{center}
+Combining the index segments
+----------------------------
+
+![Per Query Handler](index-readers/index-readers-per-query-handler.jpg)
 
-<a name="Indexreaders-CachingMultiIndexReader"></a>
-## CachingMultiIndexReader
 
+CachingMultiIndexReader
+-----------------------
 The index for the content of a workspace consists of multiple segments,
 that is multiple ReadOnlyIndexReaders. They are combined in a MultiIndex
 using a CachingMultiIndexReader. In order to speed up lookups by UUID the
 CachingMultiIndexReader also has a DocNumberCache. This cache uses a LRU
-algorithm to keep a limitted amount of UUID to document number mappings.
+algorithm to keep a limited amount of UUID to document number mappings.
 
-<a name="Indexreaders-CombinedIndexReader"></a>
-## CombinedIndexReader
 
+CombinedIndexReader
+-------------------
 This index reader is similar to the CachingMultiIndexReader, in fact both
 implement MultiIndexReader and HierarchyResolver. A CombinedIndexReader is
 created when a query needs an index reader that spans both the workspace

Added: jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-query-handler.jpg
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-query-handler.jpg?rev=1671485&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-query-handler.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-segment.jpg
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-segment.jpg?rev=1671485&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-segment.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: jackrabbit/site/trunk/src/site/markdown/issue-tracker.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/issue-tracker.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/issue-tracker.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/issue-tracker.md Mon Apr  6 05:53:57 2015
@@ -1,15 +1,32 @@
-Title: Issue Tracker
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Issue Tracker
+=============
 Apache Jackrabbit uses Jira for tracking bug reports and requests for
 improvements, new features, and other changes.
 
 The issue tracker is available at https://issues.apache.org/jira/browse/JCR
 and is readable by everyone. A Jira account is needed to create new issues
 and to comment on existing issues. Use the [registration form](https://issues.apache.org/jira/secure/Signup!default.jspa)
- to request an account if you do not already have one.
-
-<a name="IssueTracker-Issueworkflow"></a>
-## Issue workflow
+to request an account if you do not already have one.
 
+Issue workflow
+--------------
 When an issue is created, it's in the *Open* state. This is the time for
 describing the issue and discussing possible ways of solving it. If a
 proposed patch is attached, then the issue can optionally be moved to the
@@ -26,8 +43,8 @@ can be *Reopened* if the committed fix i
 When an issue is resolved as fixed, the committer should set the "Fix
 Version(s)" field to the next trunk version to mark that the change will be
 included in that release. If the fix is also backported to one or more of
-the maintenance branches (for backporting, use "svn merge -c _revision_
-^/jackrabbit/trunk" in the root of the branch) the version numbers of the
+the maintenance branches (for backporting, use `svn merge -c _revision_
+^/jackrabbit/trunk` in the root of the branch) the version numbers of the
 relevant next maintenance releases should also be included in the "Fix
 Version(s)" field.
 
@@ -37,59 +54,35 @@ be reopened (since the release can obvio
 Potential regressions or other related problems should be tracked in
 separate followup issues.
 
-<a name="IssueTracker-Issuecontents"></a>
-## Issue contents
 
+Issue contents
+--------------
 See below for guidelines on how to use the various fields in an issue.
 
-<a name="IssueTracker-Issuetype"></a>
 ### Issue type
-
 When creating a new issue, select the issue type based as follows:
 
-     <table>
-     <tr><th> Issue type	  </th><th> Description </th></tr>
-     <tr><td>  *Bug*	  </td><td>  Bug reports are used for cases where Jackrabbit fails
-     not function as it should (as defined by the JCR specification or some
-     other documentation). If you are not certain whether the issue you've found
-     is actually a bug, please ask the Jackrabbit [mailing lists](mailing-lists.html)
-      first for help. </td></tr>
-     <tr><td>  *New Feature*  </td><td>  Use a feature request when Jackrabbit does not have
-     some functionality you need. </td></tr>
-     <tr><td>  *Improvement*  </td><td>  Use an improvement request to suggest improvements to
-     existing features. Typical improvement requests are about updating
-     documentation, increasing stability and performance, simplifying the
-     implementation, or other such changes that make Jackrabbit better without
-     introducing new features or fixing existing bugs. </td></tr>
-     <tr><td>  *Test*	  </td><td>  Use this type when contributing test cases for
-     existing features. Normally test cases should be contributed as a part of
-     the original feature request or as regression tests associated with bug
-     reports, but sometimes you just want to extend test coverage by introducing
-     new test cases. This issue type is for such cases. </td></tr>
-     <tr><td>  *Task*	  </td><td>  Used only for issues related to project
-     infrastructure. </td></tr>
-     </table>
+| Issue type    | Description  |
+|---------------|--------------|
+| *Bug*         | Bug reports are used for cases where Jackrabbit fails not function as it should (as defined by the JCR specification or some other documentation). If you are not certain whether the issue you've found is actually a bug, please ask the Jackrabbit [mailing lists](mailing-lists.html) first for help.
+| *New Feature* | Use a feature request when Jackrabbit does not have some functionality you need.
+| *Improvement* | Use an improvement request to suggest improvements to existing features. Typical improvement requests are about updating documentation, increasing stability and performance, simplifying the implementation, or other such changes that make Jackrabbit better without introducing new features or fixing existing bugs. 
+| *Test*        | Use this type when contributing test cases for existing features. Normally test cases should be contributed as a part of the original feature request or as regression tests associated with bug reports, but sometimes you just want to extend test coverage by introducing new test cases. This issue type is for such cases. 
+| *Task*        | Used only for issues related to project infrastructure. 
 
-<a name="IssueTracker-Issuesummary,environmentanddescription"></a>
 ### Issue summary, environment and description
-
 The issue summary should be a short and clear statement that indicates the
 scope of the issue. You are probably being too verbose if you exceed the
 length of the text field. Use the Environment and Description fields to
 provide more detailed information.
 
-<a name="IssueTracker-Issuepriority"></a>
 ### Issue priority
-
 Issue priority should be set according to the following:
 
-     <table>
-     <tr><th> Issue priority </th><th> Description </td></tr>
-     <tr><td>  *Blocker*	  </td><td>  Legal or other fundamental issue that makes it
-     impossible to release Jackrabbit code </td></tr>
-     <tr><td>  *Critical*	  </td><td>  Major loss of functionality that affects many
-     Jackrabbit users </td></tr>
-     <tr><td>  *Major*	  </td><td>  Important issue that should be resolved soon </td></tr>
-     <tr><td>  *Minor*	  </td><td>  Nice to have issues </td></tr>
-     <tr><td>  *Trivial*	  </td><td>  Trivial changes that can be applied whenever someone
-     has extra time </td></tr>
+| Issue priority  | Description
+|-----------------|------------------------
+| *Blocker*	  | Legal or other fundamental issue that makes it impossible to release Jackrabbit code
+| *Critical*	  | Major loss of functionality that affects many Jackrabbit users
+| *Major*	  | Important issue that should be resolved soon
+| *Minor*	  | Nice to have issues
+| *Trivial*	  | Trivial changes that can be applied whenever someone has extra time

Modified: jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md Mon Apr  6 05:53:57 2015
@@ -1,4 +1,22 @@
-Title: Jackrabbit Architecture
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Jackrabbit Architecture
+=======================
 * [How Jackrabbit works](how-jackrabbit-works.html)
 * [Repository lifecycle](repository-lifecycle.html)
 * [Search implementation](search-implementation.html)
@@ -9,11 +27,10 @@ The general architecture of Jackrabbit c
 Content Application Layer, an API Layer and a Content Repository
 Implementation Layer.
 
-!overview.png!
-
-<a name="JackrabbitArchitecture-ContentApplications"></a>
-## Content Applications
+![Jackrabbit Architecture Overview](jackrabbit-architecture/overview.png)
 
+Content Applications
+--------------------
 Content Applications interact through the JSR-170 API with the Content
 Repository Implementation. There are numerous applications that are
 available for JSR-170 repositories, some of them are very generic (like a
@@ -48,12 +65,13 @@ range from a "DVD Collection Management"
 "Workflow and BPM" but also possibly complete next generation "Enterprise
 Resource Planning Systems".
 
-<a name="JackrabbitArchitecture-ContentRepositoryAPI"></a>
-## Content Repository API
 
+Content Repository API
+----------------------
 The Content Repository API Layer is split into two major sections.
 
 * The Content Repository API defined by JSR-170
+
 * A number features of a content repository, that have been removed from
 the JSR-170 specification since they are difficult to implement on existing
 non-java-based content repositories and administrational Repository tasks
@@ -65,9 +83,9 @@ use of the non-JSR-170 APIs provided by
 The boxes in the architecture chart do not symbolize package names or class
 names directly but mostly semantically grouped blocks of functionality.
 
-<a name="JackrabbitArchitecture-ContentRepositoryImplementation"></a>
-## Content Repository Implementation
 
+Content Repository Implementation
+---------------------------------
 The content Repository Implementation portion of the architecture chart
 reflects the major building blocks of the jackrabbit content repository
 implementation.

Modified: jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md Mon Apr  6 05:53:57 2015
@@ -1,58 +1,77 @@
-Title: Jackrabbit Configuration
-{toc:minLevel=2}
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Jackrabbit Configuration
+========================
 
 Apache Jackrabbit needs two pieces of information to set up a runtime
 content repository instance:
 
-* *Repository home directory* The filesystem path of the directory
-containing the content repository accessed by the runtime instance of
-Jackrabbit. This directory usually contains all the repository content,
-search indexes, internal configuration, and other persistent information
-managed within the content repository. Note that this is not absolutely
-required and some persistence managers and other Jackrabbit components may
-well be configured to access files and even other resources (like remote
-databases) outside the repository home directory. A designated repository
-home directory is however always needed even if some components choose to
-not use it. Jackrabbit will automatically fill in the repository home
-directory with all the required files and subdirectories when the
-repository is first instantiated.
-
-* *Repository configuration file* The filesystem path of the repository
-configuration XML file. This file specifies the class names and properties
-of the various Jackrabbit components used to manage and access the content
-repository. Jackrabbit parses this configuration file and instantiates the
-specified components when the runtime content repository instance is
-created.
+* **Repository home directory**   
+    The filesystem path of the directory
+    containing the content repository accessed by the runtime instance of
+    Jackrabbit. This directory usually contains all the repository content,
+    search indexes, internal configuration, and other persistent information
+    managed within the content repository. Note that this is not absolutely
+    required and some persistence managers and other Jackrabbit components may
+    well be configured to access files and even other resources (like remote
+    databases) outside the repository home directory. A designated repository
+    home directory is however always needed even if some components choose to
+    not use it. Jackrabbit will automatically fill in the repository home
+    directory with all the required files and subdirectories when the
+    repository is first instantiated.
+
+* **Repository configuration file**   
+    The filesystem path of the repository
+    configuration XML file. This file specifies the class names and properties
+    of the various Jackrabbit components used to manage and access the content
+    repository. Jackrabbit parses this configuration file and instantiates the
+    specified components when the runtime content repository instance is
+    created.
 
 These two configuration parameters are passed either directly to Jackrabbit
 when creating a repository instance or indirectly through settings for a
 JNDI object factory or some other component management system.
 
-For each workspace that was created, there will also be a workspace.xml
+For each workspace that was created, there will also be a `workspace.xml`
 file created inside the workspace home directory that will be used for the
 workspace - these files have to be changed, too, because the
 workspace-specific configuration inside repository.xml is only used as a
-template for new workspaces, ie. if you use the *createWorkspace()*
-method of the Jackrabbit API, the workspace.xml is just a copy of the [Workspace](#workspace-configuration.html)
- element inside repository.xml. You can also manually create the workspace
+template for new workspaces, ie. if you use the `createWorkspace()`
+method of the Jackrabbit API, the `workspace.xml` is just a copy of the [Workspace](#workspace-configuration)
+element inside `repository.xml`. You can also manually create the workspace
 folder with a workspace.xml file to create a new workspace yourself (Please
-note that depending on the [persistence manager|#Persistence configuration]
- you will also have to setup a database and configure the access to it).
+note that depending on the [persistence manager](#persistence-configuration)
+you will also have to setup a database and configure the access to it).
 
-<a name="JackrabbitConfiguration-Repositoryconfiguration"></a>
-## Repository configuration
 
-The repository configuration file, typically called *repository.xml*,
+Repository configuration
+------------------------
+The repository configuration file, typically called `repository.xml`,
 specifies global options like security, versioning and clustering settings.
 A default workspace configuration template is also included in the
 repository configuration file. The exact format of this XML configuration
 file is defined in the following document type definition (DTD) files
 published by the Apache Jackrabbit project.
 
-   * [-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN](http://jackrabbit.apache.org/dtd/repository-1.5.dtd)
-   * [-//The Apache Software Foundation//DTD Jackrabbit 1.4//EN](http://jackrabbit.apache.org/dtd/repository-1.4.dtd)
-   * [-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN](http://jackrabbit.apache.org/dtd/repository-1.2.dtd)
-   * [-//The Apache Software Foundation//DTD Jackrabbit 1.0//EN](http://jackrabbit.apache.org/dtd/repository-1.0.dtd)
+* [-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN](http://jackrabbit.apache.org/dtd/repository-1.5.dtd)
+* [-//The Apache Software Foundation//DTD Jackrabbit 1.4//EN](http://jackrabbit.apache.org/dtd/repository-1.4.dtd)
+* [-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN](http://jackrabbit.apache.org/dtd/repository-1.2.dtd)
+* [-//The Apache Software Foundation//DTD Jackrabbit 1.0//EN](http://jackrabbit.apache.org/dtd/repository-1.0.dtd)
 
 All Jackrabbit 1.x versions are fully backwards compatible, so you can use
 a recent Jackrabbit version without having to modify your existing
@@ -61,11 +80,10 @@ changes if you want to enable new featur
 in Jackrabbit 1.4.
 
 The top-level structure of the repository configuration file is shown
-below. The *<!DOCTYPE>* declaration is optional, but if you include it
+below. The `<!DOCTYPE>` declaration is optional, but if you include it
 Jackrabbit 1.5 will use XML validation to make sure that the configuration
 file is correctly formatted.
 
-
     <!DOCTYPE Repository
     	  PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
     	  "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
@@ -75,225 +93,198 @@ file is correctly formatted.
       <Workspaces .../>
       <Workspace .../>
       <Versioning .../>
-      <SearchIndex .../>	<!-- optional -->
-      <Cluster .../>	<!-- optional, available since 1.2 -->
-      <DataStore .../>	<!-- optional, available since 1.4 -->
+      <SearchIndex .../>  <!-- optional -->
+      <Cluster .../>	  <!-- optional, available since 1.2 -->
+      <DataStore .../>	  <!-- optional, available since 1.4 -->
     </Repository>
 
 
 Starting with Jackrabbit 1.5, the order of the configuration elements below
-*<Repository/>* is now fixed.
+`<Repository/>` is now fixed.
 
 The repository configuration elements are:
 
-   * {{[FileSystem](#file-system-configuration.html) }}: The virtual file system used by the repository to store things like
-registered namespaces and node types.
-   * {{[Security](#security-configuration.html) }}: Authentication and authorization configuration.
-   * {{[Workspaces](#workspace-configuration.html) }}: Configuration on where and how workspaces are managed.
-   * {{[Workspace](#workspace-configuration.html) }}: Default workspace configuration template.
-   * {{[Versioning](#versioning-configuration.html) }}:  Configuration of the repository-wide version store.
-   * {{[SearchIndex](#search-configuration.html) }}: Configuration of the search index that covers the repository-wide `/jcr:system` content tree. 
-   * {{[Cluster](#cluster-configuration.html) }}: Clustering configuration.
-   * {{[DataStore](#data-store-configuration.html) }}: Data store configuration.
+* [FileSystem](#file-system-configuration): The virtual file system used by the repository to store things like registered namespaces and node types.
+* [Security](#security-configuration): Authentication and authorization configuration.
+* [Workspaces](#workspace-configuration): Configuration on where and how workspaces are managed.
+* [Workspace](#workspace-configuration): Default workspace configuration template.
+* [Versioning](#versioning-configuration):  Configuration of the repository-wide version store.
+* [SearchIndex](#search-configuration): Configuration of the search index that covers the repository-wide `/jcr:system` content tree. 
+* [Cluster](#cluster-configuration): Clustering configuration.
+* [DataStore](#data-store-configuration): Data store configuration.
 
 See the Jackrabbit 1.5 [default configuration](^repository.xml.html) , for an example repository configuration file.
 
-{tip}
-It is a good idea to place the *repository.xml* file _inside_ the
-repository home directory. This keeps your repository and its configuration
-nicely contained within a single directory tree.
-{tip} 
+> It is a good idea to place the `repository.xml` file _inside_ the
+> repository home directory. This keeps your repository and its configuration
+> nicely contained within a single directory tree.
 
-<a name="JackrabbitConfiguration-Beanconfigurationelements"></a>
 ### Bean configuration elements
-
 Most of the entries in the configuration file are based on the following
 generic JavaBean configuration pattern. Such configuration specifies that
 the repository should use an instance of the specified class with the
 specified properties for the named functionality.
 
-
     <ConfigurationElement class="fully.qualified.ClassName">
       <param name="property1" value="...">
       <param name="property2" value="...">
     <ConfigurationElement>
 
 
-<a name="JackrabbitConfiguration-Configurationvariables"></a>
 ### Configuration variables
-
-Jackrabbit supports configuration variables of the form _$\{name\}_. These
+Jackrabbit supports configuration variables of the form `${name}`. These
 variables can be used to avoid hardcoding specific options in the
 configuration files. The following variables are available in all
 Jackrabbit versions:
 
-* *$\{rep.home\}:* Repository home directory.
-* *$\{wsp.name\}:* Workspace name. Only available in workspace
-configuration.
-* *$\{wsp.home\}:* Workspace home directory. Only available in workspace
-configuration.
+* `${rep.home}`: Repository home directory.
+* `${wsp.name}`: Workspace name. Only available in workspace configuration.
+* `${wsp.home}`: Workspace home directory. Only available in workspace configuration.
 
-Since Jackrabbit 1.4 (see [JCR-1304](https://issues.apache.org/jira/browse/JCR-1304)
-) it has been possible to use system properties or any application-specific
+Since Jackrabbit 1.4 (see [JCR-1304](https://issues.apache.org/jira/browse/JCR-1304)) 
+it has been possible to use system properties or any application-specific
 settings as configuration variables.
 
-<a name="JackrabbitConfiguration-Securityconfiguration"></a>
-## Security configuration
-
+<a name="security-configuration"></a>
+Security configuration
+-----------------------
 The security configuration element is used to specify authentication and
 authorization settings for the repository. The structure of the security
 configuration element is:
 
-
     <Security appName="Jackrabbit">
-      <SecurityManager .../> <!-- optional, available since 1.5 -->
+      <SecurityManager .../>     <!-- optional, available since 1.5 -->
       <AccessManager .../>	 <!-- mandatory until 1.4, optional since 1.5 -->
       <LoginModule .../>	 <!-- optional -->
     </Security>
 
 
 By default Jackrabbit uses the [Java Authentication and Authorization Service](http://java.sun.com/j2se/1.4.2/docs/guide/security/jaas/JAASRefGuide.html)
- (JAAS) to authenticate users who try to access the repository. The
-*appName* parameter in the *<Security/>* element is used as the JAAS
+(JAAS) to authenticate users who try to access the repository. The
+`appName` parameter in the `<Security/>` element is used as the JAAS
 application name of the repository.
 
 If JAAS authentication is not available or (as is often the case) too
 complex to set up, Jackrabbit allows you to specify a repository-specific
 JAAS [LoginModule](http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/spi/LoginModule.html)
- that is then used for authenticating repository users. The default [SimpleLoginModule|http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/security/SimpleLoginModule.html]
- class included in Jackrabbit implements a trivially simple authentication
+that is then used for authenticating repository users. The default [SimpleLoginModule](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/security/SimpleLoginModule.html)
+class included in Jackrabbit implements a trivially simple authentication
 mechanism that accepts any username and any password as valid
 authentication credentials.
 
 Once a user has been authenticated, Jackrabbit will use the configured [AccessManager](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/security/AccessManager.html)
- to control what parts of the repository content the user is allowed to
+to control what parts of the repository content the user is allowed to
 access and modify. The default [SimpleAccessManager|http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/security/SimpleAccessManager.html]
- class included in Jackrabbit implements a trivially simple authorization
+class included in Jackrabbit implements a trivially simple authorization
 mechanism that grants full read access to all users and write access to
 everyone except anonymous users.
 
 The slightly more advanced [SimpleJBossAccessManager](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.html)
- class was added in Jackrabbit 1.3 (see [JCR-650|https://issues.apache.org/jira/browse/JCR-650]
-). This class is designed for use with the [JBoss Application Server|http://www.jboss.org/jbossas/]
-, where it maps JBoss roles to Jackrabbit permissions.
-
-<a name="JackrabbitConfiguration-Workspaceconfiguration"></a>
-## Workspace configuration
-
+class was added in Jackrabbit 1.3 (see [JCR-650](https://issues.apache.org/jira/browse/JCR-650)). 
+This class is designed for use with the [JBoss Application Server](http://www.jboss.org/jbossas/), 
+where it maps JBoss roles to Jackrabbit permissions.
+
+<a name="workspace-configuration"></a>
+Workspace configuration
+-----------------------
 A Jackrabbit repository contains one or more workspaces that are each
-configured in a separate *workspace.xml* configuration file. The
-*Workspaces* element of the repository configuration specifies where and
+configured in a separate `workspace.xml` configuration file. The
+`Workspaces` element of the repository configuration specifies where and
 how the workspaces are managed. The repository configuration also contains
 a default workspace configuration template that is used to create the
-*workspace.xml* file of a new workspace unless more specific
+`workspace.xml` file of a new workspace unless more specific
 configuration is given when the workspace is created. See the
-*createWorkspace* methods in the [JackrabbitWorkspace](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/api/JackrabbitWorkspace.html)
- interface for more details on workspace creating workspaces.
+`createWorkspace` methods in the [JackrabbitWorkspace](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/api/JackrabbitWorkspace.html)
+interface for more details on workspace creating workspaces.
 
 The workspace settings in the repository configuration file are:
 
-
     <Workspaces rootPath="${rep.home}/workspaces"
-    	    defaultWorkspace="default"
-    	    configRootPath="..."  <!-- optional -->
-    	    maxIdleTime="..."/>   <!-- optional -->
-    
+        defaultWorkspace="default"
+        configRootPath="..."  <!-- optional -->
+        maxIdleTime="..."/>   <!-- optional -->
     <Workspace .../>   <!-- default workspace configuration template -->
 
+The following global workspace configuration options are specified in the `Workspaces` element:
 
-The following global workspace configuration options are specified in the
-*Workspaces* element:
-
-   * *rootPath*: The native file system directory for workspaces. A
-subdirectory is automatically created for each workspace, and the path of
-that subdirectory can be used in the workspace configuration as the
-*$\{wsp.path\} *variable.
-   * *defaultWorkspace*: Name of the default workspace. This workspace is
-automatically created when the repository is first started.
-   * *configRootPath*: By default the configuration of each workspace is
-stored in a *workspace.xml* file within the workspace directory within
-the *rootPath* directory. If this option is specified, then the workspace
-configuration files are stored within the specified path in the virtual
-file system (see above) configured for the repository.
-   * *maxIdleTime*: By default Jackrabbit only releases resources
-associated with an opened workspace when the entire repository is closed.
-This option, if specified, sets the maximum number of seconds that a
-workspace can remain unused before the workspace is automatically closed.
+* `rootPath`:   
+    The native file system directory for workspaces. A
+    subdirectory is automatically created for each workspace, and the path of
+    that subdirectory can be used in the workspace configuration as the `${wsp.path}` variable.
+* `defaultWorkspace`:   
+    Name of the default workspace. This workspace is
+    automatically created when the repository is first started.
+* `configRootPath`:   
+    By default the configuration of each workspace is
+    stored in a *workspace.xml* file within the workspace directory within
+    the `rootPath` directory. If this option is specified, then the workspace
+    configuration files are stored within the specified path in the virtual
+    file system (see above) configured for the repository.
+* `maxIdleTime`:   
+    By default Jackrabbit only releases resources
+    associated with an opened workspace when the entire repository is closed.
+    This option, if specified, sets the maximum number of seconds that a
+    workspace can remain unused before the workspace is automatically closed.
 
 The workspace configuration template and all *workspace.xml*
 configuration files have the following structure:
 
-
     <Workspace name="${wsp.name}">
-      <FileSystem .../>
-      <PersistenceManager .../>
-      <SearchIndex .../>	      <!-- optional -->
-      <ISMLocking .../>	      <!-- optional, available since 1.4 -->
+        <FileSystem .../>
+        <PersistenceManager .../>
+        <SearchIndex .../>	      <!-- optional -->
+        <ISMLocking .../>	      <!-- optional, available since 1.4 -->
     </Workspace>
 
 
 The workspace configuration elements are:
 
-   * {{[FileSystem](#file-system-configuration.html)
-}}: The virtual file system passed to the persistence manager and search
-index.
-   * {{[PersistenceManager](#persistence-configuration.html)
-}}: Persistence configuration for workspace content.
-   * {{[SearchIndex](#search-configuration.html)
-}}: Configuration of the workspace search index.
-   * {{[ISMLocking](#item-state-locking-configuration.html)
-}}: Locking configuration for concurrent access to workspace content.
-
-{note}
-To modify the configuration of an existing workspace, you need to change
-the *workspace.xml* file of that workspace. Changing the *<Workspace/>*
-element in the repository configuration file will not affect existing
-workspaces.
-{note}
-
-<a name="JackrabbitConfiguration-Versioningconfiguration"></a>
-## Versioning configuration
-
+* [FileSystem](#file-system-configuration): The virtual file system passed to the persistence manager and search index.
+* [PersistenceManager](#persistence-configuration): Persistence configuration for workspace content.
+* [SearchIndex](#search-configuration): Configuration of the workspace search index.
+* [ISMLocking](#item-state-locking-configuration): Locking configuration for concurrent access to workspace content.
+
+> To modify the configuration of an existing workspace, you need to change
+> the `workspace.xml` file of that workspace. Changing the `<Workspace/>`
+> element in the repository configuration file will not affect existing
+> workspaces.
+
+<a name="versioning-configuration"></a>
+Versioning configuration
+------------------------
 The version histories of all versionable nodes are stored in a
-repository-wide version store configured in the *Versioning* element of
+repository-wide version store configured in the `Versioning` element of
 the repository configuration. The versioning configuration is much like
 workspace configuration as they are both used by Jackrabbit for storing
 content. The main difference between versioning and workspace configuration
 is that no search index is specified for the version store as version
 histories are indexed and searched using the repository-wide search index.
-Another difference is that there are no *$\{wsp.name\} *or
-*$\{wsp.path\} *variables for the versioning configuration. Instead the
-native file system path of the version store is explicitly specified in the
-configuration.
+Another difference is that there are no `${wsp.name}` or `${wsp.path}` 
+variables for the versioning configuration. Instead the native file system 
+path of the version store is explicitly specified in the configuration.
 
 The structure of the versioning configuration is:
 
-
     <Versioning rootPath="${rep.home}/version">
       <FileSystem .../>
       <PersistenceManager .../>
       <ISMLocking .../>	      <!-- optional, available since 1.4 -->
     </Versioning>
 
-
 The versioning configuration elements are:
 
-   * {{[FileSystem](#file-system-configuration.html)
-}}: The virtual file system passed to the persistence manager.
-   * {{[PersistenceManager](#persistence-configuration.html)
-}}: Persistence configuration for the version store.
-   * {{[ISMLocking](#item-state-locking-configuration.html)
-}}: Locking configuration for concurrent access to workspace content.
-
-<a name="JackrabbitConfiguration-Searchconfiguration"></a>
-## Search configuration
-
-See the [Search](http://wiki.apache.org/jackrabbit/Search)
- page on the Jackrabbit wiki.
-
-<a name="JackrabbitConfiguration-Persistenceconfiguration"></a>
-## Persistence configuration
-
+* [FileSystem](#file-system-configuration): The virtual file system passed to the persistence manager.
+* [PersistenceManager](#persistence-configuration): Persistence configuration for the version store.
+* [ISMLocking](#item-state-locking-configuration): Locking configuration for concurrent access to workspace content.
+
+<a name="search-configuration"></a>
+Search configuration
+--------------------
+See the [Search](http://wiki.apache.org/jackrabbit/Search) page on the Jackrabbit wiki.
+
+<a name="persistence-configuration"></a>
+Persistence configuration
+-------------------------
 The Persistence Manager is one of the most important parts of the
 configuration, because it actually takes care of storing the nodes and
 properties. There are various very different implementations, but most of
@@ -304,69 +295,64 @@ to allow creation of tables, because the
 depends on the workspace name (see the individual PM's javadoc for more
 information).
 
-For large binary properties there is the option to use the {{[DataStore](#data-store-configuration.html)
-}} instead of the Persistence Manager.
+For large binary properties there is the option to use the [DataStore](#data-store-configuration) 
+instead of the Persistence Manager.
 
 For more detailed information and an overview of available PMs, see the [PersistenceManagerFAQ](http://wiki.apache.org/jackrabbit/PersistenceManagerFAQ)
- page on the Jackrabbit wiki.
-
-{note}
-If you use a database persistence manager, the configured database
-connection *must not* be under the control of an external transaction
-manager. Jackrabbit implements distributed XA transaction support on a
-higher level, and expects to be in full control of the underlying database
-connection.
-{note}
-
-<a name="JackrabbitConfiguration-Filesystemconfiguration"></a>
-## File system configuration
+page on the Jackrabbit wiki.
 
+> If you use a database persistence manager, the configured database
+> connection *must not* be under the control of an external transaction
+> manager. Jackrabbit implements distributed XA transaction support on a
+> higher level, and expects to be in full control of the underlying database
+>connection.
+
+<a name="filesystem-configuration"></a>
+File system configuration
+-------------------------
 Early versions on Jackrabbit were designed to abstract their persistence
 mechanism using a virtual file system layer defined in the [FileSystem](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/FileSystem.html)
- interface. This low-level approach didn't work that well in practice, and
+interface. This low-level approach didn't work that well in practice, and
 so most of the persistence abstraction is now handled in a higher level.
 However, certain parts of Jackrabbit still use this file system
 abstraction.
 
-A virtual file system is configured in a *<FileSystem/>* bean
-configuration element. See the main file system implementations [LocalFileSystem](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/local/LocalFileSystem.html)
-, [DatabaseFileSystem|http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.html]
- (including subclasses), and [MemoryFileSystem|http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.html]
- for the available options. The recommended alternative is to use the
-LocalFileSystem implementation that simply maps abstract file system
+A virtual file system is configured in a `<FileSystem/>` bean
+configuration element. See the main file system implementations 
+[LocalFileSystem](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/local/LocalFileSystem.html), 
+[DatabaseFileSystem](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.html) (including subclasses), 
+and [MemoryFileSystem](http://jackrabbit.apache.org/api/1.5/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.html)
+for the available options. The recommended alternative is to use the
+`LocalFileSystem` implementation that simply maps abstract file system
 accesses to the specified directory within the native file system.
 
-<a name="JackrabbitConfiguration-Clusterconfiguration"></a>
-## Cluster configuration
-
-See the [Clustering](http://wiki.apache.org/jackrabbit/Clustering)
- page on the Jackrabbit wiki.
-
-<a name="JackrabbitConfiguration-Datastoreconfiguration"></a>
-## Data store configuration
-
-See the [DataStore](http://wiki.apache.org/jackrabbit/DataStore)
- page on the Jackrabbit wiki.
-
-<a name="JackrabbitConfiguration-Itemstatelockingconfiguration"></a>
-## Item state locking configuration
-
+<a name="cluster-configuration"></a>
+Cluster configuration
+---------------------
+See the [Clustering](http://wiki.apache.org/jackrabbit/Clustering) page on the Jackrabbit wiki.
+
+<a name="datastore-configuration"></a>
+Data store configuration
+------------------------
+See the [DataStore](http://wiki.apache.org/jackrabbit/DataStore) page on the Jackrabbit wiki.
+
+<a name="itemstatelocking-configuration"></a>
+Item state locking configuration
+--------------------------------
 TODO
 
-<a name="JackrabbitConfiguration-Passwordsinconfiguration(asofJackrabbit2.3)"></a>
-## Passwords in configuration (as of Jackrabbit 2.3)
-
+Passwords in configuration (as of Jackrabbit 2.3)
+-------------------------------------------------
 When using a database-backed persistence manager or another component, you
 usually need to include the database password in Jackrabbit configuration.
 If you don't want to store such passwords in plain text inside the
 configuration file, you can encode the password in base64 and prefix it
-with "\{base64}". Jackrabbit will automatically decode such a password
+with `{base64}`. Jackrabbit will automatically decode such a password
 before passing it to the underlying database.
 
 As an example, the following two password configuration parameters are
 equivalent ("dGVzdA==" is the base64 encoding of "test"):
 
-
     <param name="password" value="test"/>
     <param name="password" value="{base64}dGVzdA=="/>
 

Modified: jackrabbit/site/trunk/src/site/markdown/jackrabbit-roadmap.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jackrabbit-roadmap.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-roadmap.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-roadmap.md Mon Apr  6 05:53:57 2015
@@ -1,16 +1,33 @@
-Title: Jackrabbit Roadmap
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Jackrabbit Roadmap
+==================
 This is a roadmap of future Apache Jackrabbit releases and features. See [the dev@ list](mailing-lists.html)
- for the latest status.
+for the latest status.
 
-<a name="JackrabbitRoadmap-Unstable/stablereleasemodel"></a>
-## Unstable/stable release model
 
+Unstable/stable release model
+-----------------------------
 Starting with Jackrabbit 2.3 we are adopting a "Linux-style"
 unstable/stable release model with odd/even minor version numbers used to
 mark the status of a release.
 
-* [Jackrabbit 2.3 (trunk)](https://svn.apache.org/repos/asf/jackrabbit/trunk/)
- ([download|Downloads#v23])
+* [Jackrabbit 2.3 (trunk)](https://svn.apache.org/repos/asf/jackrabbit/trunk/) ([download](downloads.html#v23))
 
 Unstable 2.3.x releases will be cut fairly frequently directly from
 Jackrabbit trunk, and a stable 2.4 release branch will be created later on.
@@ -20,34 +37,30 @@ of 2011.
 Once the 2.4 branch has been created, trunk will switch to 2.5.x and
 continue progressing towards 2.6, etc.
 
-<a name="JackrabbitRoadmap-Maintenancebranches"></a>
-## Maintenance branches
 
+Maintenance branches
+--------------------
 We currently support the following maintenance branches:
 
-* [Jackrabbit 2.2](https://svn.apache.org/repos/asf/jackrabbit/branches/2.2/)
- ([download|Downloads#v22])
-* [Jackrabbit 2.1](https://svn.apache.org/repos/asf/jackrabbit/branches/2.1/)
- ([download|Downloads#v21])
-* [Jackrabbit 2.0](https://svn.apache.org/repos/asf/jackrabbit/branches/2.0/)
- ([download|Downloads#v20])
+* [Jackrabbit 2.2](https://svn.apache.org/repos/asf/jackrabbit/branches/2.2/) ([download](downloads.html#v22))
+* [Jackrabbit 2.1](https://svn.apache.org/repos/asf/jackrabbit/branches/2.1/) ([download](downloads.html#v21))
+* [Jackrabbit 2.0](https://svn.apache.org/repos/asf/jackrabbit/branches/2.0/) ([download](downloads.html#v20))
 
-<a name="JackrabbitRoadmap-Endoflife"></a>
-## End of life
 
+End of life
+-----------
 The Jackrabbit 1.6 maintenance branch has reached its end of life status.
 No more patch releases will be cut from the 1.6 branch, and the latest
 1.6.5 release will be archived in December 2011.
 
-* [Jackrabbit 1.6](https://svn.apache.org/repos/asf/jackrabbit/branches/1.6/)
- ([download|Downloads#v16])
+* [Jackrabbit 1.6](https://svn.apache.org/repos/asf/jackrabbit/branches/1.6/) ([download](downloads.html#v16))
 
 There is currently no schedule for declaring the end of life of any of the
 stable 2.x maintenance branches.
 
-<a name="JackrabbitRoadmap-Prototypingthefuture"></a>
-## Prototyping the future
 
+Prototyping the future
+----------------------
 The ongoing microkernel work in the Jackrabbit sandbox is being used to
 prototype a possible next generation architecture for a future major new
 Jackrabbit release.

Modified: jackrabbit/site/trunk/src/site/markdown/jackrabbit-team.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jackrabbit-team.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-team.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-team.md Mon Apr  6 05:53:57 2015
@@ -1,443 +1,432 @@
-Title: Jackrabbit Team
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Jackrabbit Team
+===============
 Apache Jackrabbit is the result of ongoing collaboration and contributions
 of a number of people. Everyone is welcome to contribute and all
 contributions are greatly appreciated.
 
 The Jackrabbit project follows the [meritocratic principles](http://www.apache.org/foundation/how-it-works.html#meritocracy)
- and [role-based organization|http://www.apache.org/foundation/how-it-works.html#roles]
- of the Apache Software Foundation.
+and [role-based organization](http://www.apache.org/foundation/how-it-works.html#roles)
+of the Apache Software Foundation.
+
+
+Jackrabbit committers
+---------------------
+| Id              | Name | Organization |
+|-----------------|------|--------------|
+| alexkli         | Alexander Klimetschek  |  [Adobe](http://www.adobe.com/)  |
+| alexparvulescu  | Alex Parvulescu  |  [Adobe](http://www.adobe.com/)  |
+| amitj           | Amit Jain  |  [Adobe](http://www.adobe.com/)  |
+| angela          | Angela Schreiber  |  [Adobe](http://www.adobe.com/)  |
+| ard             | Ard Schrijvers  |  [Hippo](http://www.hippo.nl/)  |
+| baedke          | Manfred Baedke  | &nbsp; |
+| cdamioli        | C&eacute;dric Damioli  |  [Ametys](http://www.ametys.org/)  |
+| chetanm         | Chetan Mehrotra  |  [Adobe](http://www.adobe.com/)  |
+| chregu          | Christian Stocker  | &nbsp; |
+| ckiehl          | [Christoph Kiehl](mailto:christoph@sulu3000.de)  | &nbsp; |
+| ckoell          | [Claus K&ouml;ll](mailto:c.koell@gmail.com) |  [DVT-Daten-Verarbeitung-Tirol GmbH](http://www.dvt.at/)  |
+| clombart        | Christophe Lombart  | &nbsp; |
+| davide          | Davide Giannella  |  [Adobe](http://www.adobe.com/)  |
+| dbrosius        | David Brosius  | &nbsp; |
+| dpfister        | Dominique Pfister  |  [Adobe](http://www.adobe.com/)  |
+| draier          | Thomas Draier  | &nbsp; |
+| eaf             | Esteban Franqueiro  |  [BEA](http://www.bea.com/)  |
+| edgarpoce       | [Edgar Poce](mailto:edgarpoce@gmail.com)  | &nbsp; |
+| fielding        | Roy T. Fielding  |  [Adobe](http://www.adobe.com/)  |
+| fmeschbe        | Felix Meschberger  |  [Adobe](http://www.adobe.com/)  |
+| halderen        | Berry van Halderen  | &nbsp; |
+| jukka           | [Jukka Zitting](mailto:jukka.zitting@gmail.com) |  [Adobe](http://www.adobe.com/)  |
+| justin          | Justin Edelson  |  [Adobe](http://www.adobe.com/)  |
+| martijnh        | Martijn Hendriks  |  [GX](http://www.gx.nl/)  |
+| mduerig         | Michael D&uuml;rig  |  [Adobe](http://www.adobe.com/)  |
+| meteatamel      | Mete Atamel  |  [Adobe](http://www.adobe.com/)  |
+| mreutegg        | Marcel Reutegger  |  [Adobe](http://www.adobe.com/)  |
+| ppakulski       | Przemo Pakulski  |  [Cognifide](http://www.cognifide.com/)  |
+| ppiegaze        | Peeter Piegaze  |  [Adobe](http://www.adobe.com/)  |
+| pmarx           | Philipp Marx  |  [Adobe](http://www.adobe.com/)  |
+| reschke         | [Julian Reschke](mailto:julian.reschke@greenbytes.de) |  [greenbytes GmbH](http://greenbytes.de/)  |
+| rhauch          | Randall Hauch  | &nbsp; |
+| schans          | Bart van der Schans  |  [Hippo](http://www.hippo.nl/)  |
+| sebastien       | S&eacute;bastien Launay  |  [Anyware Technologies](http://www.anyware-tech.com/)  |
+| shuber          | Serge Huber  | &nbsp; |
+| stefan          | Stefan Guggisberg  |  [Adobe](http://www.adobe.com/)  |
+| sylvain         | Sylvain Wallez  | &nbsp; |
+| thomasm         | Thomas Mueller  |  [Adobe](http://www.adobe.com/)  |
+| tommaso         | Tommaso Teofili  |  [Adobe](http://www.adobe.com/)  |
+| tripod          | Tobias Bocanegra  |  [Adobe](http://www.adobe.com/)  |
+| uncled          | David Nuescheler  |  [Adobe](http://www.adobe.com/)  |
+| unico           | Unico Hommes  | &nbsp; |
+
+
+Emeritus members
+----------------
+| Id         | Name | Organization |
+|------------|------|--------------|
+| asavory   |  Andrew Savory  | &nbsp; |
+| bcm       |  [Brian Moseley](mailto:bcm@osafoundation.org)  |  Open Source Applications Foundation (OSAF)  |
+| gianugo   |  Gianugo Rabellino  | &nbsp; |
+| prussell  |  Paul Russell  | &nbsp; |
+| stefano   |  Stefano Mazzocchi  | &nbsp; |
+| treilly   |  Tim Reilly  | &nbsp; |
+
+
 
-<a name="JackrabbitTeam-Jackrabbitcommitters"></a>
-## Jackrabbit committers
+Jackrabbit contributors
+-----------------------
+The following additional people have contributed to this project through the way of suggestions, patches or documentation.
 
-<table>
-<tr><th> Id </th><th> Name </th><th> Organization </th></tr>
-<tr><td> alexkli </td><td> Alexander Klimetschek </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> alexparvulescu </td><td> Alex Parvulescu </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> angela </td><td> Angela Schreiber </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> ard </td><td> Ard Schrijvers </td><td> [Hippo](http://www.hippo.nl/)
- </td></tr>
-<tr><td> ckiehl </td><td> [Christoph Kiehl](mailto:christoph@sulu3000.de.html)
- </td><td> </td></tr>
-<tr><td> ckoell </td><td> [Claus Köll](mailto:c.koell@gmail.com.html)
- </td><td> [DVT-Daten-Verarbeitung-Tirol GmbH</td><td>http://www.dvt.at/]
- </td></tr>
-<tr><td> clombart </td><td> Christophe Lombart </td><td> </td></tr>
-<tr><td> dpfister </td><td> Dominique Pfister </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> eaf </td><td> Esteban Franqueiro </td><td> [BEA](http://www.bea.com/)
- </td></tr>
-<tr><td> edgarpoce </td><td> [Edgar Poce](mailto:edgarpoce@gmail.com.html)
- </td><td> </td></tr>
-<tr><td> fielding </td><td> Roy T. Fielding </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> fmeschbe </td><td> Felix Meschberger </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> jukka </td><td> [Jukka Zitting](mailto:jukka.zitting@gmail.com.html)
- </td><td> [Adobe</td><td>http://www.day.com/]
- </td></tr>
-<tr><td> justin </td><td> Justin Edelson </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> martijnh </td><td> Martijn Hendriks </td><td> [GX](http://www.gx.nl/)
- </td></tr>
-<tr><td> mduerig </td><td> Michael Dürig </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> mreutegg </td><td> Marcel Reutegger </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> ppakulski </td><td> Przemo Pakulski </td><td> [Cognifide](http://www.cognifide.com/)
- </td></tr>
-<tr><td> ppiegaze </td><td> Peeter Piegaze </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> reschke </td><td> [Julian Reschke](mailto:julian.reschke@greenbytes.de.html)
- </td><td> [greenbytes GmbH</td><td>http://greenbytes.de/]
- </td></tr>
-<tr><td> schans </td><td> Bart van der Schans </td><td> [Hippo](http://www.hippo.nl/)
- </td></tr>
-<tr><td> sebastien </td><td> Sébastien Launay </td><td> [Anyware Technologies](http://www.anyware-tech.com/)
- </td></tr>
-<tr><td> shuber </td><td> Serge Huber </td><td> </td></tr>
-<tr><td> stefan </td><td> Stefan Guggisberg </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> sylvain </td><td> Sylvain Wallez </td><td> </td></tr>
-<tr><td> thomasm </td><td> Thomas Mueller </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> tripod </td><td> Tobias Bocanegra </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-<tr><td> uncled </td><td> David Nuescheler </td><td> [Adobe](http://www.day.com/)
- </td></tr>
-</table>
-
-
-<a name="JackrabbitTeam-Emeritusmembers"></a>
-## Emeritus members
-
-<table>
-<tr><th> Id </th><th> Name </th><th> Organization </th></tr>
-<tr><td> asavory </td><td> Andrew Savory </td><td> </td></tr>
-<tr><td> bcm </td><td> [Brian Moseley](mailto:bcm@osafoundation.org.html)
- </td><td> Open Source Applications Foundation (OSAF) </td></tr>
-<tr><td> gianugo </td><td> Gianugo Rabellino </td><td> </td></tr>
-<tr><td> prussell </td><td> Paul Russell </td><td> </td></tr>
-<tr><td> stefano </td><td> Stefano Mazzocchi </td><td> </td></tr>
-<tr><td> treilly </td><td> Tim Reilly </td><td> </td></tr>
-</table>
-
-
-<a name="JackrabbitTeam-Jackrabbitcontributors"></a>
-## Jackrabbit contributors
-
-The following additional people have contributed to this project through
-the way of suggestions, patches or documentation.
-
-{section}
-{column:width=25%}
-Adam Hope
-Adam Warski
-Aidan O'Loan
-Akil Ajani
-Alan Cabrera
-Al Caponi
-Alessandro Bologna
-Alessandro Cosenza
-Alexander Nesterov
-Alexander T
-Alexandre Costa Martins
-Alexandru Popescu
-Alex Lukin
-Alvaro Gonzalez
-Andreas Julius
-André Bierwolf
-Andrew Perepelytsya
-Andrey Grebnev
-Andries Demont
-Andrzej Dengusiak
-Andy Key
-Angela Cymbalak
-Anthony Ogier
-Antonio Carballo
-Arthur Meyer
-Asaf Amit
-Ate Douma
-Attila Király
-Azfar Kazmi
-Balasubramanian
-Bart van der Schans
-Benjamin Bentmann
-Berry van Halderen
-Bertrand Delacretaz
-Bertrand Lega
-Bob Wieler
-Boni Gopalan
-Borja Parés
-Brennan Spies
-Brett Porter
-Brian Ewins
-Brian Whipple
-Carlos Sanchez
-Carsten Ziegeler
-Cédric Chantepie
-Cédric Damioli
-Celina Konito
-Chandan Kumar
-Charles Brooking
-Chen Shaopeng
-Chris Meadows
-Chris Schmidt
-Christian
-Christian Schröder
-Christian Zanata
-Chris Wilkes
-Chris Wilson
-Costin Leau
-Cristian Grozea
-Dan Connelly
-Dan Diephouse
-Daniel Bloomfield Ramagem
-Daniel Naber
-Danilo Barboza
-Darren Hartford
-Davanum Srinivas
-Dave Brosius
-David Boden
-David Brown
-David B Victor
-David Garcia
-David Izatt
-David J. M. Karlsen
-David Johnson
-David Kennedy
-David McKitterick
-David Moss
-David Pitfield
-David Rauschenbach
-Denis Linine
-Dietmar Gräbner
-Dirk Feufel
-Dmitry Sapunov
-Doug Douglass
-Douglas Jose
-Duncan McIntyre
-Ed Burnette
-{column}
-{column:width=25%}
-Eduardo Andrade
-Eduardo Burgos
-Edyta Kalka
-Elangodi Kalaimani
-Eric Norman
-Eric Wout van der Steen
-Ernest Evans
-Eugene Porubaev
-Fabrice Duermael
-Fabrizio Giustina
-Felix Knecht
-Felix Röthenbacher
-Filippo Fratoni
-Florent Guillaume
-Francois Masurel
-Frank Karlstrøm
-Frank van Lankvelt
-Frederic Laugier
-Gavin Carothers
-Giota Karadimitriou
-Glaucio Scheibel
-Greg Klebus
-Greg Schueler
-Grégory Joseph
-Guido Jäkel
-Guillaume Bort
-Günther Humer
-Hector Rovira
-Hemanta Gupta
-Henryk Paluch
-Hitesh Shah
-Honwai Wong
-Iaacov Rosenberg
-Ian Boston
-Igor Vaynberg
-Jacco van Weert
-Jaka Jaksic
-Jakub Wozniakowski
-James Abley
-James Hang
-James McCarthy
-Jan Haderka
-Jan Halasa
-Jan Kuzniak
-Janne Jalkanen
-Jan Peter Stotz
-Jarle B. Hjortland
-Jason Gritman
-Jason Thrasher
-Jason Wagggoner
-Jeremi Joslin
-Jim Cross
-John Brodeur
-John Eaton
-Jonathan Nolen
-Jorge Rodríguez Pedrianes
-Joseph Chen
-Joseph Toth
-Joshua Levy
-Jozef Wagner
-Juan Jose Vazquez Delgado
-Julian Klein
-Julian Sedding
-Julio Castillo
-Ken Yue
-Kurz Wolfgang
-Lalitha Gopalakrishnan
-Lance Zechinato
-Lars Trieloff
-Leila Rizkallah
-Leslie H. Watter
-Lóránt Pintér
-Lucas Galfaso
-Lydia Balazs
-Magnus Grimsell
-Manfred Baedke
-Manuel Duran
-Marcel May
-Marcin Cenkier
-Marcin Muras
-Marcus Kaar
-Marius Ropotica
-Mark Moales
-Mark Slater
-Markus Joschko
-Mark Waschkowski
-Martin Koci
-{column}
-{column:width=25%}
-Martin Perez
-Martin Schreiber
-Martin van den Bemt
-Martin Zdila
-Masanobu Horiyama
-Massimiliano Cuccia
-Matej Knopp
-Melissa Stopponi
-M.Fatih Ozceylan
-Micah Whitacre
-Michael Aemisegger
-Michael Bletzinger
-Michael Daglian
-Michael Eppelheimer
-Michael Frericks
-Michael Korat
-Michael Marth
-Michael Mittag
-Michael Neale
-Michael Singer
-Michael Wechner
-Michael Young
-Michal Borowiecki
-Michele Meomartino
-Miguel Angel Jiménez Sampedro
-Mike Bowler
-Mike Pfaff
-Mike Roberts
-Mikolaj Rydzewski
-Miro Walker
-Moritz Rebbert
-Moshe Immerman
-Murray Armfield
-Naresh Gangapur
-Nicholas DiPiazza
-Nicholas Stuart
-Nicolas Belisle
-Nicolas Jouanin
-Nicolas Pombourcq
-Nicolas Toper
-Nimesh Muley
-Noah Vihinen
-Norbert Braeker
-Norman Sheriff
-Oleg Alexeyev
-Oleg Gusakov
-Oliver Kießler
-Oliver Lietz
-Oliver Zeigermann
-Olivier Dony
-Pablo Rios
-Paco Avila
-Padraic Hannon
-Pankaj Gupta
-Patrick Haggood
-Paul Bloch
-Paul Dennis
-Paul Gribben
-Paul Mietz Egli
-Pavel Hudyak
-Pete Kirkham
-Peter Darton
-Peter Dettman
-Philip Borlin
-Philip Cher
-Philippe Marschall
-Philipp Koch
-Philipp Salzgeber
-Piotr Przybylak
-Prakash Reddy
-Rafał Kwiecień
-Raffaele Sena
-Ragy Eleish
-Rajesh Upadhyay
-Rama Krishna
-Randy Simon
-Raphael Franchet
-Raphael Jean
-Raphael Wegmueller
-Ravindra Ramarao
-Richa Khurana
-Richard Osbaldeston
-Robert Burrell Donkin
-{column}
-{column:width=25%}
-Roberto Fonti
-Robert Sauer
-Rob Evans
-Rob Owen
-Rod MacKenzie
-Roland Kofler
-Roman Puchkovskiy
-Ross Black
-Roy Russo
-Ruchi Goel
-Rüdiger Groß-Hardt
-Ruslan Romanov
-Ruslan Spivak
-Ryan Vanderwerf
-Samba Siva Rao Kolusu
-Sandeep Warikoo
-Sandrine Raffalli
-Sandro Boehme
-Santosh Gadkari
-Sascha Sadat-Guscheh
-Savvas Triantafyllou
-Scott Cytacki
-Sean Radford
-Sebastian Gomez
-Sebastian Prehn
-Sebastian Redl
-Sébastien Deleuze
-Sébastien Migniot
-Serge Slipchenko
-Sergey Nebolsin
-Shaun Barriball
-Shinichi Tanaka
-Shrirang
-Simon Brunner
-Simon Kent
-Sivakumar Kalyanaraman
-Sridhar Raman
-Stefan Ivanov
-Stefan Rinner
-Sten Roger Sandvik
-Stephane Landelle
-Stephen More
-Steve Neo
-Sudhan Kanade
-Sven Rieckhoff
-Szymon Kuzniak
-Tako Schotanus
-Tanju Erinmez
-Ted Leung
-Thierry Lach
-Thierry Levieux
-Thierry Yge
-Thilo Goetz
-Thomas Fromm
-Thomas Scheffler
-Thomas Weber
-Tim Reilly
-Timur Evdokimov
-Tom Duffey
-Tomek Dabrowski
-Tomoharu Fujita
-Topi Westerholm
-Torgeir Veimo
-Torsten Schlabach
-Torsten Weck
-Trang Nguyen
-Tyson Norris
-Vadim L. Ivanov
-Vijai Kalyan
-Vincent Giguère
-Vinzenz Wyser
-Vladimir Bayanov
-Wade Girard
-Walter Raboch
-Wes Smoak
-William Louth
-Wolf Benz
-Xavier Coulon
-Xiaohua Lu
-Yoav Landman
-Yusuke Fujisawa
-Zhou Wu
-{column}
-{section}
+Adam Hope<br/>
+Adam Warski<br/>
+Aidan O'Loan<br/>
+Akil Ajani<br/>
+Alan Cabrera<br/>
+Al Caponi<br/>
+Alessandro Bologna<br/>
+Alessandro Cosenza<br/>
+Alexander Nesterov<br/>
+Alexander T<br/>
+Alexandre Costa Martins<br/>
+Alexandru Popescu<br/>
+Alex Lukin<br/>
+Alvaro Gonzalez<br/>
+Andreas Julius<br/>
+Andr&eacute; Bierwolf<br/>
+Andrew Perepelytsya<br/>
+Andrey Grebnev<br/>
+Andries Demont<br/>
+Andrzej Dengusiak<br/>
+Andy Key<br/>
+Angela Cymbalak<br/>
+Anthony Ogier<br/>
+Antonio Carballo<br/>
+Arthur Meyer<br/>
+Asaf Amit<br/>
+Ate Douma<br/>
+Attila Kir&aacute;ly<br/>
+Azfar Kazmi<br/>
+Balasubramanian<br/>
+Bart van der Schans<br/>
+Benjamin Bentmann<br/>
+Berry van Halderen<br/>
+Bertrand Delacretaz<br/>
+Bertrand Lega<br/>
+Bob Wieler<br/>
+Boni Gopalan<br/>
+Borja Par&eacute;s<br/>
+Brennan Spies<br/>
+Brett Porter<br/>
+Brian Ewins<br/>
+Brian Whipple<br/>
+Carlos Sanchez<br/>
+Carsten Ziegeler<br/>
+C&eacute;dric Chantepie<br/>
+C&eacute;dric Damioli<br/>
+Celina Konito<br/>
+Chandan Kumar<br/>
+Charles Brooking<br/>
+Chen Shaopeng<br/>
+Chris Meadows<br/>
+Chris Schmidt<br/>
+Christian<br/>
+Christian Schr&ouml;der<br/>
+Christian Zanata<br/>
+Chris Wilkes<br/>
+Chris Wilson<br/>
+Costin Leau<br/>
+Cristian Grozea<br/>
+Dan Connelly<br/>
+Dan Diephouse<br/>
+Daniel Bloomfield Ramagem<br/>
+Daniel Naber<br/>
+Danilo Barboza<br/>
+Darren Hartford<br/>
+Davanum Srinivas<br/>
+Dave Brosius<br/>
+David Boden<br/>
+David Brown<br/>
+David B Victor<br/>
+David Garcia<br/>
+David Izatt<br/>
+David J. M. Karlsen<br/>
+David Johnson<br/>
+David Kennedy<br/>
+David McKitterick<br/>
+David Moss<br/>
+David Pitfield<br/>
+David Rauschenbach<br/>
+Denis Linine<br/>
+Dietmar Gr&auml;bner<br/>
+Dirk Feufel<br/>
+Dmitry Sapunov<br/>
+Doug Douglass<br/>
+Douglas Jose<br/>
+Duncan McIntyre<br/>
+Ed Burnette<br/>
+Eduardo Andrade<br/>
+Eduardo Burgos<br/>
+Edyta Kalka<br/>
+Elangodi Kalaimani<br/>
+Eric Norman<br/>
+Eric Wout van der Steen<br/>
+Ernest Evans<br/>
+Eugene Porubaev<br/>
+Fabrice Duermael<br/>
+Fabrizio Giustina<br/>
+Felix Knecht<br/>
+Felix R&ouml;thenbacher<br/>
+Filippo Fratoni<br/>
+Florent Guillaume<br/>
+Francois Masurel<br/>
+Frank Karlstr&oslash;m<br/>
+Frank van Lankvelt<br/>
+Frederic Laugier<br/>
+Gavin Carothers<br/>
+Giota Karadimitriou<br/>
+Glaucio Scheibel<br/>
+Greg Klebus<br/>
+Greg Schueler<br/>
+Gr&eacute;gory Joseph<br/>
+Guido J&auml;kel<br/>
+Guillaume Bort<br/>
+G&uuml;nther Humer<br/>
+Hector Rovira<br/>
+Hemanta Gupta<br/>
+Henryk Paluch<br/>
+Hitesh Shah<br/>
+Honwai Wong<br/>
+Iaacov Rosenberg<br/>
+Ian Boston<br/>
+Igor Vaynberg<br/>
+Jacco van Weert<br/>
+Jaka Jaksic<br/>
+Jakub Wozniakowski<br/>
+James Abley<br/>
+James Hang<br/>
+James McCarthy<br/>
+Jan Haderka<br/>
+Jan Halasa<br/>
+Jan Kuzniak<br/>
+Janne Jalkanen<br/>
+Jan Peter Stotz<br/>
+Jarle B. Hjortland<br/>
+Jason Gritman<br/>
+Jason Thrasher<br/>
+Jason Wagggoner<br/>
+Jeremi Joslin<br/>
+Jim Cross<br/>
+John Brodeur<br/>
+John Eaton<br/>
+Jonathan Nolen<br/>
+Jorge Rodr&iacute;guez Pedrianes<br/>
+Joseph Chen<br/>
+Joseph Toth<br/>
+Joshua Levy<br/>
+Jozef Wagner<br/>
+Juan Jose Vazquez Delgado<br/>
+Julian Klein<br/>
+Julian Sedding<br/>
+Julio Castillo<br/>
+Ken Yue<br/>
+Kurz Wolfgang<br/>
+Lalitha Gopalakrishnan<br/>
+Lance Zechinato<br/>
+Lars Trieloff<br/>
+Leila Rizkallah<br/>
+Leslie H. Watter<br/>
+L&oacute;r&aacute;nt Pint&eacute;r<br/>
+Lucas Galfaso<br/>
+Lydia Balazs<br/>
+Magnus Grimsell<br/>
+Manfred Baedke<br/>
+Manuel Duran<br/>
+Marcel May<br/>
+Marcin Cenkier<br/>
+Marcin Muras<br/>
+Marcus Kaar<br/>
+Marius Ropotica<br/>
+Mark Moales<br/>
+Mark Slater<br/>
+Markus Joschko<br/>
+Mark Waschkowski<br/>
+Martin Koci<br/>
+Martin Perez<br/>
+Martin Schreiber<br/>
+Martin van den Bemt<br/>
+Martin Zdila<br/>
+Masanobu Horiyama<br/>
+Massimiliano Cuccia<br/>
+Matej Knopp<br/>
+Melissa Stopponi<br/>
+M.Fatih Ozceylan<br/>
+Micah Whitacre<br/>
+Michael Aemisegger<br/>
+Michael Bletzinger<br/>
+Michael Daglian<br/>
+Michael Eppelheimer<br/>
+Michael Frericks<br/>
+Michael Korat<br/>
+Michael Marth<br/>
+Michael Mittag<br/>
+Michael Neale<br/>
+Michael Singer<br/>
+Michael Wechner<br/>
+Michael Young<br/>
+Michal Borowiecki<br/>
+Michele Meomartino<br/>
+Miguel Angel Jim&eacute;nez Sampedro<br/>
+Mike Bowler<br/>
+Mike Pfaff<br/>
+Mike Roberts<br/>
+Mikolaj Rydzewski<br/>
+Miro Walker<br/>
+Moritz Rebbert<br/>
+Moshe Immerman<br/>
+Murray Armfield<br/>
+Naresh Gangapur<br/>
+Nicholas DiPiazza<br/>
+Nicholas Stuart<br/>
+Nicolas Belisle<br/>
+Nicolas Jouanin<br/>
+Nicolas Pombourcq<br/>
+Nicolas Toper<br/>
+Nimesh Muley<br/>
+Noah Vihinen<br/>
+Norbert Braeker<br/>
+Norman Sheriff<br/>
+Oleg Alexeyev<br/>
+Oleg Gusakov<br/>
+Oliver Kie&szlig;ler<br/>
+Oliver Lietz<br/>
+Oliver Zeigermann<br/>
+Olivier Dony<br/>
+Pablo Rios<br/>
+Paco Avila<br/>
+Padraic Hannon<br/>
+Pankaj Gupta<br/>
+Patrick Haggood<br/>
+Paul Bloch<br/>
+Paul Dennis<br/>
+Paul Gribben<br/>
+Paul Mietz Egli<br/>
+Pavel Hudyak<br/>
+Pete Kirkham<br/>
+Peter Darton<br/>
+Peter Dettman<br/>
+Philip Borlin<br/>
+Philip Cher<br/>
+Philippe Marschall<br/>
+Philipp Koch<br/>
+Philipp Salzgeber<br/>
+Piotr Przybylak<br/>
+Prakash Reddy<br/>
+Rafał Kwiecień<br/>
+Raffaele Sena<br/>
+Ragy Eleish<br/>
+Rajesh Upadhyay<br/>
+Rama Krishna<br/>
+Randy Simon<br/>
+Raphael Franchet<br/>
+Raphael Jean<br/>
+Raphael Wegmueller<br/>
+Ravindra Ramarao<br/>
+Richa Khurana<br/>
+Richard Osbaldeston<br/>
+Robert Burrell Donkin<br/>
+Roberto Fonti<br/>
+Robert Sauer<br/>
+Rob Evans<br/>
+Rob Owen<br/>
+Rod MacKenzie<br/>
+Roland Kofler<br/>
+Roman Puchkovskiy<br/>
+Ross Black<br/>
+Roy Russo<br/>
+Ruchi Goel<br/>
+R&uuml;diger Gro&szlig;-Hardt<br/>
+Ruslan Romanov<br/>
+Ruslan Spivak<br/>
+Ryan Vanderwerf<br/>
+Samba Siva Rao Kolusu<br/>
+Sandeep Warikoo<br/>
+Sandrine Raffalli<br/>
+Sandro Boehme<br/>
+Santosh Gadkari<br/>
+Sascha Sadat-Guscheh<br/>
+Savvas Triantafyllou<br/>
+Scott Cytacki<br/>
+Sean Radford<br/>
+Sebastian Gomez<br/>
+Sebastian Prehn<br/>
+Sebastian Redl<br/>
+S&eacute;bastien Deleuze<br/>
+S&eacute;bastien Migniot<br/>
+Serge Slipchenko<br/>
+Sergey Nebolsin<br/>
+Shaun Barriball<br/>
+Shinichi Tanaka<br/>
+Shrirang<br/>
+Simon Brunner<br/>
+Simon Kent<br/>
+Sivakumar Kalyanaraman<br/>
+Sridhar Raman<br/>
+Stefan Ivanov<br/>
+Stefan Rinner<br/>
+Sten Roger Sandvik<br/>
+Stephane Landelle<br/>
+Stephen More<br/>
+Steve Neo<br/>
+Sudhan Kanade<br/>
+Sven Rieckhoff<br/>
+Szymon Kuzniak<br/>
+Tako Schotanus<br/>
+Tanju Erinmez<br/>
+Ted Leung<br/>
+Thierry Lach<br/>
+Thierry Levieux<br/>
+Thierry Yge<br/>
+Thilo Goetz<br/>
+Thomas Fromm<br/>
+Thomas Scheffler<br/>
+Thomas Weber<br/>
+Tim Reilly<br/>
+Timur Evdokimov<br/>
+Tom Duffey<br/>
+Tomek Dabrowski<br/>
+Tomoharu Fujita<br/>
+Topi Westerholm<br/>
+Torgeir Veimo<br/>
+Torsten Schlabach<br/>
+Torsten Weck<br/>
+Trang Nguyen<br/>
+Tyson Norris<br/>
+Vadim L. Ivanov<br/>
+Vijai Kalyan<br/>
+Vincent Gigu&egrave;re<br/>
+Vinzenz Wyser<br/>
+Vladimir Bayanov<br/>
+Wade Girard<br/>
+Walter Raboch<br/>
+Wes Smoak<br/>
+William Louth<br/>
+Wolf Benz<br/>
+Xavier Coulon<br/>
+Xiaohua Lu<br/>
+Yoav Landman<br/>
+Yusuke Fujisawa<br/>
+Zhou Wu
\ No newline at end of file

Modified: jackrabbit/site/trunk/src/site/markdown/jcr-client-application-howto.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jcr-client-application-howto.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jcr-client-application-howto.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jcr-client-application-howto.md Mon Apr  6 05:53:57 2015
@@ -1,4 +1,22 @@
-Title: JCR client application HOWTO
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+JCR client application HOWTO
+============================
 This document describes the common configuration and initialization code of
 a client application that uses a JCR content repository. The application
 setup does not depend on the underlying deployment model, implementation,
@@ -8,18 +26,16 @@ The instructions in this document apply
 JNDI to access the content repository. It should however be easy to modify
 the instructions for other container environments.
 
-<a name="JCRclientapplicationHOWTO-J2EEwebapplicationinstructions"></a>
-## J2EE web application instructions
 
+J2EE web application instructions
+---------------------------------
 Follow the steps below to access a JNDI-bound content repository within a
 J2EE web application. Example code is included after this overview. See the
 deployment model howtos for instructions on how to create the JNDI bindings
 for the standard deployment models.
 
-1. Place the JCR API jar in the WEB-INF/lib subdirectory of your web
-application.
-1. Declare the JNDI address under which you will request the repository
-instance in the deployment descriptor.
+1. Place the JCR API jar in the `WEB-INF/lib` subdirectory of your web application.
+1. Declare the JNDI address under which you will request the repository instance in the deployment descriptor.
 1. Code your application to use the resource.
 
 Note that that none of your code or configuration needs to depend on the
@@ -29,32 +45,24 @@ your application. Just make sure that yo
 repository level and optional features your application requires so that
 your application can be deployed in an appropriate environment.
 
-<a name="JCRclientapplicationHOWTO-Step2-Deploymentdescriptor"></a>
 ### Step 2 - Deployment descriptor
-
 Add the following snippet in your web.xml deployment descriptor to declare
 your application's use of a content repository resource.
 
-
     <resource-env-ref>
       <description>Content Repository</description>
       <resource-env-ref-name>jcr/repository</resource-env-ref-name>
       <resource-env-ref-type>javax.jcr.Repository</resource-env-ref-type>
     </resource-env-ref>
 
-
-Note that the java:comp/env/jcr subcontext is the preferred naming context
+Note that the `java:comp/env/jcr` subcontext is the preferred naming context
 for JCR content repository resources.
 
-<a name="JCRclientapplicationHOWTO-Step3-Javacode"></a>
 ### Step 3 - Java code
-
 Use the following Java code snippet to get a reference to the configured
 content repository instance.
 
-
     InitialContext context = new InitialContext();
     Context environment = (Context) context.lookup("java:comp/env");
     Repository repository = (Repository) environment.lookup("jcr/repository");
 
-

Modified: jackrabbit/site/trunk/src/site/markdown/mailing-lists.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/mailing-lists.md?rev=1671485&r1=1671484&r2=1671485&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/mailing-lists.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/mailing-lists.md Mon Apr  6 05:53:57 2015
@@ -1,84 +1,78 @@
-Title: Mailing Lists
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+Mailing Lists
+=============
 Mailing lists are the primary communication channel of the Apache
 Jackrabbit project. See the Apache [mailing list](http://www.apache.org/foundation/mailinglists.html)
- and [email contribution|http://www.apache.org/dev/contrib-email-tips.html]
- pages for general information about mailing list usage and the expected
+and [email contribution](http://www.apache.org/dev/contrib-email-tips.html)
+pages for general information about mailing list usage and the expected
 behaviour on the mailing lists.
 
 The following lists are used by the Apache Jackrabbit project:
 
-<table>
-<tr><th> Mailing list </th><th> Address </th><th> Subscribe </th><th> Unsubscribe </th></tr>
-<tr><td> Jackrabbit Announcements List </td><td> [announce@jackrabbit.apache.org](mailto:announce@jackrabbit.apache.org.html)
- </td><td> [subscribe</td><td>mailto:announce-subscribe@jackrabbit.apache.org?subject=subscribe]
- </td><td> [unsubscribe</td><td>mailto:announce-unsubscribe@jackrabbit.apache.org?subject=unsubscribe]
- </td></tr>
-<tr><td> Jackrabbit Users List </td><td> [users@jackrabbit.apache.org](mailto:users@jackrabbit.apache.org.html)
- </td><td> [subscribe</td><td>mailto:users-subscribe@jackrabbit.apache.org?subject=subscribe]
- </td><td> [unsubscribe</td><td>mailto:users-unsubscribe@jackrabbit.apache.org?subject=unsubscribe]
- </td></tr>
-<tr><td> Jackrabbit Development List </td><td> [dev@jackrabbit.apache.org](mailto:dev@jackrabbit.apache.org.html)
- </td><td> [subscribe</td><td>mailto:dev-subscribe@jackrabbit.apache.org?subject=subscribe]
- </td><td> [unsubscribe</td><td>mailto:dev-unsubscribe@jackrabbit.apache.org?subject=unsubscribe]
- </td></tr>
-<tr><td> Jackrabbit Commits List </td><td> [commits@jackrabbit.apache.org](mailto:commits@jackrabbit.apache.org.html)
- </td><td> [subscribe</td><td>mailto:commits-subscribe@jackrabbit.apache.org?subject=subscribe]
- </td><td> [unsubscribe</td><td>mailto:commits-unsubscribe@jackrabbit.apache.org?subject=unsubscribe]
- </td></tr>
-</table>
+| Mailing list | Address | Subscribe | Unsubscribe
+|--------------|---------|-----------|---------------------- 
+| Jackrabbit Announcements List | [announce@jackrabbit.apache.org](mailto:announce@jackrabbit.apache.org.html) | [subscribe](mailto:announce-subscribe@jackrabbit.apache.org?subject=subscribe) | [unsubscribe](mailto:announce-unsubscribe@jackrabbit.apache.org?subject=unsubscribe) |
+| Jackrabbit Users List         | [users@jackrabbit.apache.org](mailto:users@jackrabbit.apache.org.html) | [subscribe](mailto:users-subscribe@jackrabbit.apache.org?subject=subscribe) | [unsubscribe](mailto:users-unsubscribe@jackrabbit.apache.org?subject=unsubscribe)
+| Jackrabbit Development List   | [dev@jackrabbit.apache.org](mailto:dev@jackrabbit.apache.org.html) | [subscribe](mailto:dev-subscribe@jackrabbit.apache.org?subject=subscribe) | [unsubscribe](mailto:dev-unsubscribe@jackrabbit.apache.org?subject=unsubscribe)
+| Jackrabbit Commits List       | [commits@jackrabbit.apache.org](mailto:commits@jackrabbit.apache.org.html) | [subscribe](mailto:commits-subscribe@jackrabbit.apache.org?subject=subscribe) | [unsubscribe](mailto:commits-unsubscribe@jackrabbit.apache.org?subject=unsubscribe)
+
 
 See the [ezmlm user manual](http://www.ezmlm.org/ezman/ezman1.html)
- and especially the sections on [subscribing|http://www.ezmlm.org/ezman/ezman1.html#ss1.3]
- and [unsubscribing|http://www.ezmlm.org/ezman/ezman1.html#ss1.4]
- for instructions on how to use the Jackrabbit mailing lists.
+and especially the sections on [subscribing](http://www.ezmlm.org/ezman/ezman1.html#ss1.3)
+and [unsubscribing](http://www.ezmlm.org/ezman/ezman1.html#ss1.4)
+for instructions on how to use the Jackrabbit mailing lists.
 
-<a name="MailingLists-Troubleunsubscribing?"></a>
-## Trouble unsubscribing?
 
+Trouble unsubscribing?
+----------------------
 If you have trouble unsubscribing from Jackrabbit mailing lists, you
 probably have subscribed some other address than the one you're trying to
 unsubscribe. To find out the address you are subscribed with, look for a
-*Return-Path* header in the source of one of the messages you've received
+`Return-Path` header in the source of one of the messages you've received
 from the mailing list. It should contain something like
-*listname-return-1234-your.address=example.com@jackrabbit.apache.org*
-which means that you're subscribed with *your.address@example.com*. You
+`listname-return-1234-your.address=example.com@jackrabbit.apache.org`
+which means that you're subscribed with `your.address@example.com`. You
 can turn that into an unsubscription request by replacing the "return-1234"
 part (the numbers change per message) with "unsubscribe", like this:
-*listname-unsubscribe-your.address=example.com@jackrabbit.apache.org*.
+`listname-unsubscribe-your.address=example.com@jackrabbit.apache.org`.
 Send a message to that address to unsubscribe.
 
-{note}
-Please do not send unsubscription requests directly to the normal mailing
-list addresses. If you have trouble unsubscribing and the above
-instructions don't work, you can ask [dev-owner@jackrabbit.apache.org](mailto:dev-owner@jackrabbit.apache.org.html)
- for help.
-{note}
 
-<a name="MailingLists-Mailinglistarchives"></a>
-## Mailing list archives
+> Please do not send unsubscription requests directly to the normal mailing
+> list addresses. If you have trouble unsubscribing and the above
+> instructions don't work, you can ask [dev-owner@jackrabbit.apache.org](mailto:dev-owner@jackrabbit.apache.org.html)
+>  for help.
 
+
+Mailing list archives
+---------------------
 The Jackrabbit mailing lists are archived in many places that provide
 different features for browsing and searching the archives.
 
-<table>
-<tr><th> Archive site </th><th> Jackrabbit Archives </th></tr>
-<tr><td>  Apache	</td><td> [announce](http://mail-archives.apache.org/mod_mbox/jackrabbit-announce/)
- [users</td><td>http://mail-archives.apache.org/mod_mbox/jackrabbit-users/]
- [dev</td><td>http://mail-archives.apache.org/mod_mbox/jackrabbit-dev/]
- [commits</td><td>http://mail-archives.apache.org/mod_mbox/jackrabbit-commits/]
- </td></tr>
-<tr><td> Gmane </td><td> [users](http://dir.gmane.org/gmane.comp.apache.jackrabbit.user)
- [dev</td><td>http://dir.gmane.org/gmane.comp.apache.jackrabbit.devel]
- </td></tr>
-<tr><td> The Mail Archive </td><td> [users](http://www.mail-archive.com/users@jackrabbit.apache.org)
- [dev</td><td>http://www.mail-archive.com/dev@jackrabbit.apache.org]
- </td></tr>
-<tr><td> Nabble </td><td> [users](http://www.nabble.com/Jackrabbit---Users-f14897.html)
- [dev</td><td>http://www.nabble.com/Jackrabbit---Dev-f371.html]
- </td></tr>
-<tr><td> MarkMail </td><td> [All Jackrabbit lists](http://jackrabbit.markmail.org/)
- </td></tr>
-</table>
+
+| Archive site | Jackrabbit Archives
+|--------------|-------------------------------
+| Apache | [announce](http://mail-archives.apache.org/mod_mbox/jackrabbit-announce/) [users](http://mail-archives.apache.org/mod_mbox/jackrabbit-users/) [dev](http://mail-archives.apache.org/mod_mbox/jackrabbit-dev/) [commits](http://mail-archives.apache.org/mod_mbox/jackrabbit-commits/)
+| Gmane  | [users](http://dir.gmane.org/gmane.comp.apache.jackrabbit.user) [dev](http://dir.gmane.org/gmane.comp.apache.jackrabbit.devel)
+| The Mail Archive | [users](http://www.mail-archive.com/users@jackrabbit.apache.org) [dev](http://www.mail-archive.com/dev@jackrabbit.apache.org)
+| Nabble | [users](http://www.nabble.com/Jackrabbit---Users-f14897.html) [dev](http://www.nabble.com/Jackrabbit---Dev-f371.html)
+| MarkMail | [All Jackrabbit lists](http://jackrabbit.markmail.org/)
 
 The raw list archives are also available as compressed mbox files at
 http://jackrabbit.apache.org/mail/.