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/07 00:49:09 UTC

svn commit: r1671709 - in /jackrabbit/site/trunk: ./ attic/content/ attic/content/dtd/ attic/content/oak/ src/site/ src/site/markdown/ src/site/markdown/components/ src/site/markdown/components/jackrabbit-spi/ src/site/markdown/concurrency-control/ src...

Author: tripod
Date: Mon Apr  6 22:49:08 2015
New Revision: 1671709

URL: http://svn.apache.org/r1671709
Log:
JCR-3865 Use markdown to generate Jackrabbit Site (wip)

Added:
    jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi-overview.gif
      - copied unchanged from r1671145, jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi/jackrabbit-spi-overview.gif
    jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.jpg
      - copied unchanged from r1671145, jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi/jackrabbit-spi.jpg
    jackrabbit/site/trunk/src/site/markdown/concurrency-control-arch.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/concurrency-control/arch.jpg
    jackrabbit/site/trunk/src/site/markdown/concurrency-control-deadlock.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/concurrency-control/deadlock.jpg
    jackrabbit/site/trunk/src/site/markdown/concurrency-control-lock.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/concurrency-control/lock.jpg
    jackrabbit/site/trunk/src/site/markdown/deployment-models-j2ee.png
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/deployment-models/deploy-2.png
    jackrabbit/site/trunk/src/site/markdown/deployment-models-server.png
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/deployment-models/deploy-3.png
    jackrabbit/site/trunk/src/site/markdown/deployment-models-webapp.png
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/deployment-models/deploy-1.png
    jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works-ism.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works/jackrabbit-ism_small.jpg
    jackrabbit/site/trunk/src/site/markdown/index-readers-per-query-handler.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-query-handler.jpg
    jackrabbit/site/trunk/src/site/markdown/index-readers-per-segment.jpg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/index-readers/index-readers-per-segment.jpg
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.png
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture/overview.png
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-nodetypes.png
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/node-type-visualization/jackrabbit-nodetypes.png
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-nodetypes.svg
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/node-type-visualization/jackrabbit-nodetypes.svg
    jackrabbit/site/trunk/src/site/markdown/jcr-api.md
      - copied, changed from r1671120, jackrabbit/site/trunk/src/site/markdown/jcr--api.md
    jackrabbit/site/trunk/src/site/markdown/jcr-level-1.jpg
      - copied unchanged from r1671120, jackrabbit/site/trunk/src/site/markdown/jcr--api/level-1.jpg
    jackrabbit/site/trunk/src/site/markdown/jcr-level-2.jpg
      - copied unchanged from r1671120, jackrabbit/site/trunk/src/site/markdown/jcr--api/level-2.jpg
    jackrabbit/site/trunk/src/site/markdown/jcr-level-adv.jpg
      - copied unchanged from r1671120, jackrabbit/site/trunk/src/site/markdown/jcr--api/level-adv.jpg
    jackrabbit/site/trunk/src/site/markdown/ocm/5minutes.zip
      - copied unchanged from r1670829, jackrabbit/site/trunk/attic/content/JCR/a-simple-ocm-project-with-maven-eclipse.data/5minutes.zip
    jackrabbit/site/trunk/src/site/markdown/ocm/Beans_and_collections.zip
      - copied unchanged from r1670829, jackrabbit/site/trunk/attic/content/JCR/how-to-map-associations-between-objects.data/Beans_and_collections.zip
    jackrabbit/site/trunk/src/site/markdown/standalone-server-homepage.png
      - copied unchanged from r1671120, jackrabbit/site/trunk/src/site/markdown/standalone-server/standalone500.png
    jackrabbit/site/trunk/src/site/resources/CND.zip
      - copied unchanged from r1671485, jackrabbit/site/trunk/src/site/markdown/node-type-notation/CND.zip
    jackrabbit/site/trunk/src/site/resources/JCR_Webdav_Protocol.doc
      - copied unchanged from r1670829, jackrabbit/site/trunk/attic/content/JCR_Webdav_Protocol.doc
    jackrabbit/site/trunk/src/site/resources/dtd/
      - copied from r1670829, jackrabbit/site/trunk/attic/content/dtd/
    jackrabbit/site/trunk/src/site/resources/favicon.ico
      - copied unchanged from r1670829, jackrabbit/site/trunk/attic/content/favicon.ico
    jackrabbit/site/trunk/src/site/resources/oak/
      - copied from r1670829, jackrabbit/site/trunk/attic/content/oak/
    jackrabbit/site/trunk/src/site/resources/repository.xml
      - copied unchanged from r1670829, jackrabbit/site/trunk/attic/content/JCR/jackrabbit-configuration.data/repository.xml
Removed:
    jackrabbit/site/trunk/attic/content/dtd/
    jackrabbit/site/trunk/attic/content/favicon.ico
    jackrabbit/site/trunk/attic/content/oak/
    jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi/
    jackrabbit/site/trunk/src/site/markdown/concurrency-control/
    jackrabbit/site/trunk/src/site/markdown/deployment-models/
    jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works/
    jackrabbit/site/trunk/src/site/markdown/index-readers/
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture/
    jackrabbit/site/trunk/src/site/markdown/jcr--api/
    jackrabbit/site/trunk/src/site/markdown/jcr--api.md
    jackrabbit/site/trunk/src/site/markdown/node-type-notation/
    jackrabbit/site/trunk/src/site/markdown/node-type-visualization/
    jackrabbit/site/trunk/src/site/markdown/standalone-server/
Modified:
    jackrabbit/site/trunk/README.md
    jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.md
    jackrabbit/site/trunk/src/site/markdown/concurrency-control.md
    jackrabbit/site/trunk/src/site/markdown/deployment-models.md
    jackrabbit/site/trunk/src/site/markdown/documentation.md
    jackrabbit/site/trunk/src/site/markdown/embedded-repository.md
    jackrabbit/site/trunk/src/site/markdown/first-hops.md
    jackrabbit/site/trunk/src/site/markdown/frequently-asked-questions.md
    jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works.md
    jackrabbit/site/trunk/src/site/markdown/index-readers.md
    jackrabbit/site/trunk/src/site/markdown/index.md
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md
    jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md
    jackrabbit/site/trunk/src/site/markdown/navigation.md
    jackrabbit/site/trunk/src/site/markdown/node-type-notation.md
    jackrabbit/site/trunk/src/site/markdown/node-type-visualization.md
    jackrabbit/site/trunk/src/site/markdown/ocm/a-simple-ocm-project-with-maven--eclipse.md
    jackrabbit/site/trunk/src/site/markdown/ocm/how-to-map-associations-between-objects.md
    jackrabbit/site/trunk/src/site/markdown/standalone-server.md
    jackrabbit/site/trunk/src/site/site.xml

Modified: jackrabbit/site/trunk/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/README.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/README.md (original)
+++ jackrabbit/site/trunk/README.md Mon Apr  6 22:49:08 2015
@@ -29,7 +29,7 @@ can be used to build and deploy a web si
    $ mvn site
    ````
 
-2. Review the site at `vault-doc/target/site`
+2. Review the site at `target/site/index.html`
 
 3. Deploy the site to `http://jackrabbit.apache.org/` using:
 

Modified: jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/components/jackrabbit-spi.md Mon Apr  6 22:49:08 2015
@@ -24,7 +24,7 @@ top of the persistent component ("reposi
 SPI and, in turn, exposes the JCR API to the application. The SPI is not
 intended to be used by the application directly.
 
-![Jackrabbit SPI](jackrabbit-spi/jackrabbit-spi.jpg)
+![Jackrabbit SPI](jackrabbit-spi.jpg)
 
 Primary Goals
 -------------
@@ -102,4 +102,4 @@ Other SPI implementations can be found i
 See the image below for a overview over existing and planned SPI
 implementations.
 
-![Jackrabbit SPI Overview](jackrabbit-spi/jackrabbit-spi-overview.gif)
+![Jackrabbit SPI Overview](jackrabbit-spi-overview.gif)

Modified: jackrabbit/site/trunk/src/site/markdown/concurrency-control.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/concurrency-control.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/concurrency-control.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/concurrency-control.md Mon Apr  6 22:49:08 2015
@@ -33,7 +33,7 @@ This review is based on Jackrabbit versi
 
 Architectural background
 ------------------------
-![Architecture](concurrency-control/arch.jpg)
+![Architecture](concurrency-control-arch.jpg)
 
 In terms of concurrency control, the Jackrabbit
 architecture can roughly be divided to five main layers:
@@ -107,7 +107,7 @@ the context of an XA transaction.
 
 Main synchronization mechanisms
 -------------------------------
-![Lock](concurrency-control/lock.jpg)
+![Lock](concurrency-control-lock.jpg)
 
 The main synchronization mechanisms in Jackrabbit
 are the read-write locks in the SharedItemStateManager and
@@ -329,7 +329,7 @@ version back to the workspace. Finally t
 The nested locks above are discussed in the section on the save operation.
 
 ### Transaction commit
-![Deadlock](concurrency-control/deadlock.jpg)
+![Deadlock](concurrency-control-deadlock.jpg)
 
 As discussed in the architecture section above,
 a transaction context overrides all the other write operations in favor of

Modified: jackrabbit/site/trunk/src/site/markdown/deployment-models.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/deployment-models.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/deployment-models.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/deployment-models.md Mon Apr  6 22:49:08 2015
@@ -65,7 +65,7 @@ As an example of this deployment model w
 into a .war file which is deployed into a WebContainer, which not only
 contains the application but also the actual content repository.
 
-![Webapp Deployment](deployment-models/deploy-1.png)
+![Webapp Deployment](deployment-models-webapp.png)
 
 Application1 and Application2 both contain their own instances of a Content
 Repository distributed as a part of their .war file and therefore loaded
@@ -89,7 +89,7 @@ running inside the same JVM.
 The repository is started and stopped with the Application Server but is
 visible to all the applications to connect to.
 
-![Shared Deployment](deployment-models/deploy-2.png)
+![Shared Deployment](deployment-models-j2ee.png)
 
 This setup also allows to take advantage of the XA facilities of the
 Application Server and could use the application servers single sign-on
@@ -110,7 +110,7 @@ repository (or data) layer from the appl
 the content repository can be used from many different applications,
 physically and can be scaled individually.
 
-![Standalone Deployment](deployment-models/deploy-3.png)
+![Standalone Deployment](deployment-models-server.png)
 
 This deployment model assumes that there is a network layer between the
 content repository server and the respective content repository client.

Modified: jackrabbit/site/trunk/src/site/markdown/documentation.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/documentation.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/documentation.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/documentation.md Mon Apr  6 22:49:08 2015
@@ -21,7 +21,7 @@ Documentation
 * [Jackrabbit Components](jackrabbit-components.html)
 * [Building Jackrabbit](building-jackrabbit.html)
 * [First Hops](first-hops.html)
-* [JCR & API](jcr--api.html)
+* [JCR & API](jcr-api.html)
 * [Jackrabbit Architecture](jackrabbit-architecture.html)
 * [Deployment Models](deployment-models.html)
 * [Jackrabbit Configuration](jackrabbit-configuration.html)

Modified: jackrabbit/site/trunk/src/site/markdown/embedded-repository.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/embedded-repository.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/embedded-repository.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/embedded-repository.md Mon Apr  6 22:49:08 2015
@@ -170,13 +170,13 @@ code.
 This creates a repository instance that starts up when the first session is
 created and automatically shuts down when the last session is closed. By
 default the repository will be created in a "jackrabbit" subdirectory using
-a default configuration file in "jackrabbit/repository.xml". See the
+a default configuration file in `jackrabbit/repository.xml`. See the
 TransientRepository javadocs for the ways to override these defaults.
     
 
 Enabling remote access
 ----------------------
-    Even if you mostly use the content repository in embedded mode within your
+Even if you mostly use the content repository in embedded mode within your
 application, it may occasionally be useful to be able to access the
 repository for example from an external administration tool while your
 application is still running. You can use the jackrabbit-jcr-rmi library to

Modified: jackrabbit/site/trunk/src/site/markdown/first-hops.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/first-hops.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/first-hops.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/first-hops.md Mon Apr  6 22:49:08 2015
@@ -107,10 +107,10 @@ and run it with java FirstHop to get the
 
 
 In addition to producing the above status line the application copies a
-default repository configuration file to repository.xml and creates an
+default repository configuration file to `repository.xml` and creates an
 initial Jackrabbit content repository in the repository subdirectory. You
-can use the system properties *org.apache.jackrabbit.repository.conf* and
-*org.apache.jackrabbit.repository.home* to set alternative configuration
+can use the system properties `org.apache.jackrabbit.repository.conf` and
+`org.apache.jackrabbit.repository.home` to set alternative configuration
 file and repository directory locations. 
 
 Read on for a detailed breakdown of the FirstHop application: 

Modified: jackrabbit/site/trunk/src/site/markdown/frequently-asked-questions.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/frequently-asked-questions.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/frequently-asked-questions.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/frequently-asked-questions.md Mon Apr  6 22:49:08 2015
@@ -186,7 +186,7 @@ Query
 
 ### I've configured textFilterClasses but my query still doesn't work, what's wrong?
 Make sure you changed existing workspace.xml files as well. The workspace
-element in repository.xml only acts as a template for new workspaces.
+element in `repository.xml only` acts as a template for new workspaces.
 
 Verify that you also put the jar files into the classpath that jackrabbit
 depends on for text extraction. You can find all required jar files inside

Modified: jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/how-jackrabbit-works.md Mon Apr  6 22:49:08 2015
@@ -24,7 +24,7 @@ the components in the Jackrabbit impleme
 this implementation architecture is not mandated by JCR, but has been
 designed from scratch based on JCR.
 
-![Item State Manager](how-jackrabbit-works/jackrabbit-ism_small.jpg)
+![Item State Manager](how-jackrabbit-works-ism.jpg)
 
 The used components and their respective functions in the order of their
 appearance in the use case of writing or modifying content in the content

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=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/index-readers.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/index-readers.md Mon Apr  6 22:49:08 2015
@@ -22,7 +22,7 @@ several extensions and customizations th
 environment where changes to the index are frequent. The extensions also
 cover features that are not supported by Lucene, like hierarchical queries.
 
-![Per Index Segment](index-readers/index-readers-per-segment.jpg)
+![Per Index Segment](index-readers-per-segment.jpg)
 
 
 CachingIndexReader
@@ -108,7 +108,7 @@ possible using the plain lucene index re
 Combining the index segments
 ----------------------------
 
-![Per Query Handler](index-readers/index-readers-per-query-handler.jpg)
+![Per Query Handler](index-readers-per-query-handler.jpg)
 
 
 CachingMultiIndexReader

Modified: jackrabbit/site/trunk/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/index.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/index.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/index.md Mon Apr  6 22:49:08 2015
@@ -26,6 +26,12 @@ A content repository is a hierarchical c
 structured and unstructured content, full text search, versioning,
 transactions, observation, and more.
 
+[Jackrabbit Oak](/oak) is a complementary implementation of the JCR specification. 
+It is an effort to implement a scalable and performant hierarchical content 
+repository for use as the foundation of modern world-class web sites and 
+other demanding content applications. See the [Jackrabbit Oak](/oak) website for 
+more information.
+
 Apache Jackrabbit is a project of the [Apache Software Foundation](http://www.apache.org/)
 
 Apache Jackrabbit News
@@ -33,15 +39,15 @@ Apache Jackrabbit News
 
 ##### March 26th, 2015: Apache Jackrabbit 2.10.0 released
 Apache Jackrabbit 2.10 is an incremental feature release based on and compatible with earlier stable Jackrabbit 2.x releases. 
-See the downloads page for more details.
+See the [downloads](downloads.html#v2.10) page for more details.
 
 ##### March 10th, 2015: Apache Jackrabbit Oak 1.0.12 released
 Jackrabbit Oak 1.0.12 is a patch release that contains fixes and improvements over the previous 1.0.11 release. 
-See the downloads page for more details.
+See the [downloads](downloads.html#oak) page for more details.
 
 ##### March 9th, 2015: Apache Jackrabbit Oak 1.1.7 released
 Jackrabbit Oak 1.1.7 is an unstable release cut directly from trunk, with a focus on new features and other improvements. 
-See the downloads page for more details.
+See the  [downloads](downloads.html#oaktrunk) page for more details.
 
 ##### February 25th, 2015: Apache Jackrabbit FileVault 3.1.16 released
 Jackrabbit FileVault 3.1.16 is current stable release of the recently donated repository content synchronization tool. 

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=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-architecture.md Mon Apr  6 22:49:08 2015
@@ -27,7 +27,7 @@ The general architecture of Jackrabbit c
 Content Application Layer, an API Layer and a Content Repository
 Implementation Layer.
 
-![Jackrabbit Architecture Overview](jackrabbit-architecture/overview.png)
+![Jackrabbit Architecture Overview](jackrabbit-architecture.png)
 
 Content Applications
 --------------------

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=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jackrabbit-configuration.md Mon Apr  6 22:49:08 2015
@@ -113,7 +113,7 @@ The repository configuration elements ar
 * [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.
+See the Jackrabbit 1.5 [default configuration](repository.xml) , for an example repository configuration file.
 
 > It is a good idea to place the `repository.xml` file _inside_ the
 > repository home directory. This keeps your repository and its configuration

Copied: jackrabbit/site/trunk/src/site/markdown/jcr-api.md (from r1671120, jackrabbit/site/trunk/src/site/markdown/jcr--api.md)
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/jcr-api.md?p2=jackrabbit/site/trunk/src/site/markdown/jcr-api.md&p1=jackrabbit/site/trunk/src/site/markdown/jcr--api.md&r1=1671120&r2=1671709&rev=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/jcr--api.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/jcr-api.md Mon Apr  6 22:49:08 2015
@@ -55,7 +55,7 @@ The Scope of Level 1 of JSR-170 to cover
 need to read  from repositories. Level 1 specifies a read-only API that allows to  introspect Node and Property-types
 and offers hierarchical read access to content stored in a repository.
 
-![Level 1](jcr--api/level-1.jpg)
+![Level 1](jcr-level-1.jpg)
 
 Level 1 of JSR-170 is geared to allow people to write  applications such as search and display Portlets,
 CMS-Templates, Reports, Exports or other applications  that harvest, search, present or display information  from one
@@ -65,7 +65,7 @@ or multiple repositories.
 Level 2 of JSR-170 specifies all the writing  capabilities need to bi-directionally interact with a content repository
 in a fine and coarse grained  fashion.
 
-![Level 2](jcr--api/level-2.jpg)
+![Level 2](jcr-level-2.jpg)
 
 Applications written against Level 2 of JSR-170 include management applications or generally speaking any  application
 that generates data, information or content for both structured and unstructured information.
@@ -74,7 +74,7 @@ that generates data, information or cont
 On top of Level 1 or Level 2 a number of functional  block serve for more advanced repository functionality. This
 includes functions like: Versioning, (JTA) Transactions, Query using SQL, Explicit  Locking and Content Observation.
 
-![Advanced](jcr--api/level-adv.jpg)
+![Advanced](jcr-level-adv.jpg)
 
 A fully JSR-170 compliant repository like Jackrabbit encompasses all the functionality and therefore lends itself as
 general purpose, off-the-shelf  infrastructure for Content-, Document- and Source Code Management or for just about any

Modified: jackrabbit/site/trunk/src/site/markdown/navigation.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/navigation.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/navigation.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/navigation.md Mon Apr  6 22:49:08 2015
@@ -11,7 +11,7 @@ Title: Navigation
 ** [Standalone Server](standalone-server.html)
 ** [Jackrabbit Components](jackrabbit-components.html)
 ** [First Hops](first-hops.html)
-** [JCR & API](jcr--api.html)
+** [JCR & API](jcr-api.html)
 ** [Jackrabbit Architecture](jackrabbit-architecture.html)
 ** [Deployment Models](deployment-models.html)
 ** [Jackrabbit Configuration](jackrabbit-configuration.html)

Modified: jackrabbit/site/trunk/src/site/markdown/node-type-notation.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/node-type-notation.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/node-type-notation.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/node-type-notation.md Mon Apr  6 22:49:08 2015
@@ -553,4 +553,4 @@ Case closed.
 
 Syntax highlighting for text editors
 ------------------------------------
-Here is a TextMate bundle for CND syntax highlighting: [CND.zip](node-type-notation/cnd.zip)
+Here is a TextMate bundle for CND syntax highlighting: [CND.zip](CND.zip)

Modified: jackrabbit/site/trunk/src/site/markdown/node-type-visualization.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/node-type-visualization.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/node-type-visualization.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/node-type-visualization.md Mon Apr  6 22:49:08 2015
@@ -21,9 +21,9 @@ Visualizing the Node Type Hierarchy is n
 repository containing only the default Jackrabbit node types. Here,
 GraphViz can help:
 
-![Jackrabbit Nodetypes](node-type-visualization/jackrabbit-nodetypes.png)
+![Jackrabbit Nodetypes](jackrabbit-nodetypes.png)
 
-Node Type Hierarchy for Jackrabbit ([SVG version](node-type-visualization/jackrabbit-nodetypes.svg))
+Node Type Hierarchy for Jackrabbit ([SVG version](jackrabbit-nodetypes.svg))
 
 In this diagram, the rounded boxes represent node types (green for mixins,
 gold for primrary types), with the arrows indicating the node inheritance.

Modified: jackrabbit/site/trunk/src/site/markdown/ocm/a-simple-ocm-project-with-maven--eclipse.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/ocm/a-simple-ocm-project-with-maven--eclipse.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/ocm/a-simple-ocm-project-with-maven--eclipse.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/ocm/a-simple-ocm-project-with-maven--eclipse.md Mon Apr  6 22:49:08 2015
@@ -34,7 +34,7 @@ If it is not the case, here is the instr
 
 Download the OCM project
 ------------------------
-You can download the OCM project from [here|^5minutes.zip].
+You can download the OCM project from [here](5minutes.zip).
 
 
 Install the project

Modified: jackrabbit/site/trunk/src/site/markdown/ocm/how-to-map-associations-between-objects.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/ocm/how-to-map-associations-between-objects.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/ocm/how-to-map-associations-between-objects.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/ocm/how-to-map-associations-between-objects.md Mon Apr  6 22:49:08 2015
@@ -21,7 +21,7 @@ How to map associations between objects
 Overview
 --------
 This tutorial explains how to map associations between objects (1:1 and
-1:n). You can find the tutorial code sample from [here](^beans_and_collections.zip.html)
+1:n). You can find the tutorial code sample from [here](Beans_and_collections.zip)
 . It is based on Maven and ready to be used inside Eclipse. If you have
 some configuration issues, please review the tutorial "[A simple OCM
 project with Maven & Eclipse]". 
@@ -140,5 +140,5 @@ Here is an example of the correspoding J
 
 Download the tutorial code
 --------------------------
-You can download the OCM project from [here](^beans_and_collections.zip.html)
+You can download the OCM project from [here](Beans_and_collections.zip)
 

Modified: jackrabbit/site/trunk/src/site/markdown/standalone-server.md
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/markdown/standalone-server.md?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/markdown/standalone-server.md (original)
+++ jackrabbit/site/trunk/src/site/markdown/standalone-server.md Mon Apr  6 22:49:08 2015
@@ -47,7 +47,7 @@ alternative if the default port 8080 is
 
 This is what the server should look like in your browser:
 
-![Standalone Server Screenshot](standalone-server/standalone500.png)
+![Standalone Server Screenshot](standalone-server-homepage.png)
 
 By default the server will look for a content repository in the
 `./jackrabbit` directory and a repository configuration file in a

Modified: jackrabbit/site/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/site/trunk/src/site/site.xml?rev=1671709&r1=1671708&r2=1671709&view=diff
==============================================================================
--- jackrabbit/site/trunk/src/site/site.xml (original)
+++ jackrabbit/site/trunk/src/site/site.xml Mon Apr  6 22:49:08 2015
@@ -35,7 +35,7 @@
             <item name="Standalone Server" href="standalone-server.html"/>
             <item name="Jackrabbit Components" href="jackrabbit-components.html"/>
             <item name="First Hops" href="first-hops.html"/>
-            <item name="JCR &amp; API" href="jcr--api.html"/>
+            <item name="JCR &amp; API" href="jcr-api.html"/>
             <item name="Jackrabbit Architecture" href="jackrabbit-architecture.html"/>
             <item name="Deployment Models" href="deployment-models.html"/>
             <item name="Jackrabbit Configuration" href="jackrabbit-configuration.html"/>
@@ -53,6 +53,7 @@
             <item name="Website" href="website.html"/>
             <item name="Creating Releases" href="creating-releases.html"/>
             <item name="Attribution" href="supporting-software-attribution.html"/>
+            <item name="Privacy" href="privacy-policy.html"/>
         </menu>
         <menu name="Apache Software Foundation">
             <item name="Introduction" href="http://www.apache.org/foundation/how-it-works.html"/>