httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r332952 - in /httpd/httpd/trunk/docs/manual/faq: all_in_one.html.en background.html.en background.xml
Date Sun, 13 Nov 2005 08:27:02 GMT
Author: jerenkrantz
Date: Sun Nov 13 00:26:59 2005
New Revision: 332952

URL: http://svn.apache.org/viewcvs?rev=332952&view=rev
Log:
Update background entry slightly.

Modified:
    httpd/httpd/trunk/docs/manual/faq/all_in_one.html.en
    httpd/httpd/trunk/docs/manual/faq/background.html.en
    httpd/httpd/trunk/docs/manual/faq/background.xml

Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.html.en?rev=332952&r1=332951&r2=332952&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.html.en (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.html.en Sun Nov 13 00:26:59 2005
@@ -54,25 +54,34 @@
     <li><a href="#background.logo">May I use the Apache logo on my 
     product or Web site?</a></li>
     </ul>
-    
+
     <h3><a name="background.what-is-apache" id="background.what-is-apache">What
is Apache?</a></h3>
       
 
-      <p>The Apache Software Foundation (ASF) is a 501(c)3 non-profit
-      organization providing support for the Apache community of
-      open-sourced software projects.  For more details, please see the <a href="http://www.apache.org/foundation/faq.html">Apache
Software
+      <p>The <a href="http://www.apache.org/">Apache Software Foundation</a>
+         provides organizational, legal, and financial support for a broad
+         range of open source software projects. The Foundation provides
+         an established framework for intellectual property and financial
+         contributions that simultaneously limits contributors potential
+         legal exposure.  Through a collaborative and meritocratic
+         development process, Apache projects deliver enterprise-grade,
+         freely available software products that attract large communities
+         of users.  The pragmatic Apache License makes it easy for all
+         users, commercial and individual, to deploy Apache products.</p>
+
+      <p>For more details about the Foundation, please see the <a href="http://www.apache.org/foundation/faq.html">Apache
Software
       Foundation FAQ</a></p>
 
       <p>The Apache HTTP Server -- sometimes called Apache httpd -- is
-      a project of the Apache Software foundation aimed at creating a
+      a project of the Apache Software Foundation aimed at creating a
       robust, commercial-grade, featureful, and freely-available
       source code implementation of an HTTP (Web) server.  For more
       information, please see the <a href="http://httpd.apache.org/ABOUT_APACHE.html">About
       Apache</a> page.</p>
 
     
-	
-	<h3><a name="background.what-is-httpd" id="background.what-is-httpd">What is
the Apache HTTP Server?</a></h3>
+
+    <h3><a name="background.what-is-httpd" id="background.what-is-httpd">What
is the Apache HTTP Server?</a></h3>
       
       <ul>
         <li>is a powerful, flexible, HTTP/1.1 compliant web server</li>
@@ -90,9 +99,9 @@
         <li>encourages user feedback through new ideas, bug reports and
         patches</li>
       </ul>
-	
-	
-	<h3><a name="background.tested" id="background.tested">How thoroughly tested
is Apache?</a></h3>
+    
+
+    <h3><a name="background.tested" id="background.tested">How thoroughly tested
is Apache?</a></h3>
       
       <p>Apache is run on millions of Internet servers.
       It has been tested thoroughly by both developers and users. The Apache
@@ -103,7 +112,7 @@
       available.</p>
     
 
-	<h3><a name="background.logo" id="background.logo">&gt;May I use the Apache
logo on my product or Web site?</a></h3>
+    <h3><a name="background.logo" id="background.logo">May I use the Apache logo
on my product or Web site?</a></h3>
       
       <p>You may <em>NOT</em> use any original artwork from the Apache
       Software Foundation, nor make or use modified versions of such
@@ -116,10 +125,13 @@
         graphic</a> or the <a href="http://www.apache.org/images/asf_logo.gif">Apache
Software
         Foundation logo</a> in product description and promotional material
         <em>IF and ONLY IF</em> such use can in no way be interpreted as
-        anything other than an attribution. Using the Apache name and 
-        artwork in a manner that implies endorsement of a product or
-        service is <a href="">strictly forbidden.</a></li>
+        anything other than an attribution.</li>
       </ul>
+
+      <div class="warning">Using the Apache name and artwork in a manner that
+        implies endorsement of a product or service is strictly
+        forbidden.</div>
+
     
  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">

Modified: httpd/httpd/trunk/docs/manual/faq/background.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/background.html.en?rev=332952&r1=332951&r2=332952&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/background.html.en (original)
+++ httpd/httpd/trunk/docs/manual/faq/background.html.en Sun Nov 13 00:26:59 2005
@@ -34,25 +34,34 @@
     <li><a href="#background.logo">May I use the Apache logo on my 
     product or Web site?</a></li>
     </ul>
-    
+
     <h3><a name="background.what-is-apache" id="background.what-is-apache">What
is Apache?</a></h3>
       
 
-      <p>The Apache Software Foundation (ASF) is a 501(c)3 non-profit
-      organization providing support for the Apache community of
-      open-sourced software projects.  For more details, please see the <a href="http://www.apache.org/foundation/faq.html">Apache
Software
+      <p>The <a href="http://www.apache.org/">Apache Software Foundation</a>
+         provides organizational, legal, and financial support for a broad
+         range of open source software projects. The Foundation provides
+         an established framework for intellectual property and financial
+         contributions that simultaneously limits contributors potential
+         legal exposure.  Through a collaborative and meritocratic
+         development process, Apache projects deliver enterprise-grade,
+         freely available software products that attract large communities
+         of users.  The pragmatic Apache License makes it easy for all
+         users, commercial and individual, to deploy Apache products.</p>
+
+      <p>For more details about the Foundation, please see the <a href="http://www.apache.org/foundation/faq.html">Apache
Software
       Foundation FAQ</a></p>
 
       <p>The Apache HTTP Server -- sometimes called Apache httpd -- is
-      a project of the Apache Software foundation aimed at creating a
+      a project of the Apache Software Foundation aimed at creating a
       robust, commercial-grade, featureful, and freely-available
       source code implementation of an HTTP (Web) server.  For more
       information, please see the <a href="http://httpd.apache.org/ABOUT_APACHE.html">About
       Apache</a> page.</p>
 
     
-	
-	<h3><a name="background.what-is-httpd" id="background.what-is-httpd">What is
the Apache HTTP Server?</a></h3>
+
+    <h3><a name="background.what-is-httpd" id="background.what-is-httpd">What
is the Apache HTTP Server?</a></h3>
       
       <ul>
         <li>is a powerful, flexible, HTTP/1.1 compliant web server</li>
@@ -70,9 +79,9 @@
         <li>encourages user feedback through new ideas, bug reports and
         patches</li>
       </ul>
-	
-	
-	<h3><a name="background.tested" id="background.tested">How thoroughly tested
is Apache?</a></h3>
+    
+
+    <h3><a name="background.tested" id="background.tested">How thoroughly tested
is Apache?</a></h3>
       
       <p>Apache is run on millions of Internet servers.
       It has been tested thoroughly by both developers and users. The Apache
@@ -83,7 +92,7 @@
       available.</p>
     
 
-	<h3><a name="background.logo" id="background.logo">&gt;May I use the Apache
logo on my product or Web site?</a></h3>
+    <h3><a name="background.logo" id="background.logo">May I use the Apache logo
on my product or Web site?</a></h3>
       
       <p>You may <em>NOT</em> use any original artwork from the Apache
       Software Foundation, nor make or use modified versions of such
@@ -96,10 +105,13 @@
         graphic</a> or the <a href="http://www.apache.org/images/asf_logo.gif">Apache
Software
         Foundation logo</a> in product description and promotional material
         <em>IF and ONLY IF</em> such use can in no way be interpreted as
-        anything other than an attribution. Using the Apache name and 
-        artwork in a manner that implies endorsement of a product or
-        service is <a href="">strictly forbidden.</a></li>
+        anything other than an attribution.</li>
       </ul>
+
+      <div class="warning">Using the Apache name and artwork in a manner that
+        implies endorsement of a product or service is strictly
+        forbidden.</div>
+
     
  </div></div>
 <div class="bottomlang">

Modified: httpd/httpd/trunk/docs/manual/faq/background.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/background.xml?rev=332952&r1=332951&r2=332952&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/background.xml (original)
+++ httpd/httpd/trunk/docs/manual/faq/background.xml Sun Nov 13 00:26:59 2005
@@ -37,18 +37,27 @@
     <li><a href="#background.logo">May I use the Apache logo on my 
     product or Web site?</a></li>
     </ul>
-    
+
     <section id="background.what-is-apache">
       <title>What is Apache?</title>
 
-      <p>The Apache Software Foundation (ASF) is a 501(c)3 non-profit
-      organization providing support for the Apache community of
-      open-sourced software projects.  For more details, please see the <a
+      <p>The <a href="http://www.apache.org/">Apache Software Foundation</a>
+         provides organizational, legal, and financial support for a broad
+         range of open source software projects. The Foundation provides
+         an established framework for intellectual property and financial
+         contributions that simultaneously limits contributors potential
+         legal exposure.  Through a collaborative and meritocratic
+         development process, Apache projects deliver enterprise-grade,
+         freely available software products that attract large communities
+         of users.  The pragmatic Apache License makes it easy for all
+         users, commercial and individual, to deploy Apache products.</p>
+
+      <p>For more details about the Foundation, please see the <a
       href="http://www.apache.org/foundation/faq.html">Apache Software
       Foundation FAQ</a></p>
 
       <p>The Apache HTTP Server -- sometimes called Apache httpd -- is
-      a project of the Apache Software foundation aimed at creating a
+      a project of the Apache Software Foundation aimed at creating a
       robust, commercial-grade, featureful, and freely-available
       source code implementation of an HTTP (Web) server.  For more
       information, please see the <a
@@ -56,8 +65,8 @@
       Apache</a> page.</p>
 
     </section>
-	
-	<section id="background.what-is-httpd">
+
+    <section id="background.what-is-httpd">
       <title>What is the Apache HTTP Server?</title>
       <ul>
         <li>is a powerful, flexible, HTTP/1.1 compliant web server</li>
@@ -75,9 +84,9 @@
         <li>encourages user feedback through new ideas, bug reports and
         patches</li>
       </ul>
-	</section>
-	
-	<section id="background.tested">
+    </section>
+
+    <section id="background.tested">
       <title>How thoroughly tested is Apache?</title>
       <p>Apache is run on millions of Internet servers.
       It has been tested thoroughly by both developers and users. The Apache
@@ -88,8 +97,8 @@
       available.</p>
     </section>
 
-	<section id="background.logo">
-      <title>>May I use the Apache logo on my product or Web site?</title>
+    <section id="background.logo">
+      <title>May I use the Apache logo on my product or Web site?</title>
       <p>You may <em>NOT</em> use any original artwork from the Apache
       Software Foundation, nor make or use modified versions of such
       artwork, except under the following conditions:</p>
@@ -104,10 +113,13 @@
         href="http://www.apache.org/images/asf_logo.gif">Apache Software
         Foundation logo</a> in product description and promotional material
         <em>IF and ONLY IF</em> such use can in no way be interpreted as
-        anything other than an attribution. Using the Apache name and 
-        artwork in a manner that implies endorsement of a product or
-        service is <a href="">strictly forbidden.</a></li>
+        anything other than an attribution.</li>
       </ul>
+
+      <note type="warning">Using the Apache name and artwork in a manner that
+        implies endorsement of a product or service is strictly
+        forbidden.</note>
+
     </section>
  </section>
 </faq>



Mime
View raw message