svn commit: r446521 - in /incubator/ofbiz/site: comingsoon.html docs/setup.html documents.html index.html marketing.html ofbizlicense.html ofbizmitlicense.html

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

svn commit: r446521 - in /incubator/ofbiz/site: comingsoon.html docs/setup.html documents.html index.html marketing.html ofbizlicense.html ofbizmitlicense.html

jonesde
Author: jonesde
Date: Thu Sep 14 22:05:48 2006
New Revision: 446521

URL: http://svn.apache.org/viewvc?view=rev&rev=446521
Log:
A bunch of site updates to get ready for new release, and to more correctly describe licensing, the setup guide, and the location of the new production setup guide and the new jira server and such

Added:
    incubator/ofbiz/site/ofbizlicense.html
      - copied, changed from r443217, incubator/ofbiz/site/ofbizmitlicense.html
Removed:
    incubator/ofbiz/site/ofbizmitlicense.html
Modified:
    incubator/ofbiz/site/comingsoon.html
    incubator/ofbiz/site/docs/setup.html
    incubator/ofbiz/site/documents.html
    incubator/ofbiz/site/index.html
    incubator/ofbiz/site/marketing.html

Modified: incubator/ofbiz/site/comingsoon.html
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/comingsoon.html?view=diff&rev=446521&r1=446520&r2=446521
==============================================================================
--- incubator/ofbiz/site/comingsoon.html (original)
+++ incubator/ofbiz/site/comingsoon.html Thu Sep 14 22:05:48 2006
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -17,31 +16,28 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-
-<HEAD>
-  <TITLE>The Open For Business Project - Features Coming Soon</TITLE>
+<head>
+  <title>The Open For Business Project - Features Coming Soon</title>
   <link rel="stylesheet" href="images/ofbws.css" type="text/css"/>
   <meta name="keywords" content="Open Source ERP,Open Source CRM,Open Source E-Commerce,Open Source eCommerce,Open Source POS,Open Source SCM,Open Source MRP,Open Source CMMS,Open Source EAM,web services,workflow,ebusiness,e-business,ecommerce,e-commerce,automation,enterprise software,open source,entity engine,service engine,erp,crm,party,accounting,facility,supply,chain,management,catalog,order,project,task,work effort,financial,ledger,content management,customer,inventory"/>
-</HEAD>
+</head>
 
 <body>
 
 <div class="headerboxoutside">
     <div class="headerboxtop">
         <div class="left">
-            <a href="http://www.ofbiz.org"><img src="images/ofbiz_logo.jpg"  border="0" alt="The Open For Business Project"/></a>
+            <a href="http://incubator.apache.org/ofbiz/"><img src="images/ofbiz_logo.jpg"  border="0" alt="The Open For Business Project"/></a>
         </div>
         <div class="right">
-            <a href="http://www.java.net"><img src="http://today.java.net/images/javanet_button_90.gif" width="90" height="25" border="0" alt="java.net Member Button"/></a>
-            &nbsp;&nbsp;
-            <a href="http://sf.net/projects/ofbiz"><img src="http://sourceforge.net/sflogo.php?group_id=27173" width="88" height="31" border="0" alt="SourceForge Logo"/></a>
-            &nbsp;&nbsp;
-            <a href="http://www.ofbiz.org"><img src="images/ofbiz_powered.gif" width="88" border="0"/></a>
+            <a href="http://incubator.apache.org/projects/ofbiz.html"><img src="http://incubator.apache.org/images/apache-incubator-logo.png" width="120" alt="Apache Incubator" border="0"/></a>
+            &nbsp;
+            <a href="http://incubator.apache.org/ofbiz/"><img src="images/ofbiz_powered.gif" width="88" border="0" alt="Powered By Apache OFBiz"/></a>
         </div>
         <div class="endcolumns"><span>&nbsp;</span></div>
     </div>
 </div>
-
+    
 <div class="centerarea contentarea">
 
 <h2 align="center">The Open For Business Project - Features Coming Soon</h2>
@@ -50,10 +46,10 @@
 
 <h3>Table of Contents</h3>
 <ul>
-  <li class="contenttext"><a href="#Inroduction">Inroduction</a>
-  <li class="contenttext"><a href="#MoreInfo">More Information</a>
+  <li class="contenttext"><a href="#Inroduction">Inroduction</a></li>
+  <li class="contenttext"><a href="#MoreInfo">More Information</a></li>
 </ul>
-<br>
+<br/>
 
 <hr class="sepbar"/>
 <h3><a name="Inroduction">Inroduction</a></h3>
@@ -106,173 +102,8 @@
 If you would like to see what is going on, or would like to participate and contribute to OFBiz
 this tool will help you do that.</p>
 
-<p class="contenttext">Now that you are excited about it and interested in it, you can access the <a href="http://jira.ofbiz.org">OFBiz Jira Server at http://jira.ofbiz.org</a>.
-
-<!--
-<p class="contenttext">This is an area of interest for many users and potential users of OFBiz.
-To date there hasn't been a lot of sponsorship for this functionality, but it may happen soon anyway
-because of the high level of interest in it and the growing number of potential contributors.</p>
-
-<p class="contenttext">For more information see the Wiki pages on plans for accounting, starting with:
-<a href="http://ofbizwiki.go-integral.com/Wiki.jsp?page=Accounting">Accounting Wiki Page</a>
-</p>
-
-<ul>
-  <li class="contenttext">Chart of Accounts
-  <ul>
-    <li class="contenttext">Global Chart of Accounts
-    <li class="contenttext">Subset Chart of Accounts for Companies/Divisions/Departments/etc
-    <li class="contenttext">Enables reporting for organizations at any level, limited only by the level granularity of entered data
-  </ul>
-  <li class="contenttext">Journaling
-  <ul>
-    <li class="contenttext">Manual Journalized Transaction Entry and Posting
-    <li class="contenttext">Service for trial balance
-    <li class="contenttext">Service for journal posting (uses trial balance service to check first)
-  </ul>
-  <li class="contenttext">General Ledger
-  <li class="contenttext">Basic Financial Statements
-  <ul>
-    <li class="contenttext">Income Statement
-    <li class="contenttext">Statement of Owner's Equity
-    <li class="contenttext">Balance Sheet
-    <li class="contenttext">Statement of Cash Flows
-  </ul>
-  <li class="contenttext">Other Reports and Statements
-  <li class="contenttext">Invoices and Payments
-  <ul>
-    <li class="contenttext">Extend existing functionality for manual entry &amp; usability enhancements
-  </ul>
-  <li class="contenttext">Automatic Transaction Creation and Posting
-  <ul>
-    <li class="contenttext">Invoices
-    <ul>
-        <li class="contenttext">Configure to/from accounts for different incoice item types
-        <li class="contenttext">Use GL Accounts configured for products purchased or sold
-    </ul>
-    <li class="contenttext">Inventory Changes
-    <li class="contenttext">Payments
-    <li class="contenttext">Notify about items that cannot be automatically posted
-    <li class="contenttext">When creating transactions handle purchase for re-sale or for internal use as asset
-  </ul>
-</ul>
-
-<br/>
-
-<hr class="sepbar"/>
-<h3><a name="Content">Content Management - Notes updated Feb 2004</a></h3>
-<hr class="sepbar"/>
-
-<p class="contenttext">The Content Management portion of OFBiz is one of the big next things
-coming. The generic content structures are suitable for both content and knowledge management
-and for content used in many different ways. Some uses include public/private/internet/intranet
-published materials, dynamic or aggregated content similar to concepts in software such as wiki,
-blogs, forums/threaded discussions, and combinations of these. In addition there will be
-facilities for template controlled content such as legal forms, surveys, etc.</p>
-
-<p class="contenttext">Please note that there are many different ideas about what content
-management should include, and this information will change as time goes on and ideas are better
-nailed down.</p>
-
-
-<ul>
-  <li class="contenttext">Role &amp; Task oriented special UIs for simpler management
-  <li class="contenttext">Add transform to create links &amp; other tools to handle site
-    structure for managed content, including expanding tree widget kind of like the
-    ProductCategory browser; would use hierarchical ContentAssocs for the data structure
-  <li class="contenttext">Wiki style permissions for community content site (like blogs, forums, etc; just different permissions)
-  <li class="contenttext">Add versioning to the data resource entities so that previous revisions can
-  be maintained (planning on using a simple mechanism when revision control is
-  desired and a certain resource is updated the old data will be put into
-  another data resource and the original will be updated with the new data and
-  will point to the now old data; ie clone resource, give new id, set id for
-  new resource as the previous version on the current resource, update the data
-  of the current resource; that way all content refering to a resource will get
-  the new content, but it will still be possible to roll-back to previous
-  versions; the other options would be construct a new content structure that
-  will be published when finished so that the current stuff remains untouched
-  until all of the new stuff is in place)
-  <li class="contenttext">Incorporate Lucene for text based searching of content
-  <li class="contenttext">Meta-data base parametric searching of content
-  <li class="contenttext">Searching for content related to products (including relationships with Product, ProductCategory, ProductFeature)
-  <li class="contenttext">Custom set of pages for public and private forums. These are
-  ad-hoc administered (with optional permissions) and (with optional permissions) browsed
-  content organized in threads or topics. The
-  content entities will probably work fine for these and it will allow them to
-  use existing features such as searching and templating.
-  <li class="contenttext">Add workflow managed content creation features so that when content is
-  created or updated a workflow can be started to manage editing, approval, publishing, etc.
-  <li class="contenttext">Create content constrained by templates, or more specifically document
-  definitions like DTDs or XML Schemas. The document definition will be a piece of content and
-  may have a workflow associated with it that is automatically started when content based on that
-  doc type is created/updated/etc.
-  <li class="contenttext">Web accessible mailing lists; basically a forum with email distribution &amp; posting of messages/replies through email
-</ul>
-
-<hr class="sepbar">
-<h3><a name="CRM">Customer Relationship Management (CRM) - Notes updated April 2004</a></h3>
-<hr class="sepbar">
-
-<p class="contenttext"></p>
-
-<ul>
-  <li class="contenttext">Call Center (Customer Service &amp; Sales)
-  <ul>
-    <li class="contenttext">In &amp; Out Call Screen, ie from one spot handle calls that come up, either incoming or outgoing
-    <li class="contenttext">Sales Oriented and Other Surveys, implementation of call scripts
-    <li class="contenttext">Communication Event Build Out - track info about calls, emails, other events
-  </ul>
-  <li class="contenttext">Marketing
-  <ul>
-    <li class="contenttext">Mass contact list management (email, phone, paper mail mass contacting)
-    <li class="contenttext">Analysis Reports (for sales, web traffic, etc; something along the lines of what CoreMetrics does)
-  </ul>
-  <li class="contenttext">Sales Management
-  <ul>
-    <li class="contenttext">Contact Management - Private &amp; Group Contacts
-    <li class="contenttext">Sales Pipeline/Workflow/Status Tracking
-  </ul>
-</ul>
-
-<hr class="sepbar">
-<h3><a name="WorkEffort">Work Effort &amp; Request, etc Management - Notes updated April 2004</a></h3>
-<hr class="sepbar">
-
-<p class="contenttext"></p>
-
-<ul>
-  <li class="contenttext">Build Out WorkEffort Pages, convert all to JP/BSH/FTL, etc
-  <li class="contenttext">Availability Scheduling
-  <ul>
-    <li class="contenttext">Use WorkEffort to schedule availability just like events, which denote specific reservations or "busy-ness"
-    <li class="contenttext">Services to check availability &amp; list availability according to constraints
-    <li class="contenttext">In calendar view show availability in light blue, not available in light grey, scheduled/event time in dark blue
-  </ul>
-  <li class="contenttext">Add FixedAsset scheduling (Facility scheduling mostly there already, but may need some extension)
-  <li class="contenttext">Build out request, requirement, work effort, quote, and order pages and relationships
-  <li class="contenttext">Create report showing tasks related to other artifacts: outstanding (not-complete); by priority, schedule, sponsorship (votes, etc), etc
-  <li class="contenttext">Associate WorkEfforts to Products for collecting sponsorship, votes, etc (semi-auto create Product, WorkEffort, etc from request)
-  <li class="contenttext">Software project management features to use with OFBiz... (whatever that means)
-  <li class="contenttext">Time tracking (timesheets etc); associate with WorkEffort (and possibly request, requirements; maybe only through WE); associate with Order/Invoice;
-  <li class="contenttext">Public &amp; Private WorkEfforts and Requests; on public calendars show the time as busy, but no details about the event
-  <li class="contenttext">Other Project Management Stuff Needed for OFBiz Use
-  <ul>
-    <li class="contenttext">Create "Projects" (maybe different than work efforts) with a home page, etc; public &amp; private projects
-    <li class="contenttext">Request (Issue) Assignment to parties associated with the project
-    <li class="contenttext">My Issues/Tasks etc page
-    <li class="contenttext">Allow per user customization of the issue/task/etc pages, save user settings in a database
-  </ul>
-</ul>
-
-<hr class="sepbar">
-<h3><a name="Manufacturing">Manufacturing Management - Notes updated Feb 2004</a></h3>
-<hr class="sepbar">
-
-<p class="contenttext">For more information see the Wiki pages on plans for accounting, starting with:
-<a href="http://ofbizwiki.go-integral.com/Wiki.jsp?page=Manufacturing">Manufacturing Wiki Page</a> and
-<a href="http://ofbizwiki.go-integral.com/Wiki.jsp?page=ProductConfiguratorNotes">Product Configurator Notes Wiki Page</a>
-</p>
--->
+<p class="contenttext">Now that you are excited about it and interested in it, you can access the
+<a href="https://issues.apache.org/jira/browse/OFBIZ">Apache OFBiz Jira Server at https://issues.apache.org/jira/browse/OFBIZ</a>.</p>
 
 </div>
 </body>

Modified: incubator/ofbiz/site/docs/setup.html
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/docs/setup.html?view=diff&rev=446521&r1=446520&r2=446521
==============================================================================
--- incubator/ofbiz/site/docs/setup.html (original)
+++ incubator/ofbiz/site/docs/setup.html Thu Sep 14 22:05:48 2006
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -27,14 +26,12 @@
 <div class="headerboxoutside">
     <div class="headerboxtop">
         <div class="left">
-            <a href="http://www.ofbiz.org"><img src="../images/ofbiz_logo.jpg"  border="0" alt="The Open For Business Project"/></a>
+            <a href="http://incubator.apache.org/ofbiz/"><img src="images/ofbiz_logo.jpg"  border="0" alt="The Open For Business Project"/></a>
         </div>
         <div class="right">
-            <a href="http://www.java.net"><img src="http://today.java.net/images/javanet_button_90.gif" width="90" height="25" border="0" alt="java.net Member Button"/></a>
-            &nbsp;&nbsp;
-            <a href="http://sf.net/projects/ofbiz"><img src="http://sourceforge.net/sflogo.php?group_id=27173" width="88" height="31" border="0" alt="SourceForge Logo"/></a>
-            &nbsp;&nbsp;
-            <a href="http://www.ofbiz.org"><img src="../images/ofbiz_powered.gif" width="88" border="0"/></a>
+            <a href="http://incubator.apache.org/projects/ofbiz.html"><img src="http://incubator.apache.org/images/apache-incubator-logo.png" width="120" alt="Apache Incubator" border="0"/></a>
+            &nbsp;
+            <a href="http://incubator.apache.org/ofbiz/"><img src="images/ofbiz_powered.gif" width="88" border="0" alt="Powered By Apache OFBiz"/></a>
         </div>
         <div class="endcolumns"><span>&nbsp;</span></div>
     </div>
@@ -44,18 +41,7 @@
 
 <h2 align="center">The Open For Business Project: General Setup</h2>
 <br/>
-Written by: David E. Jones and Andy Zeneski<br/>
-Email: <a href="mailto:[hidden email]">[hidden email]</a> or <a
- href="mailto:[hidden email]">[hidden email]</a> <br/>
-Edited by Les Austin<br/>
-Open For Business Site: <a href="http://www.ofbiz.org/">http://www.ofbiz.org</a>&nbsp;
-<br/>
-<a href="http://sf.net/projects/ofbiz"> <img
- src="http://sourceforge.net/sflogo.php?group_id=27173"
- alt="SourceForge Logo" border="0"/></a> <br/>
-Founders and Lead Architects: David E. Jones &amp; Andy Zeneski <br/>
-Last Updated: 23 January 2006<br/>
-<h3 align="left"><a name="Table of Contents">Table of Contents</a></h3>
+<h3 align="left"><a name="Table_of_Contents">Table of Contents</a></h3>
 <ul>
   <li><a href="#Introduction">Introduction</a></li>
   <li><a href="#Quick_Easy_Setup">Quick &amp; Easy Setup</a></li>
@@ -75,9 +61,10 @@
 the Service Engine Configuration Guide, and other related documents.</p>
 
 <p>If you run into trouble there are various resources available to help.
-The first steps would be to search on the <a href="http://ofbizwiki.go-integral.com/">OFBiz Wiki</a>, and then on the
-<a href="http://lists.ofbiz.org/">OFBiz Mailing Lists</a>. If you can't find you answer there, then subscribe
-to the <a href="http://lists.ofbiz.org/mailman/listinfo/users">OFBiz Users Mailing List</a>, and send a message with as much detail
+The first steps would be to search on the <a href="http://docs.ofbiz.org/">New OFBiz Docs Site</a>
+<a href="http://ofbizwiki.go-integral.com/">Old OFBiz Wiki</a>, and then on the
+OFBiz Mailing Lists. If you can't find you answer there, then subscribe
+to the <a href="http://mail-archives.apache.org/mod_mbox/incubator-ofbiz-user/">Apache OFBiz Users Mailing List</a>, and send a message with as much detail
 as possible about the problem you are having.</p>
 
 <br/>
@@ -88,11 +75,11 @@
 distribution and following some simple instructions. For more
 options and explanations, see the rest of this document.</p>
 <ol>
-  <li>Download and install the Java 2 v1.4 or later (but only in the 1.4 series, <b>not 1.5</b>) JDK/J2SDK (not the
+  <li>Download and install the Java 2 v1.4 or v1.5 series JDK/J2SDK (not the
 JRE, you need the full SDK) from <a href="java.sun.com">Sun's Java (J2SE) site</a>, and make sure
 your JAVA_HOME environment variable is set to this JDK after installation
-(NOTE that for Mac OS X no JVM setup is needed, just make sure you are up to date with the Java 1.4 series with the OS X Software Update facility)</li>
-  <li>Download the OFBiz Apps archive and unzip it in the directory of
+(NOTE that for Mac OS X no JVM setup is needed, just make sure Java is up to date with the OS X Software Update facility)</li>
+  <li>Download the OFBiz release archive and unzip it in the directory of
 your choice. This should create one sub-directory: <b>ofbiz</b>. This
 will be the OFBIZ_HOME location.</li>
   <li>Start OFBiz with embedded Tomcat by going into the <b>ofbiz</b>
@@ -116,8 +103,7 @@
 <hr/>
 
 <p>When building from SVN you will need to have a
-Java 1.4 or newer J2SDK (NOT just the JRE, need to full SDK;
-also make sure it is a 1.4 series and not a 1.5 series JDK) as mentioned above.
+Java 1.4 or 1.5 series J2SDK (NOT just the JRE, need to full SDK) as mentioned above.
 The build is done using Ant, and sufficient Ant libraries
 are included with OFBiz. If you have Ant installed separately
 just make sure you have version 1.5 or later, and then run Ant
@@ -126,16 +112,19 @@
 <p>In the directory where you want OFBiz to be, do a SVN checkout of
 the ofbiz module on the java.net servers. For example: </p>
 
-<p><code>svn co http://svn.ofbiz.org/svn/ofbiz/trunk ofbiz</code></p>
+<p><code>svn co http://svn.apache.org/repos/asf/incubator/ofbiz/trunk ofbiz</code></p>
 
-<p>For information on connecting to SVN <a href="http://svn.ofbiz.org/" target="_blank">click here (svn.ofbiz.org).</a></p>
+<p>For information on connecting to SVN <a href="http://incubator.apache.org/ofbiz/svn.html" target="_blank">click here (http://incubator.apache.org/ofbiz/svn.html).</a></p>
 
 <p>Now go into the "ofbiz" directory and run <b>"ant.bat"</b> (Windows), or <b>"./ant"</b> (Linux/Unix/OSX). It will compile all
 modules and leave you an executable jar (ofbiz.jar) in the "ofbiz" directory.</p>
 
-<p>To load the seed data, run <b>"ant.bat run-install"</b> or <b>"%JAVA_HOME%\bin\java -jar ofbiz.jar install"</b> (Windows), or <b>"./ant run-install"</b> or
+<p>To load the seed and demo data, run <b>"ant.bat run-install"</b> or <b>"%JAVA_HOME%\bin\java -jar ofbiz.jar install"</b> (Windows), or <b>"./ant run-install"</b> or
 <b>"$JAVA_HOME/bin/java -jar ofbiz.jar install"</b> (Linux/Unix/OSX)</p>
 
+<p>As an alternative to the previous step: to load the seed data only, run <b>"ant.bat run-install-seed"</b> or <b>"%JAVA_HOME%\bin\java -jar ofbiz.jar install -readers=seed"</b> (Windows), or <b>"./ant run-install-seed"</b> or
+<b>"$JAVA_HOME/bin/java -jar ofbiz.jar install -readers=seed"</b> (Linux/Unix/OSX)</p>
+    
 <p>To start the server run <b>"ant.bat run"</b> or <b>"%JAVA_HOME%\bin\java -jar ofbiz.jar"</b> (Windows), or <b>"./ant run"</b> or <b>"$JAVA_HOME/bin/java -jar ofbiz.jar"</b> (Linux/Unix/OSX)</p>
 
 <p>Another build option in the Ant build script that is useful is
@@ -202,7 +191,7 @@
 <h3><a name="J2EE_Containers">J2EE Containers</a></h3>
 <hr/>
 <p>OFBiz comes and runs by default with Tomcat for a Servlet/JSP container and
-JOTM for a transaction (JTA) manager. A patched version of Minerva (included in SVN)
+the Geronimo Transaction Manager for a transaction (JTA) manager. A patched version of Minerva (included in SVN)
 is the current preference for a transaction aware connection pool, though as
 other options are made available that may change.</p>
 
@@ -215,8 +204,8 @@
 created a configuration and script template tool that takes the classpath and webapp
 settings from the various OFBiz files to more easily generate the files you need.
 For more information, see the README file in the ofbiz/framework/appservers directory.
- If you are looking for a good commercial J2EE app
-server, Orion is a good place to start, but we recommend trying out Tomcat and JOTM
+If you are looking for a good commercial J2EE app
+server, Orion is a good place to start, but we recommend trying out Tomcat and Geronimo TM
 and see if they meet your needs.</p>
 
 </div>

Modified: incubator/ofbiz/site/documents.html
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/documents.html?view=diff&rev=446521&r1=446520&r2=446521
==============================================================================
--- incubator/ofbiz/site/documents.html (original)
+++ incubator/ofbiz/site/documents.html Thu Sep 14 22:05:48 2006
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -147,23 +146,23 @@
         Or go directly to the <a href="http://www.undersunconsulting.com/ecommerce/control/main?atc=OFB">Undersun Store</a>.</li>
 </ul>
     
-<div class="contenttext"><b><u>Documents on Other Sites</u></b></div>
-<ul>
-    <li class="contenttext"><a href="http://ofbizwiki.go-integral.com/Wiki.jsp?page=Main">The OFBiz Wiki</a> hosted by Integral Business Solutions</li>
-    <li class="contenttext">Open Source Strategies: <a href="http://www.opensourcestrategies.com/ofbiz/tutorials.php">OFBiz Tutorials</a> by Si Chen</li>
-    <li class="contenttext"><a href="http://ofbizwiki1.go-integral.com/Wiki.jsp?page=OFBizInsiderTutorial">OFBiz: An Insider's View</a> by Basil Arkasosy</li>
-</ul>
-        
 <div class="contenttext"><b><u>Configuration Documents</u></b></div>
 <ul>
-  <li class="contenttext"><a href="http://www.undersunconsulting.com/control/onlineinfo.html?atc=OFB">OFBiz Basic Production Setup Guide</a>
-    NOTE: This is a free download meant to help you get going with OFBiz. It is sponsored by
+    <li class="contenttext"><a href="http://docs.ofbiz.org/x/j">OFBiz Basic Production Setup Guide</a>
+    NOTE: This is a free document meant to help you get going with OFBiz. It is now community maintained and was originally sponsored by
     <a href="http://www.undersunconsulting.com/control/home.html" target="_blank">Undersun Consulting</a> and
     <a href="http://www.go-integral.com" target="_blank">Integral Business Solutions</a>.</li>
   <li class="contenttext"><a href="docs/setup.html">Setup &amp; Installation</a></li>
   <li class="contenttext"><a href="docs/coreconfig.html">OFBiz Framework Configuration Guide</a></li>
   <li class="contenttext"><a href="docs/entityconfig.html">Entity Engine (database) Configuration Guide</a></li>
   <li class="contenttext"><a href="docs/serviceconfig.html">Service Engine Configuration Guide</a></li>
+</ul>
+
+<div class="contenttext"><b><u>Documents on Other Sites</u></b></div>
+<ul>
+    <li class="contenttext"><a href="http://ofbizwiki.go-integral.com/Wiki.jsp?page=Main">The OFBiz Wiki</a> hosted by Integral Business Solutions</li>
+    <li class="contenttext">Open Source Strategies: <a href="http://www.opensourcestrategies.com/ofbiz/tutorials.php">OFBiz Tutorials</a> by Si Chen</li>
+    <li class="contenttext"><a href="http://ofbizwiki1.go-integral.com/Wiki.jsp?page=OFBizInsiderTutorial">OFBiz: An Insider's View</a> by Basil Arkasosy</li>
 </ul>
 
 <div class="contenttext"><b><u>Best Practices</u></b></div>

Modified: incubator/ofbiz/site/index.html
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/index.html?view=diff&rev=446521&r1=446520&r2=446521
==============================================================================
--- incubator/ofbiz/site/index.html (original)
+++ incubator/ofbiz/site/index.html Thu Sep 14 22:05:48 2006
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -145,13 +144,13 @@
 
         <h2>Download OFBiz</h2>
         <a href="http://incubator.apache.org/ofbiz/docs/GettingAndUsingOFBiz.pdf">Getting And Using OFBiz (PDF)</a>
-        <a href="http://www.undersunconsulting.com/control/onlineinfo.html?atc=OFB">Production Setup Guide</a>
+        <a href="http://docs.ofbiz.org/x/j">Production Setup Guide</a>
         <a href="svn.html">Source Access (Recommended)</a>
         <a href="releasenotes.html"><b>Release Notes</b></a>
         <a href="http://sourceforge.net/project/showfiles.php?group_id=27173">Download Releases</a>
         <a href="http://www.opensourcestrategies.com/ofbiz/downloads.php">Weekly Builds</a>
         <a href="documents.html">Documentation</a>
-        <a href="ofbizmitlicense.html">Copyright &amp; License</a>
+        <a href="ofbizlicense.html">Copyright &amp; License</a>
       
         <h2>Resources &amp; Tools</h2>
         <a href="http://incubator.apache.org/projects/ofbiz.html">Apache Incubator Status</a>
@@ -297,6 +296,7 @@
             <a href="http://www.steinersports.com/ssm/control/home" target="_blank">***Steiner Sports</a>
             <a href="http://www.totes-isotoner-sales.com/ecommerce/control/main" target="_blank">**totes >> ISOTONER</a>
             <a href="http://www.ulta.com/control/main" target="_blank">***Ulta</a>
+            <a href="http://www.undersunconsulting.com/control/home.html" target="_blank">**Undersun Consulting</a>
             <a href="http://store.xinit.com/ecommerce/control/main" target="_blank">***Xinit Systems</a>
             <a href="http://www.worldfranchisecouncil.org/control/cpview?contentId=WFC_HOME" target="_blank">**World Franchise Council</a>
           </p>

Modified: incubator/ofbiz/site/marketing.html
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/marketing.html?view=diff&rev=446521&r1=446520&r2=446521
==============================================================================
--- incubator/ofbiz/site/marketing.html (original)
+++ incubator/ofbiz/site/marketing.html Thu Sep 14 22:05:48 2006
@@ -319,6 +319,7 @@
                 <div><a class="buttontext" href="http://www.techmate.co.uk/techmate/control/home" target="_blank">*Techmate</a></div>
                 <div><a class="buttontext" href="http://www.totes-isotoner-sales.com/ecommerce/control/main" target="_blank">**totes >> ISOTONER</a></div>
                 <div><a class="buttontext" href="http://www.ulta.com/control/main" target="_blank">***Ulta</a></div>
+                <div><a class="buttontext" href="http://www.undersunconsulting.com/control/home.html" target="_blank">**Undersun Consulting</a></div>
                 <div><a class="buttontext" href="https://www.warmspirit.org/ecommerce/control/main?PURCHASE_STATE=STANDARD" target="_blank">**Warm Spirit</a></div>
                 <div><a class="buttontext" href="http://store.xinit.com/ecommerce/control/main" target="_blank">***Xinit Systems</a></div>
                 <div><a class="buttontext" href="http://www.worldfranchisecouncil.org/control/cpview?contentId=WFC_HOME" target="_blank">**World Franchise Council</a></div>

Copied: incubator/ofbiz/site/ofbizlicense.html (from r443217, incubator/ofbiz/site/ofbizmitlicense.html)
URL: http://svn.apache.org/viewvc/incubator/ofbiz/site/ofbizlicense.html?view=diff&rev=446521&p1=incubator/ofbiz/site/ofbizmitlicense.html&r1=443217&p2=incubator/ofbiz/site/ofbizlicense.html&r2=446521
==============================================================================
--- incubator/ofbiz/site/ofbizmitlicense.html (original)
+++ incubator/ofbiz/site/ofbizlicense.html Thu Sep 14 22:05:48 2006
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-
 Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -18,35 +17,22 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-<head><title>OFBiz Copyright and Open Source License (new Apache 2.0 License and old MIT License)</title></head>
+<head><title>Apache OFBiz Copyright and Open Source License (Apache 2.0 License)</title></head>
 <body>
         
-    <h3>Apache Software Foundation Copyright and Apache 2.0 Open Source License</h3>
-    
-    <p>Copyright 2001-2006 The Apache Software Foundation</p>
+<p>Copyright 2001-2006 The Apache Software Foundation</p>
 
 <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of
-    the License at</p>
+the License at</p>
 
-    <p>http://www.apache.org/licenses/LICENSE-2.0</p>
+<p><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a></p>
 
 <p>Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations
-    under the License.</p>
-    
-
-<h3>OFBiz Copyright and MIT Open Source License</h3>
-
-<p>Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org</p>
-
-<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
-
-<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
-
-<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+under the License.</p>
 
 </body>
 </html>