You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by "Ulrich Stärk (JIRA)" <ji...@apache.org> on 2010/07/26 09:14:50 UTC

[jira] Created: (TAP5-1217) merge in documentation from trunk

merge in documentation from trunk
---------------------------------

                 Key: TAP5-1217
                 URL: https://issues.apache.org/jira/browse/TAP5-1217
             Project: Tapestry 5
          Issue Type: Sub-task
          Components: documentation
            Reporter: Ulrich Stärk


The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


Re: [jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by Christophe Cordenier <ch...@gmail.com>.
Great !

2010/10/1 Ulrich Stärk (JIRA) <ji...@apache.org>:
>
>     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
>
> Ulrich Stärk updated TAP5-1217:
> -------------------------------
>
>    Attachment:     (was: tapestry-upload-5.1.0.5.jar)
>
>> merge in documentation from trunk
>> ---------------------------------
>>
>>                 Key: TAP5-1217
>>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>>             Project: Tapestry 5
>>          Issue Type: Sub-task
>>          Components: documentation
>>            Reporter: Ulrich Stärk
>>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>>
>>
>> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.
>
> --
> This message is automatically generated by JIRA.
> -
> You can reply to this email to add a comment to the issue online.
>
>



-- 
Regards,
Christophe Cordenier.

Committer on Apache Tapestry 5
Co-creator of wooki @wookicentral.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12922528#action_12922528 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

Hi

Some of the changes in 'src.site.apt.diff' has already been applied, has someone worked on it ?

If not, @Uli, please could you attach a fresh diff ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917287#action_12917287 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

hibernate merged

I didn't found corresponding pages for tutorial and quickstart, is this intentional ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917698#action_12917698 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

I was meaning, they are not present on confluence. Should i add them ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


Re: [jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by Christophe Cordenier <ch...@gmail.com>.
Sure, i have used info macro in the meantime

Cheers

Envoyé de mon iPhone

Le 2 oct. 2010 à 11:13, Ulrich Stärk <ul...@spielviel.de> a écrit :

> Great! Could you please mark additions/deprecations with {since}/{deprecated}? Sorry I couldn't give you the documentation for those earlier.
> 
> Uli
> 
> On 01.10.2010 20:38, Christophe Cordenier (JIRA) wrote:
>> 
>>     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12916996#action_12916996 ]
>> 
>> Christophe Cordenier commented on TAP5-1217:
>> --------------------------------------------
>> 
>> spring and ioc merged
>> 
>>> merge in documentation from trunk
>>> ---------------------------------
>>> 
>>>                 Key: TAP5-1217
>>>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>>>             Project: Tapestry 5
>>>          Issue Type: Sub-task
>>>          Components: documentation
>>>            Reporter: Ulrich Stärk
>>>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>>> 
>>> 
>>> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.
>> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org


Re: [jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by Ulrich Stärk <ul...@spielviel.de>.
Great! Could you please mark additions/deprecations with {since}/{deprecated}? Sorry I couldn't give 
you the documentation for those earlier.

Uli

On 01.10.2010 20:38, Christophe Cordenier (JIRA) wrote:
>
>      [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12916996#action_12916996 ]
>
> Christophe Cordenier commented on TAP5-1217:
> --------------------------------------------
>
> spring and ioc merged
>
>> merge in documentation from trunk
>> ---------------------------------
>>
>>                  Key: TAP5-1217
>>                  URL: https://issues.apache.org/jira/browse/TAP5-1217
>>              Project: Tapestry 5
>>           Issue Type: Sub-task
>>           Components: documentation
>>             Reporter: Ulrich Stärk
>>          Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>>
>>
>> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12916996#action_12916996 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

spring and ioc merged

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917698#action_12917698 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

I was meaning, they are not present on confluence. Should i add them ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12920926#action_12920926 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

I have imported tutorial from 5.2 version since nothing was added, diff only shows slight differences.

So we have quickstart.src.site.apt.diff  and  src.site.apt.diff left

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: quickstart.src.site.apt.diff
                src.site.apt.diff
                tapestry-hibernate.src.site.apt.diff

I created diffs between the documentation of trunk and 5.1.0.5. The differences now just need to be merged into confluence.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment:     (was: tapestry-upload-5.1.0.5.jar)

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917657#action_12917657 ] 

Ulrich Stärk commented on TAP5-1217:
------------------------------------

There were no changes between 5.1 and 5.2 in these modules so no action has to be taken.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12916996#action_12916996 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

spring and ioc merged

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12920926#action_12920926 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

I have imported tutorial from 5.2 version since nothing was added, diff only shows slight differences.

So we have quickstart.src.site.apt.diff  and  src.site.apt.diff left

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: tapestry-ioc.src.site.apt.diff
                tapestry-spring.src.site.apt.diff
                tapestry-tutorial1.src.site.apt.diff

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: quickstart.src.site.apt.diff
                src.site.apt.diff
                tapestry-hibernate.src.site.apt.diff

I created diffs between the documentation of trunk and 5.1.0.5. The differences now just need to be merged into confluence.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12927801#action_12927801 ] 

Ulrich Stärk commented on TAP5-1217:
------------------------------------

The diff is not between wiki and the version in SVN but between trunk and the 5.1 branch in SVN. This means that there is no "fresh" diff except if someone worked on the 5.2 documentation in SVN.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917287#action_12917287 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

hibernate merged

I didn't found corresponding pages for tutorial and quickstart, is this intentional ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12927801#action_12927801 ] 

Ulrich Stärk commented on TAP5-1217:
------------------------------------

The diff is not between wiki and the version in SVN but between trunk and the 5.1 branch in SVN. This means that there is no "fresh" diff except if someone worked on the 5.2 documentation in SVN.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: tapestry-upload-5.1.0.5.jar

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Christophe Cordenier (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12922528#action_12922528 ] 

Christophe Cordenier commented on TAP5-1217:
--------------------------------------------

Hi

Some of the changes in 'src.site.apt.diff' has already been applied, has someone worked on it ?

If not, @Uli, please could you attach a fresh diff ?

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: tapestry-upload-5.1.0.5.jar

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment: tapestry-ioc.src.site.apt.diff
                tapestry-spring.src.site.apt.diff
                tapestry-tutorial1.src.site.apt.diff

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Updated: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ulrich Stärk updated TAP5-1217:
-------------------------------

    Attachment:     (was: tapestry-upload-5.1.0.5.jar)

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (TAP5-1217) merge in documentation from trunk

Posted by "Ulrich Stärk (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/TAP5-1217?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12917657#action_12917657 ] 

Ulrich Stärk commented on TAP5-1217:
------------------------------------

There were no changes between 5.1 and 5.2 in these modules so no action has to be taken.

> merge in documentation from trunk
> ---------------------------------
>
>                 Key: TAP5-1217
>                 URL: https://issues.apache.org/jira/browse/TAP5-1217
>             Project: Tapestry 5
>          Issue Type: Sub-task
>          Components: documentation
>            Reporter: Ulrich Stärk
>         Attachments: quickstart.src.site.apt.diff, src.site.apt.diff, tapestry-hibernate.src.site.apt.diff, tapestry-ioc.src.site.apt.diff, tapestry-spring.src.site.apt.diff, tapestry-tutorial1.src.site.apt.diff
>
>
> The documentation in confluence is for version 5.1. We need to look at the changes made to the documentation in trunk and merge the differences into confluence, marking parts with {deprecacted} and {since} where applicable.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.