You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by bp...@apache.org on 2019/12/29 17:20:53 UTC

svn commit: r1872085 - in /db/derby/site/trunk/src/documentation/content/xdocs: ./ blogs/ integrate/ manuals/ papers/ papers/DerbyTut/

Author: bpendleton
Date: Sun Dec 29 17:20:53 2019
New Revision: 1872085

URL: http://svn.apache.org/viewvc?rev=1872085&view=rev
Log:
DERBY-7061: correct links to wiki

Modified:
    db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/derby_comm.xml
    db/derby/site/trunk/src/documentation/content/xdocs/faq.xml
    db/derby/site/trunk/src/documentation/content/xdocs/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/JPOX_Derby.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/SQuirreL_Derby.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_ddlutils.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
    db/derby/site/trunk/src/documentation/content/xdocs/manuals/dita.xml
    db/derby/site/trunk/src/documentation/content/xdocs/manuals/docscheck.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_htw.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml Sun Dec 29 17:20:53 2019
@@ -24,7 +24,7 @@
 
     <p>
       Here we collect articles about Derby. Please also check the
-      <a href="http://wiki.apache.org/db-derby/">Derby Wiki</a> for smaller write-ups.
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a> for smaller write-ups.
     </p>
 
       <p>
@@ -379,7 +379,7 @@
 	  </p>
 
 	  <p>
-	    <a href="http://wiki.apache.org/db-derby/HibernateHelp">HibernateHelp</a><br/>
+	    <a href="https://cwiki.apache.org/confluence/display/DERBY/HibernateHelp">HibernateHelp</a><br/>
 
 	    This wiki page documents various peoples' experience using
 	    Hibernate with Derby.

Modified: db/derby/site/trunk/src/documentation/content/xdocs/derby_comm.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/derby_comm.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/derby_comm.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/derby_comm.xml Sun Dec 29 17:20:53 2019
@@ -42,7 +42,7 @@ so send the community your feedback:
    Subscribe to the <a href="derby_mail.html">Derby mail lists</a>.
   </li>
   <li>
-   Add your wisdom to the <a href="http://wiki.apache.org/db-derby">Derby Wiki</a>.
+   Add your wisdom to the <a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a>.
   </li>
 
   <li>
@@ -220,26 +220,26 @@ here are a few guidelines:
 
 <p>
 Additional information for contributors is on the 
-<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>. Below
+<a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a>. Below
 is just a sampling of the topics covered:
 </p>
 
 <ul>
- <li><a href="http://wiki.apache.org/db-derby/DerbyDev">For
+ <li><a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyDev">For
    Developers</a>: Information for Derby developers.
  </li>
- <li><a href="http://wiki.apache.org/db-derby/ForNewDevelopers">For New
+ <li><a href="https://cwiki.apache.org/confluence/display/DERBY/ForNewDevelopers">For New
    Developers</a>: Information to get started with Derby development.
  </li>
  <li>
-  <a href="http://wiki.apache.org/db-derby/DerbyContributorChecklist">Derby
+  <a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyContributorChecklist">Derby
       Contributor Checklist</a>: Tips for developers contributing code to Derby.
  </li>
  <li>
-  <a href="http://wiki.apache.org/db-derby/DerbyJUnitTesting">Derby
-      JUnit Testing</a> and <a href="http://wiki.apache.org/db-derby/DerbyTopLevelJunitTests">Derby Top-Level Tests</a>: Information on running the various Derby test suites.
+  <a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyJUnitTesting">Derby
+      JUnit Testing</a> and <a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyTopLevelJunitTests">Derby Top-Level Tests</a>: Information on running the various Derby test suites.
  </li>
- <li> <a href="http://wiki.apache.org/db-derby/DerbyCommitProcess">Derby
+ <li> <a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyCommitProcess">Derby
        Commit Process</a>: How a change to Derby actually gets committed.</li>
 </ul>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/faq.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/faq.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/faq.xml Sun Dec 29 17:20:53 2019
@@ -144,7 +144,7 @@
         <p> The
 	<a href="papers/index.html#Derby+Engine">Derby Engine</a>
         papers and the
-        <a href="http://wiki.apache.org/db-derby/HowItWorks">HowItWorks</a>
+        <a href="https://cwiki.apache.org/confluence/display/DERBY/HowItWorks">HowItWorks</a>
         Wiki page are good starting points.
 	Also browse the
 	<a href="derby_mail.html">derby-dev@db.apache.org</a>
@@ -190,7 +190,7 @@
       </question>
       <answer>
 	<p>See the Eclipse and Netbeans instructions on the 
-        <a href="http://wiki.apache.org/db-derby/BuildingDerby">BuildingDerby</a>
+        <a href="https://cwiki.apache.org/confluence/display/DERBY/BuildingDerby">BuildingDerby</a>
         Wiki page.
 	</p>
       </answer>
@@ -287,7 +287,7 @@
       <answer>
       <p>
       Of course! For more information,
-      start <a href="http://wiki.apache.org/db-derby/InMemoryBackEndPrimer">
+      start <a href="https://cwiki.apache.org/confluence/display/DERBY/InMemoryBackEndPrimer">
           here</a>.
       </p>
       </answer>
@@ -303,7 +303,7 @@
       the web site includes a writeup on how to use
       <a href="integrate/SQuirreL_Derby.html">SQuirreL SQL</a>
       with Derby, and the
-      <a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/UsesOfDerby">UsesOfDerby</a>
       Wiki page list other GUIs that work with Derby.
       </p>
       </answer>
@@ -319,7 +319,7 @@
       Details are in the
       <a href="http://db.apache.org/derby/docs/10.13/devguide/cdevdvlp34964.html">Developer's Guide</a>
       and helpful tips are on the
-      <a href="http://wiki.apache.org/db-derby/DatabaseNamesRelativeAbsolute">Derby
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/DatabaseNamesRelativeAbsolute">Derby
       Wiki</a>.
       </p>
       </answer>
@@ -330,7 +330,7 @@
       </question>
       <answer>
       <p>
-      The <a href="http://wiki.apache.org/db-derby/DerbyWindowsService">Derby
+      The <a href="https://cwiki.apache.org/confluence/display/DERBY/DerbyWindowsService">Derby
       Wiki</a> provides pointers to information on how to run Derby as a
       Windows service.
       </p>
@@ -344,7 +344,7 @@
       <p>
       You can use the sysinfo tool or the JDBC API to get version 
       information from your Derby installation. See the 
-      <a href="http://wiki.apache.org/db-derby/VersionInfo">VersionInfo 
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/VersionInfo">VersionInfo 
       wiki page</a> for more details. 
       </p>
       </answer>
@@ -430,7 +430,7 @@
       the Derby Reference Manual (available from the 
       <a href="manuals/index.html">Documentation page</a>). Development 
       notes are available on the 
-      <a href="http://wiki.apache.org/db-derby/OLAPRowNumber">OLAPRowNumber 
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/OLAPRowNumber">OLAPRowNumber 
       wiki page</a>.
       </p>
       <p>
@@ -498,7 +498,7 @@
       to narrow down which statements may be holding the locks.
       </p>
       <p>Further information is available on the 
-      <a href="http://wiki.apache.org/db-derby/LockDebugging">LockDebugging</a>
+      <a href="https://cwiki.apache.org/confluence/display/DERBY/LockDebugging">LockDebugging</a>
       wiki page.
       </p>
       </answer>
@@ -533,7 +533,7 @@
       Yes, you can use derby for client-server applications.
       Starting in 10.1 Derby included the
       <a href="http://db.apache.org/derby/docs/10.13/adminguide/cadminappsclient.html">Derby Network Client jdbc driver</a>.
-      The <a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+      The <a href="https://cwiki.apache.org/confluence/display/DERBY/UsesOfDerby">UsesOfDerby</a>
       Wiki pages lists additional drivers, including
       <a href="http://c-jdbc.objectweb.org/">C-JDBC</a>
       and the

Modified: db/derby/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/index.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Sun Dec 29 17:20:53 2019
@@ -36,7 +36,7 @@ Some key advantages include:
   <li> Derby has a small footprint -- about 3.5 megabytes for the base engine
        and embedded JDBC driver.</li>
   <li> Derby is based on the Java, JDBC, and
-       <a href="http://wiki.apache.org/db-derby/SQLvsDerbyFeatures">SQL</a>
+       <a href="https://cwiki.apache.org/confluence/display/DERBY/SQLvsDerbyFeatures">SQL</a>
        standards.
   </li>
   <li> Derby provides an embedded JDBC driver that lets you 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/JPOX_Derby.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/integrate/JPOX_Derby.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/JPOX_Derby.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/JPOX_Derby.xml Sun Dec 29 17:20:53 2019
@@ -867,7 +867,7 @@ Shutting down JPOX persistence manager.
 
 <section><title>Resources and Acknowledgements</title>
 <p>
-The <a href="http://db.apache.org/derby/">Derby</a> web site and <a href="http://wiki.apache.org/db-derby/">wiki</a> are the best sources of information about Derby.
+The <a href="http://db.apache.org/derby/">Derby</a> web site and <a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">wiki</a> are the best sources of information about Derby.
 </p>
 <p>For in-depth information about JPOX see the <a href="http://www.jpox.org/index.jsp">JPOX</a> web site.  
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/SQuirreL_Derby.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/integrate/SQuirreL_Derby.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/SQuirreL_Derby.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/SQuirreL_Derby.xml Sun Dec 29 17:20:53 2019
@@ -594,7 +594,7 @@ tab to see all of the data you just load
 <title>SQuirreL and Derby Resources</title>
 <p>
 The <a href="http://db.apache.org/derby/">Derby</a> web site and 
-<a href="http://wiki.apache.org/db-derby/">wiki</a> are the best sources 
+<a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">wiki</a> are the best sources 
 of information about Derby. 
 </p>
 <p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_ddlutils.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_ddlutils.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_ddlutils.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/db_ddlutils.xml Sun Dec 29 17:20:53 2019
@@ -54,7 +54,7 @@ because the files that make up a Derby d
 However, if you want to upgrade a Derby database to or from an alpha
 version of Derby to an official release, 
 you must export the schema and data because Derby doesn't support
-<a href="http://wiki.apache.org/db-derby/UpgradingTen">upgrading</a> 
+<a href="https://cwiki.apache.org/confluence/display/DERBY/UpgradingTen">upgrading</a> 
 an alpha database.
 DdlUtils makes this migration easier.
 </p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/index.xml Sun Dec 29 17:20:53 2019
@@ -25,7 +25,7 @@
 <section id="uses">
 <title>What works with Derby?</title>
 <p>
-The <a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a>
+The <a href="https://cwiki.apache.org/confluence/display/DERBY/UsesOfDerby">UsesOfDerby</a>
 Wiki page
 lists products that use or work with Derby. 
 The list is maintained on the Wiki to make it easy for anyone to update,

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml Sun Dec 29 17:20:53 2019
@@ -24,8 +24,8 @@
 
 <p>
 This page was moved to the
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a> page
-on the <a href="http://wiki.apache.org/db-derby/">Derby Wiki</a> where
+<a href="https://cwiki.apache.org/confluence/display/DERBY/UsesOfDerby">UsesOfDerby</a> page
+on the <a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a> where
 people can more easily update it.
 </p>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/manuals/dita.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/manuals/dita.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/manuals/dita.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/manuals/dita.xml Sun Dec 29 17:20:53 2019
@@ -417,7 +417,7 @@ easier.</li>
    <li>Check modifications with the
        <a href="http://svnbook.red-bean.com/en/1.1/re26.html"><code>svn status</code></a>
        command and add or delete any files as necessary. Follow the instuctions 
-       to <a href="http://wiki.apache.org/db-derby/AddedOrDeletedFilesInDiff">
+       to <a href="https://cwiki.apache.org/confluence/display/DERBY/AddedOrDeletedFilesInDiff">
        add or delete files</a>.
    <br></br>
    </li>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/manuals/docscheck.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/manuals/docscheck.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/manuals/docscheck.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/manuals/docscheck.xml Sun Dec 29 17:20:53 2019
@@ -29,7 +29,7 @@ approved and goes live.
 </p>
 <p>
 You can read a high-level writeup on 
-<a href="http://wiki.apache.org/db-derby/DerbySnapshotOrRelease">the actions 
+<a href="https://cwiki.apache.org/confluence/display/DERBY/DerbySnapshotOrRelease">the actions 
 that need to be done for Derby releases</a>
 for more information.
 </p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyTut/index.xml Sun Dec 29 17:20:53 2019
@@ -104,7 +104,7 @@ use Derby in the embedded and Network Se
 More information about Derby is on the
 <a href="http://db.apache.org/derby">Derby web site</a>
 and on the
-<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a>.
+<a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a>.
 Please post any problems or questions to the
 <a href="http://db.apache.org/derby/derby_mail.html">derby-user@db.apache.org</a>
 mail list.
@@ -147,7 +147,7 @@ to use Derby with another product:
 
 <p>
 More products that work with Derby are summarized on the 
-<a href="http://wiki.apache.org/db-derby/UsesOfDerby">UsesOfDerby</a> Wiki
+<a href="https://cwiki.apache.org/confluence/display/DERBY/UsesOfDerby">UsesOfDerby</a> Wiki
 page.
 </p>
 </section>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_htw.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_htw.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_htw.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_htw.xml Sun Dec 29 17:20:53 2019
@@ -25,8 +25,8 @@
 
 <warning>
 This page is ancient, predating the creating of the
-<a href="http://wiki.apache.org/db-derby">Derby Wiki</a>.
-The Wiki <a href="http://wiki.apache.org/db-derby/HowItWorks">HowItWorks</a>
+<a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a>.
+The Wiki <a href="https://cwiki.apache.org/confluence/display/DERBY/HowItWorks">HowItWorks</a>
 page has more current pointers to information.
 </warning>
 <p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml Sun Dec 29 17:20:53 2019
@@ -24,7 +24,7 @@
 
 <p>
 This <em>ad hoc</em> spot in the Derby site hosts papers, and check the
-<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a> for more.
+<a href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage">Derby Wiki</a> for more.
 </p>
 
 <section>
@@ -118,7 +118,7 @@ The online <a href="DerbyTut/index.html"
 provides a quick hands-on overview.
 Pointers to
 even more tutorials and other instructional materials are on the
-<a href="http://wiki.apache.org/db-derby/WorkingWithDerby">Derby Wiki</a>.
+<a href="https://cwiki.apache.org/confluence/display/DERBY/WorkingWithDerby">Derby Wiki</a>.
 </p>
 
 </section>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=1872085&r1=1872084&r2=1872085&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Sun Dec 29 17:20:53 2019
@@ -22,7 +22,7 @@
     <charter label="Charter" href="derby_charter.html"></charter>
     <license label="Derby License Info" href="license.html"></license>
     <faq label="FAQs" href="faq.html"></faq>
-    <wiki label="Derby Wiki" href="http://wiki.apache.org/db-derby/"></wiki>
+    <wiki label="Derby Wiki" href="https://cwiki.apache.org/confluence/display/DERBY/FrontPage"></wiki>
     <proposal href="derby_proposal.html"></proposal>
     <dbhome label="Apache DB Home" href="http://db.apache.org/"></dbhome>
   </about>