From: Justin Erenkrantz Date: Sun, 13 Nov 2005 08:26:59 +0000 (+0000) Subject: Update background entry slightly. X-Git-Tag: 2.3.0~2786 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8cdc9f5710880d244a13ccaf70ecd0b7eab503;p=thirdparty%2Fapache%2Fhttpd.git Update background entry slightly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332952 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/faq/all_in_one.html.en b/docs/manual/faq/all_in_one.html.en index 957428d42d5..9980d82f11d 100644 --- a/docs/manual/faq/all_in_one.html.en +++ b/docs/manual/faq/all_in_one.html.en @@ -54,25 +54,34 @@
  • May I use the Apache logo on my product or Web site?
    • - +

    What is Apache?

    -

    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 Apache Software +

    The Apache Software Foundation + 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.

    + +

    For more details about the Foundation, please see the Apache Software Foundation FAQ

    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 About Apache page.

    - -

    What is the Apache HTTP Server?

    + +

    What is the Apache HTTP Server?

    - - -

    How thoroughly tested is Apache?

    + + +

    How thoroughly tested is Apache?

    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.

    -

    +

    You may NOT use any original artwork from the Apache Software Foundation, nor make or use modified versions of such @@ -116,10 +125,13 @@ graphic or the Apache Software Foundation logo in product description and promotional material IF and ONLY IF 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 strictly forbidden. + anything other than an attribution. + +

    Using the Apache name and artwork in a manner that + implies endorsement of a product or service is strictly + forbidden.
    +
    top
    diff --git a/docs/manual/faq/background.html.en b/docs/manual/faq/background.html.en index f0d734bfafe..81a60e2d7cd 100644 --- a/docs/manual/faq/background.html.en +++ b/docs/manual/faq/background.html.en @@ -34,25 +34,34 @@
  • May I use the Apache logo on my product or Web site?
    • - +

    What is Apache?

    -

    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 Apache Software +

    The Apache Software Foundation + 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.

    + +

    For more details about the Foundation, please see the Apache Software Foundation FAQ

    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 About Apache page.

    - -

    What is the Apache HTTP Server?

    + +

    What is the Apache HTTP Server?

    - - -

    How thoroughly tested is Apache?

    + + +

    How thoroughly tested is Apache?

    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.

    -

    +

    You may NOT use any original artwork from the Apache Software Foundation, nor make or use modified versions of such @@ -96,10 +105,13 @@ graphic or the Apache Software Foundation logo in product description and promotional material IF and ONLY IF 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 strictly forbidden. + anything other than an attribution. + +

    Using the Apache name and artwork in a manner that + implies endorsement of a product or service is strictly + forbidden.
    +
    diff --git a/docs/manual/faq/background.xml b/docs/manual/faq/background.xml index d26a1b8a74d..2722dd0dcc5 100644 --- a/docs/manual/faq/background.xml +++ b/docs/manual/faq/background.xml @@ -37,18 +37,27 @@
  • May I use the Apache logo on my product or Web site?
    • - +
    What is Apache? -

    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 The Apache Software Foundation + 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.

    + +

    For more details about the Foundation, please see the Apache Software Foundation FAQ

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

    - -
    + +
    What is the Apache HTTP Server?
    • is a powerful, flexible, HTTP/1.1 compliant web server
      • @@ -75,9 +84,9 @@
    • encourages user feedback through new ideas, bug reports and patches
    -
    - -
    +
    + +
    How thoroughly tested is Apache?

    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.

    -