Author: jleroux
Date: Mon Jun 13 15:23:37 2016
New Revision: 1748260
URL: http://svn.apache.org/viewvc?rev=1748260&view=rev
Log:
A patch from Ankit Joshi for "http://docs.ofbiz.org/ is wrongly used in
content" https://issues.apache.org/jira/browse/OFBIZ-7001
There are 31 occurrences and most use shortcuts. They should be converted to
link to the current wiki, of course the previous shortcuts are no longer valid.
We need to replace them by hand, hence 1st find what the old shortcuts were,
and then replace them with new shortcuts, or even better real links. We got
bitten once by shortcuts, it's enough...
Modified:
ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml
ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl
ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMenu.ftl
Modified:
ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
(original)
+++
ofbiz/trunk/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
Mon Jun 13 15:23:37 2016
@@ -31,7 +31,7 @@
<section>
<title>Subsection 2 title</title>
<para>
- for more info see the <link xl:href="http://docs.ofbiz.org";>OFBiz
documentation site</link> for more info.
+ for more info see the <link
xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home";>OFBiz
documentation site</link> for more info.
</para>
</section>
</section>
Modified: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml (original)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml Mon Jun 13
15:23:37 2016
@@ -32,7 +32,7 @@
<title>Subsection 2 title</title>
<para>
The Main catalog help screen. For more information please
- see the <link xl:href="http://docs.ofbiz.org";>OFBiz documentation
site</link> for more info.
+ see the <link
xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home";>OFBiz
documentation site</link> for more info.
</para>
</section>
</section>
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Mon Jun
13 15:23:37 2016
@@ -2901,7 +2901,7 @@
<value xml:lang="zh-TW">iCalè¼å©</value>
</property>
<property key="WorkEffortICalendarHelpUrl">
- <value xml:lang="en">http://docs.ofbiz.org/x/piE</value>
+ <value
xml:lang="en">https://cwiki.apache.org/confluence/display/OFBENDUSER/iCalendar+Integration</value>
</property>
<property key="WorkEffortICalendarName">
<value xml:lang="de">Kalendername</value>
Modified: ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/documents/ApacheOfbiz.xml Mon Jun 13
15:23:37 2016
@@ -28,7 +28,7 @@
<abstract>
<para>
This Book is currently in an experimental stage. It will be
the start of moving the OFBiz documentation from the current
- <link xl:href="http://docs.ofbiz.org";>OFBiz documentation
site</link> and the old ofbiz website (Entity documents) to the OFBiz content
component.
+ <link
xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home";>OFBiz
documentation site</link> and the old ofbiz website (Entity documents) to the
OFBiz content component.
The layout is currently open for discussion by the OFBiz
community.
</para>
<para>
Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMain.ftl Mon Jun 13
15:23:37 2016
@@ -24,11 +24,11 @@ under the License.
<p><a href="http://us.apachecon.com/c/acus2008/";><img
src="http://www.apache.org/ads/ApacheCon/2008-usa-125x125.png"; alt="ApacheCon
US 2008" align="left"/></a>
<b>CHECK IT OUT!</b> There is a special <a
href="http://us.apachecon.com/c/acus2008/schedule/ofbiz-symposium";>OFBiz
Symposium</a> at <a href="http://us.apachecon.com/c/acus2008/";>ApacheCon US
2008</a> in New Orleans on Novemver 3-7. This event includes 2 days of training
sessions, 2 days of conference presentations, and BOF sessions in the evening
after the conference. Because it is a part of ApacheCon attendees can also
enjoy other ApacheCon training and conference sessions and participate in other
events including the Hackathon, Barcamp Apache (wiki driven unconference), and
the Expo (show floor) which will include companies using OFBiz as well as
others. See <a
href="http://us.apachecon.com/c/acus2008/schedule/ofbiz-symposium";>schedule
details here</a>, and <a
href="http://guest.cvent.com/i.aspx?4W,M3,e057feb1-c5f1-4430-a0ce-c4d78049759e";>register
here</a>.</p>
- <p>There are new features every day in OFBiz. For a summary <a
href="http://docs.ofbiz.org/x/-Qs";>see new feature summary here</a>.</p>
+ <p>There are new features every day in OFBiz. For a summary <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features";>see
new feature summary here</a>.</p>
<p> - Accounting: auto-posting services in testing and
reports in build-out</p>
<p> - Project Management: extension of the WorkEffort and
other base components, initially complete and being refined</p>
<p>Free Training Videos are now available that offer an introduction
to the Apache OFBiz Framework, based on the example component.
- They can be <a href="http://docs.ofbiz.org/x/PQM";>downloaded
here</a>.</p>
+ They can be <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams";>downloaded
here</a>.</p>
</div>
@@ -49,13 +49,13 @@ under the License.
<p>For answers to your questions you might find the following
documents useful:
- <a href="http://docs.ofbiz.org/x/lQM";>Project Overview</a>,
- <a href="http://docs.ofbiz.org/x/hgM";>Is Apache OFBiz for Me?</a>,
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Project+Overview";>Project
Overview</a>,
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Is+OFBiz+for+Me";>Is
Apache OFBiz for Me?</a>,
<a href="feature-list.html">Feature List</a>, and
<a href="comingsoon.html">Features Coming Soon</a>
</p>
- <p>For more technical information, see the <a
href="http://docs.ofbiz.org/x/Swg";>Documentation</a> page.</p>
+ <p>For more technical information, see the <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index";>Documentation</a>
page.</p>
<p>Apache OFBiz offers a great deal of functionality, including:</p>
@@ -131,7 +131,7 @@ under the License.
<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>
- <p>For a more complete list of sites see the <a
href="http://docs.ofbiz.org/x/ZQM";>Apache OFBiz User List</a> page.</p>
+ <p>For a more complete list of sites see the <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List";>Apache
OFBiz User List</a> page.</p>
</div>
<div id="inthenews">
@@ -183,7 +183,7 @@ under the License.
<p>OFBiz is in the Apache Incubator. See the status here: <a
href="http://incubator.apache.org/projects/ofbiz.html";>here</a>.</p>
<p>Free Training Videos are now available that offer an introduction
to the Apache OFBiz Framework, based on the example component.
- They can be downloaded <a
href="http://docs.ofbiz.org/x/PQM";>here</a>.</p>
+ They can be downloaded <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams";>here</a>.</p>
<p>The 2005 OFBiz Users Conference turned out Great! The video
recordings are available <a href="VideosConf.html">here</a>.</p>
@@ -200,7 +200,7 @@ under the License.
<p>New Case Study from Integral Business Solutions about their projects
based on Apache OFBiz, especially recent work they have done for the
US Air Force. <a href="IntegralAirForceCaseStudy.pdf">Download the complete
document here.</a></p>
- <p>Apache OFBiz Basic Production Setup document Now Available: <a
href="http://docs.ofbiz.org/x/j";>Apache OFBiz Production Setup Guide</a>.
+ <p>Apache OFBiz Basic Production Setup document Now Available: <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Technical+Production+Setup+Guide";>Apache
OFBiz Production Setup Guide</a>.
This is a free download meant to help you get going with Apache OFBiz.
It is sponsored by
<a href="http://www.hotwaxmedia.com/?atc=OFB"; target="_blank">Hotwax
Media</a> and
<a href="http://www.go-integral.com"; target="_blank">Integral Business
Solutions</a>.
Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMenu.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMenu.ftl?rev=1748260&r1=1748259&r2=1748260&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMenu.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/OfbizMenu.ftl Mon Jun 13
15:23:37 2016
@@ -19,18 +19,18 @@ under the License.
<div id="link-column">
<h2>What is Apache OFBiz?</h2>
- <a href="http://docs.ofbiz.org/x/lQM";>Project Overview</a>
- <a href="http://docs.ofbiz.org/x/hgM";>Is OFBiz for Me?</a>
- <a href="http://docs.ofbiz.org/x/-Qs";>Main New Features</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Project+Overview";>Project
Overview</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Is+OFBiz+for+Me";>Is
OFBiz for Me?</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features";>Main
New Features</a>
<a href="comingsoon.html">Features Coming Soon</a>
<a href="feature-list.html">Feature List</a>
- <a href="http://docs.ofbiz.org/x/ZQM";>User List</a>
- <a href="http://docs.ofbiz.org/x/UwM";>User Stories</a>
- <a href="http://docs.ofbiz.org/x/jQM";>Brochures, etc</a>
- <a href="http://docs.ofbiz.org/x/Swg";>Documentation</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List";>User
List</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+Stories";>User
Stories</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/General+Material+for+Branding+and+Marketing";>Brochures,
etc</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index";>Documentation</a>
<a href="VideosConf.html">Conference Videos</a>
- <a href="http://docs.ofbiz.org/x/PQM";>Framework Intro Videos</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams";>Framework
Intro Videos</a>
<h2>Demo Sites</h2>
@@ -45,26 +45,26 @@ under the License.
<a href="http://docs.ofbiz.org/x/yg4"; target="_blank">Alternative Demo
Servers</a>
<h2>Download OFBiz</h2>
- <a href="http://docs.ofbiz.org/x/rwM";>Getting Started (Read this
first)</a>
- <a href="http://docs.ofbiz.org/x/mAM";>Copyright & License</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Getting+Started";>Getting
Started (Read this first)</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Copyright+and+License";>Copyright
& License</a>
- <a href="http://docs.ofbiz.org/x/mgM";>Source Access (Recommended)</a>
+ <a href="https://ofbiz.apache.org/source-repositories.html";>Source
Access (Recommended)</a>
<a href="http://build.hotwaxmedia.com/";>Nightly Builds (Ready to
use)</a>
<h2>Resources & Tools</h2>
- <a href="http://docs.ofbiz.org/x/Swg";>Main Documentation Page</a>
- <a href="http://docs.ofbiz.org/x/yAk";>Mailing Lists</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index";>Main
Documentation Page</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mailing+Lists";>Mailing
Lists</a>
<a href="https://issues.apache.org/jira/browse/OFBIZ";>Issue Tracker
(Jira)</a>
- <a href="http://docs.ofbiz.org/x/mgM";>Source Repository (SVN)</a>
+ <a href="https://ofbiz.apache.org/source-repositories.html";>Source
Repository (SVN)</a>
<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://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>
- <a href="http://docs.ofbiz.org/x/SgU";>Open Source Projects,
Standards</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books";>Books</a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Open+Source+Projects+and+Standards";>Open
Source Projects, Standards</a>
<!-- DEJ20080122 commenting these out, may want to totally remove
eventually as they are only of interest for historical purposes
<h2>Old Resources</h2>
@@ -99,7 +99,7 @@ under the License.
<a href="http://www.openegovernment.org";>Government</a>
<h2>Service Providers</h2>
- <a href="http://docs.ofbiz.org/x/JAM"; target="_blank"><b>Complete
Listing on Wiki</b></a>
+ <a
href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Service+Providers";
target="_blank"><b>Complete Listing on Wiki</b></a>
<a href="http://www.hotwaxmedia.com/?atc=OFB";
target="_blank"><b>Hotwax Media</b></a>
<a href="http://www.antwebsystems.com"; target="_blank"><b>Ant
Websystems</b></a>
<a href="http://www.opensourcestrategies.com/ofbiz/";
target="_blank"><b>Open Source Strategies, Inc.</b></a>
![http://www.apache.org/ads/ApacheCon/2008-usa-125x125.png"](http://www.apache.org/ads/ApacheCon/2008-usa-125x125.png"){kind=link}