svn commit: r888566 - in /ofbiz/branches/release09.04: ./ LICENSE framework/appserver/templates/wasce2/README framework/common/config/CommonHelpUrls.xml specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r888566 - in /ofbiz/branches/release09.04: ./ LICENSE framework/appserver/templates/wasce2/README framework/common/config/CommonHelpUrls.xml specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl

jleroux@apache.org
Author: jleroux
Date: Tue Dec  8 20:58:46 2009
New Revision: 888566

URL: http://svn.apache.org/viewvc?rev=888566&view=rev
Log:
Available part of it, done by hand
"Applied fix from trunk for revision: 888559  "
------------------------------------------------------------------------
r888559 | jleroux | 2009-12-08 21:23:23 +0100 (mar. 08 d‚c. 2009) | 2 lignes

Some easy documentation (cwiki) links changes following r888510
I have found a way to fix tinylinks :D http://confluence.atlassian.com/pages/viewpage.action?pageId=162988142
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/LICENSE
    ofbiz/branches/release09.04/framework/appserver/templates/wasce2/README
    ofbiz/branches/release09.04/framework/common/config/CommonHelpUrls.xml
    ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  8 20:58:46 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559

Modified: ofbiz/branches/release09.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/LICENSE?rev=888566&r1=888565&r2=888566&view=diff
==============================================================================
--- ofbiz/branches/release09.04/LICENSE (original)
+++ ofbiz/branches/release09.04/LICENSE Tue Dec  8 20:58:46 2009
@@ -8,7 +8,7 @@
 OFBiz and the full text of the license used for each.
 
 For additional details, see the NOTICE file and:
-http://docs.ofbiz.org/display/OFBADMIN/Libraries+Included+in+OFBiz
+http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz
 ==========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
 ofbiz/trunk/framework/base/lib/ant-launcher-1.7.0.jar

Modified: ofbiz/branches/release09.04/framework/appserver/templates/wasce2/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/appserver/templates/wasce2/README?rev=888566&r1=888565&r2=888566&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/appserver/templates/wasce2/README (original)
+++ ofbiz/branches/release09.04/framework/appserver/templates/wasce2/README Tue Dec  8 20:58:46 2009
@@ -101,7 +101,7 @@
     But you can neglect and force stopping
 
     *** Also beware, you can't have spaces in the path where the application server is installed ***
-    And last but not least you may appreciate http://docs.ofbiz.org/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-HowtouseRMIwithoutSSL
+    And last but not least you may appreciate http://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-HowtouseRMIwithoutSSL
 =======================================================================================================================================================
 
 Derby

Modified: ofbiz/branches/release09.04/framework/common/config/CommonHelpUrls.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonHelpUrls.xml?rev=888566&r1=888565&r2=888566&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/config/CommonHelpUrls.xml (original)
+++ ofbiz/branches/release09.04/framework/common/config/CommonHelpUrls.xml Tue Dec  8 20:58:46 2009
@@ -20,7 +20,7 @@
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="Prefix">
-        <value xml:lang="en">http://docs.ofbiz.org/display/OFBENDUSER/</value> <!-- Use this to link to the online OFBiz Confluence Documentation Space -->
+        <value xml:lang="en">http://cwiki.apache.org/confluence/display/OFBENDUSER/</value> <!-- Use this to link to the online OFBiz Confluence Documentation Space -->
 <!--
         <value xml:lang="en">/help/OFBIZ-ENDUSER/OFBIZ/</value>  Use this to link to a locally exported Confluence Documentation Space
 -->

Modified: ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl?rev=888566&r1=888565&r2=888566&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl Tue Dec  8 20:58:46 2009
@@ -60,7 +60,7 @@
         <a href="http://fisheye6.cenqua.com/browse/ofbiz">Source Browse and Stats (Fisheye)</a>
         <!-- no RSS feed any more... <a href="http://www.ofbiz.org/rss/svnlog.rss">SVN Commit RSS Feed</a> -->
         <a href="http://api.ofbiz.org/">API Reference (Javadoc)</a>
-        <a href="http://docs.ofbiz.org/display/OFBIZ">Documentation Site: Wiki</a>
+        <a href="http://cwiki.apache.org/confluence/display/OFBIZ">Documentation Site: Wiki</a>
 
         <a href="VideosConf.html">Conference Videos</a>
         <a href="http://docs.ofbiz.org/x/QQg">Books</a>