Commit 0e134b41 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Update background entry slightly. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332952 13f79535-47bb-0310-9956-ffa450edef68
parent 209f8b5f

docs/manual/faq/all_in_one.html.en

+26 −14
Original line number Diff line number Diff line
@@ -58,13 +58,22 @@ 
    <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
@@ -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,11 +125,14 @@ 
        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">

<h2><a name="support" id="support">Support</a></h2>

docs/manual/faq/background.html.en

+26 −14
Original line number Diff line number Diff line
@@ -38,13 +38,22 @@ 
    <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
@@ -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,11 +105,14 @@ 
        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">

<p><span>Available Languages: </span><a href="../en/faq/background.html" title="English">&nbsp;en&nbsp;</a></p>

docs/manual/faq/background.xml

+27 −15
Original line number Diff line number Diff line
@@ -41,14 +41,23 @@ 
    <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
@@ -89,7 +98,7 @@ 
    </section>



    <section id="background.logo">

      <title>>May I use the Apache logo on my product or Web site?</title>

      <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>