Hi,

On 6.5.14 10:17 , Michael Dürig wrote:

For oak-doc my preference would be to bump it to 1.0 and merge all
relevant changes from trunk

This would currently include the commits below. Anything from that list that is specific to trunk only (Angela?)? I'll proceed with the merge later this week if no one objects.

Michael

------------------------------------------------------------------------
r1592744 | angela | 2014-05-06 15:36:32 +0200 (Tue, 06 May 2014) | 1 line
Changed paths:
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md
D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_accesscontrol.md D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_permission.md D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_principal.md D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_privileges.md
   D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_user.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol
A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_accesscontrol.md:1592740)
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/overview.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission
A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_permission.md:1592740)
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal
A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_principal.md:1592740)
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege
A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_privileges.md:1592740)
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user
A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_user.md:1592740)
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user.md

OAK-301 : oak docu
------------------------------------------------------------------------
r1592742 | angela | 2014-05-06 15:29:20 +0200 (Tue, 06 May 2014) | 1 line
Changed paths:
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md
D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_authentication.md M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/differences.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_authentication.md:1591293) A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/externalloginmodule.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/identitymanagement.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/ldap.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/preauthentication.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/tokenmanagement.md M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/overview.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user.md

OAK-301 : oak docu
------------------------------------------------------------------------
r1592677 | mduerig | 2014-05-06 09:55:30 +0200 (Tue, 06 May 2014) | 1 line
Changed paths:
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md

OAK-301: Document differences re. versioning
------------------------------------------------------------------------
r1591874 | mduerig | 2014-05-02 13:36:12 +0200 (Fri, 02 May 2014) | 1 line
Changed paths:
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/dos_and_donts.md

OAK-1455: document oak:unstructured performance advantages
------------------------------------------------------------------------
r1591293 | angela | 2014-04-30 15:31:51 +0200 (Wed, 30 Apr 2014) | 1 line
Changed paths:
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md
M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences_authentication.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol.md A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication.md (from /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/external_login_module.md:1591214) D /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/external_login_module.md
   M /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/overview.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege.md
   A /jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user.md

OAK-301 : oak docu

Reply via email to