svn commit: r998413 - in /ofbiz/branches/release10.04: ./ applications/commonext/data/helpdata/HELP_SETUP.xml

Author: jleroux
Date: Sat Sep 18 06:27:47 2010
New Revision: 998413

URL: http://svn.apache.org/viewvc?rev=998413&view=rev
Log:
"Applied fix from trunk for revision: 998412"
------------------------------------------------------------------------
r998412 | jleroux | 2010-09-18 08:22:34 +0200 (sam. 18 sept. 2010) | 4 lignes

A patch from Chris Snow "ofbiz setup conflict. " (https://issues.apache.org/jira/browse/OFBIZ-3908) - OFBIZ-3908

Provide a warning for users following the setup instructions to let them know that the setup component is currently broken!

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/commonext/data/helpdata/HELP_SETUP.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:27:47 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412

Modified: ofbiz/branches/release10.04/applications/commonext/data/helpdata/HELP_SETUP.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=998413&r1=998412&r2=998413&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/commonext/data/helpdata/HELP_SETUP.xml (original)
+++ ofbiz/branches/release10.04/applications/commonext/data/helpdata/HELP_SETUP.xml Sat Sep 18 06:27:47 2010
@@ -29,6 +29,14 @@
     </para>
     <section>
         <title>Why we have OFBiz Setup Application?</title>
+        <warning>
+            <para>
+                The OFBIZ Setup Application is broken!
+            </para>
+            <para>
+                For manual setup instructions, please see the <ulink url="https://cwiki.apache.org/confluence/x/dQB9">Business Setup Guide</ulink> on the wiki.
+           </para>
+        </warning>
         <para>
             If you are the company and also want to use OFBiz for running your business then you easily be able to setting your information for start running
         the system quickly via The OFBiz Setup Application.