db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r328900 - in /db/derby/site/trunk: build/site/faq.html build/site/license.html src/documentation/content/xdocs/faq.xml src/documentation/content/xdocs/license.xml
Date Thu, 27 Oct 2005 15:41:55 GMT
Author: jta
Date: Thu Oct 27 08:41:52 2005
New Revision: 328900

URL: http://svn.apache.org/viewcvs?rev=328900&view=rev
Log:
Added Derby license to the FAQ; also added more links to the license page.

Modified:
    db/derby/site/trunk/build/site/faq.html
    db/derby/site/trunk/build/site/license.html
    db/derby/site/trunk/src/documentation/content/xdocs/faq.xml
    db/derby/site/trunk/src/documentation/content/xdocs/license.xml

Modified: db/derby/site/trunk/build/site/faq.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/faq.html?rev=328900&r1=328899&r2=328900&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/faq.html (original)
+++ db/derby/site/trunk/build/site/faq.html Thu Oct 27 08:41:52 2005
@@ -103,7 +103,12 @@
 <a href="#general">1. General</a>
 <ul class="minitoc">
 <li>
-<a href="#faq_add">1.1. 
+<a href="#derby_license">1.1. 
+        What License is Derby under? (Quick Answer: ASL 2.0)
+      </a>
+</li>
+<li>
+<a href="#faq_add">1.2. 
         How can I add a new entry to the Derby FAQ?
       </a>
 </li>
@@ -266,8 +271,21 @@
 <div class="section">
 <a name="N1000C"></a><a name="general"></a>
 <h3 class="boxed">1. General</h3>
-<a name="N10010"></a><a name="faq_add"></a>
+<a name="N10010"></a><a name="derby_license"></a>
 <h4 class="faq">1.1. 
+        What License is Derby under? (Quick Answer: ASL 2.0)
+      </h4>
+<div align="right">
+<a href="#derby_license-menu">^</a>
+</div>
+<div style="margin-left: 15px">
+<p> Derby is available under the 
+            <a href="license.html">Apache License, Version 2.0.</a>
+        
+</p>
+</div>
+<a name="N1001C"></a><a name="faq_add"></a>
+<h4 class="faq">1.2. 
         How can I add a new entry to the Derby FAQ?
       </h4>
 <div align="right">
@@ -282,9 +300,9 @@
          if you don't already have one.
         </p>
 </div>
-<a name="N10020"></a><a name="developers"></a>
+<a name="N1002C"></a><a name="developers"></a>
 <h3 class="boxed">2. Developing Derby</h3>
-<a name="N10024"></a><a name="derby_source"></a>
+<a name="N10030"></a><a name="derby_source"></a>
 <h4 class="faq">2.1. 
         Where is the Derby source code?
       </h4>
@@ -302,7 +320,7 @@
 	interface to view Derby source code using your web browser.
         </p>
 </div>
-<a name="N10034"></a><a name="derby_internals"></a>
+<a name="N10040"></a><a name="derby_internals"></a>
 <h4 class="faq">2.2. 
         Where can I read about Derby internals?
       </h4>
@@ -319,7 +337,7 @@
 	mail list and post any questions you have.
         </p>
 </div>
-<a name="N10044"></a><a name="derby_issues"></a>
+<a name="N10050"></a><a name="derby_issues"></a>
 <h4 class="faq">2.3. 
         Where are Apache Derby bugs logged?
       </h4>
@@ -333,7 +351,7 @@
 	tracker</a> to track bugs.
 	</p>
 </div>
-<a name="N10050"></a><a name="derby_update"></a>
+<a name="N1005C"></a><a name="derby_update"></a>
 <h4 class="faq">2.4. 
         Who can create a new Apache Derby issue?
       </h4>
@@ -352,7 +370,7 @@
          request that it be added to the derby-developers Jira list.
 	</p>
 </div>
-<a name="N10060"></a><a name="derby_eclipse"></a>
+<a name="N1006C"></a><a name="derby_eclipse"></a>
 <h4 class="faq">2.5. 
         How do you build Derby using Eclipse?
       </h4>
@@ -366,9 +384,9 @@
 
 	</p>
 </div>
-<a name="N1006C"></a><a name="users_getstart"></a>
+<a name="N10078"></a><a name="users_getstart"></a>
 <h3 class="boxed">3. Using Derby: Getting Started</h3>
-<a name="N10070"></a><a name="derby_ask"></a>
+<a name="N1007C"></a><a name="derby_ask"></a>
 <h4 class="faq">3.1. 
         Where can I ask questions about how to use Derby?
       </h4>
@@ -388,7 +406,7 @@
         feel free to ask for more help.
         </p>
 </div>
-<a name="N1007C"></a><a name="derby_jar"></a>
+<a name="N10088"></a><a name="derby_jar"></a>
 <h4 class="faq">3.2. 
         Where can I download the Derby jar files?
       </h4>
@@ -401,7 +419,7 @@
 	from the <a href="derby_downloads.html">Derby Downloads</a> page.
 	</p>
 </div>
-<a name="N10088"></a><a name="derby_alpha"></a>
+<a name="N10094"></a><a name="derby_alpha"></a>
 <h4 class="faq">3.3. 
       What are Derby alpha snaphots and should I use them?
       </h4>
@@ -419,7 +437,7 @@
       must not be used for production</a>.
       </p>
 </div>
-<a name="N10098"></a><a name="where_are_docs"></a>
+<a name="N100A4"></a><a name="where_are_docs"></a>
 <h4 class="faq">3.4. 
       Where can I find the Derby documentation?
       </h4>
@@ -445,7 +463,7 @@
       instructions.
       </p>
 </div>
-<a name="N100BA"></a><a name="pda"></a>
+<a name="N100C6"></a><a name="pda"></a>
 <h4 class="faq">3.5. 
       Can you run Derby on PDAs?
       </h4>
@@ -461,7 +479,7 @@
       Guide</a>.
       </p>
 </div>
-<a name="N100C6"></a><a name="createdb_OS_X"></a>
+<a name="N100D2"></a><a name="createdb_OS_X"></a>
 <h4 class="faq">3.6. 
         Why can't I create a new database or modify an existing database 
 	on Mac OS X?
@@ -483,7 +501,7 @@
 	sync instead of write sync for log writes.
 	</p>
 </div>
-<a name="N100D6"></a><a name="derby_jdk51"></a>
+<a name="N100E2"></a><a name="derby_jdk51"></a>
 <h4 class="faq">3.7. 
       Can I use Derby on JDK 5.0?
       </h4>
@@ -502,7 +520,7 @@
       5.0 is also known as JDK 1.5</a>.
       </p>
 </div>
-<a name="N100EA"></a><a name="in_memory"></a>
+<a name="N100F6"></a><a name="in_memory"></a>
 <h4 class="faq">3.8. 
       Does Derby have a mode that causes it to run entirely in memory?
       </h4>
@@ -519,7 +537,7 @@
       Check that mail list for current status.
       </p>
 </div>
-<a name="N100FA"></a><a name="derby_gui"></a>
+<a name="N10106"></a><a name="derby_gui"></a>
 <h4 class="faq">3.9. 
       Does Derby have a GUI?
       </h4>
@@ -534,9 +552,9 @@
       that work with Derby.
       </p>
 </div>
-<a name="N10106"></a><a name="users_sql"></a>
+<a name="N10112"></a><a name="users_sql"></a>
 <h3 class="boxed">4. Using Derby: SQL</h3>
-<a name="N1010A"></a><a name="null_args"></a>
+<a name="N10116"></a><a name="null_args"></a>
 <h4 class="faq">4.1. 
       Why can't my SQL function/procedure pass a NULL INTEGER?
       </h4>
@@ -555,7 +573,7 @@
       mail list topic.
       </p>
 </div>
-<a name="N10116"></a><a name="limit"></a>
+<a name="N10122"></a><a name="limit"></a>
 <h4 class="faq">4.2. 
       Does Derby support a LIMIT command? 
       </h4>
@@ -568,7 +586,7 @@
       <a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-dev/200411.mbox/%3c41A95632.3010301@debrunners.com%3e">JDBC</a>.
       </p>
 </div>
-<a name="N10122"></a><a name="schema_exist"></a>
+<a name="N1012E"></a><a name="schema_exist"></a>
 <h4 class="faq">4.3. 
       Why do I get the error 'schema does not exist'?
       </h4>
@@ -600,7 +618,7 @@
       to create in a particular schema and no explicit CREATE SCHEMA was issued.
       </p>
 </div>
-<a name="N10133"></a><a name="debug_lock_timeout"></a>
+<a name="N1013F"></a><a name="debug_lock_timeout"></a>
 <h4 class="faq">4.4. 
       I get a lock timeout error. How do I debug this?
       </h4>
@@ -629,7 +647,7 @@
       to narrow down which statements may be holding the locks.
       </p>
 </div>
-<a name="N1014D"></a><a name="identity"></a>
+<a name="N10159"></a><a name="identity"></a>
 <h4 class="faq">4.5. 
       Can Derby generate unique identifiers like sequences?
       </h4>
@@ -646,9 +664,9 @@
        function returns the most recently assigned number.
       </p>
 </div>
-<a name="N1015D"></a><a name="users_client"></a>
+<a name="N10169"></a><a name="users_client"></a>
 <h3 class="boxed">5. Using Derby: Client Programming</h3>
-<a name="N10161"></a><a name="clientserv"></a>
+<a name="N1016D"></a><a name="clientserv"></a>
 <h4 class="faq">5.1. 
       Can you use Derby for client-server applications?
       </h4>
@@ -669,7 +687,7 @@
       DB2 JDBC Universal Driver</a>.
       </p>
 </div>
-<a name="N10179"></a><a name="netclient"></a>
+<a name="N10185"></a><a name="netclient"></a>
 <h4 class="faq">5.2. 
       Does Derby include a client-server ("network") jdbc driver?
       </h4>
@@ -685,7 +703,7 @@
       and it became available in Derby 10.1.
       </p>
 </div>
-<a name="N10185"></a><a name="db2_jcc_errors"></a>
+<a name="N10191"></a><a name="db2_jcc_errors"></a>
 <h4 class="faq">5.3. 
       How can I get the message text for an error using the DB2 JDBC
       Universal Driver?
@@ -703,7 +721,7 @@
       mail list topic.
       </p>
 </div>
-<a name="N10194"></a><a name="derby_xa"></a>
+<a name="N101A0"></a><a name="derby_xa"></a>
 <h4 class="faq">5.4. 
       Can you execute a query that spans two Derby databases 
       across different JVMs?
@@ -719,7 +737,7 @@
       <a href="http://db.apache.org/derby/docs/10.1/adminguide/cadminapps811478.html">Admin
and Server Guide</a>.
       </p>
 </div>
-<a name="N101A0"></a><a name="derby_faster"></a>
+<a name="N101AC"></a><a name="derby_faster"></a>
 <h4 class="faq">5.5. 
       Are there any tips to make Derby go faster?
       </h4>
@@ -754,7 +772,7 @@
       
 </ol>
 </div>
-<a name="N101B9"></a><a name="jdbc_lob"></a>
+<a name="N101C5"></a><a name="jdbc_lob"></a>
 <h4 class="faq">5.6. 
       Where is an example that shows how to insert a CLOB?
       </h4>

Modified: db/derby/site/trunk/build/site/license.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/license.html?rev=328900&r1=328899&r2=328900&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/license.html (original)
+++ db/derby/site/trunk/build/site/license.html Thu Oct 27 08:41:52 2005
@@ -98,16 +98,45 @@
 <p>
 Derby is available under the 
 <a class="external" href="http://www.apache.org/licenses/">Apache License, Version
2.0</a>.
-The
+</p>
+
+
+<p>
+Also see:
+</p>
+
+
+<ul>
+ 
+<li> 
 <a class="external" href="http://www.apache.org/foundation/licence-FAQ">Apache 
-Licensing FAQ</a>
-provides answers to common questions.
+       Licensing FAQ</a>
+</li>
+ 
+<li> Cliff Schmidt's ApacheCon presentation titled
+      <a class="external" href="http://wiki.apache.org/apachecon/Eu2005OnlineSessionSlides">"Licensing:
What Every Apache Contributor Should Know"</a>
+ 
+</li>
+ 
+<li>
+<a class="external" href="http://mail-archives.apache.org/mod_mbox/www-legal-discuss/">legal-discuss@apache.org
mail archives</a>.
+ Note that only <a class="external" href="http://www.apache.org/foundation/mailinglists.html">Apache
committers</a> may subscribe to this list.
+ Feel free to post any questions to the <a href="derby_mail.html">Derby mail
+ lists</a>.
+ </li>
+
+</ul>
+
+
+<p>
+
+
 </p>
 
 
 <p>
 
-<em>This page last updated: 13-August-2004</em>
+<em>This page last updated: 27-October-2005</em>
 
 </p>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/faq.xml?rev=328900&r1=328899&r2=328900&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/faq.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/faq.xml Thu Oct 27 08:41:52 2005
@@ -22,6 +22,16 @@
 
   <faqsection id="general">
     <title>General</title>
+    <faq id="derby_license">
+      <question>
+        What License is Derby under? (Quick Answer: ASL 2.0)
+      </question>
+      <answer>
+        <p> Derby is available under the 
+            <a href="license.html">Apache License, Version 2.0.</a>
+        </p>
+      </answer>
+    </faq>
     <faq id="faq_add">
       <question>
         How can I add a new entry to the Derby FAQ?

Modified: db/derby/site/trunk/src/documentation/content/xdocs/license.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/license.xml?rev=328900&r1=328899&r2=328900&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/license.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/license.xml Thu Oct 27 08:41:52 2005
@@ -10,14 +10,31 @@
 <p>
 Derby is available under the 
 <a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a>.
-The
-<a href="http://www.apache.org/foundation/licence-FAQ">Apache 
-Licensing FAQ</a>
-provides answers to common questions.
 </p>
 
 <p>
-<em>This page last updated: 13-August-2004</em>
+Also see:
+</p>
+
+<ul>
+ <li> <a href="http://www.apache.org/foundation/licence-FAQ">Apache 
+       Licensing FAQ</a></li>
+ <li> Cliff Schmidt's ApacheCon presentation titled
+      <a href="http://wiki.apache.org/apachecon/Eu2005OnlineSessionSlides">"Licensing:
What Every Apache Contributor Should Know"</a>
+ </li>
+ <li><a href="http://mail-archives.apache.org/mod_mbox/www-legal-discuss/">legal-discuss@apache.org
mail archives</a>.
+ Note that only <a href="http://www.apache.org/foundation/mailinglists.html">Apache
committers</a> may subscribe to this list.
+ Feel free to post any questions to the <a href="derby_mail.html">Derby mail
+ lists</a>.
+ </li>
+</ul>
+
+<p>
+
+</p>
+
+<p>
+<em>This page last updated: 27-October-2005</em>
 </p>
 
 </body>



Mime
View raw message