httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From noi...@apache.org
Subject svn commit: r369860 - in /httpd/site/trunk/xdocs: ABOUT_APACHE.xml bug_report.xml docs-project/docsformat.xml docs-project/index.xml docs-project/translations.xml download.xml index.xml lists.xml related_projects.html usersdelist.xml userslist.xml
Date Tue, 17 Jan 2006 18:36:05 GMT
Author: noirin
Date: Tue Jan 17 10:35:56 2006
New Revision: 369860

URL: http://svn.apache.org/viewcvs?rev=369860&view=rev
Log:
Language fixes, updates for consistency & relevance

Modified:
    httpd/site/trunk/xdocs/ABOUT_APACHE.xml
    httpd/site/trunk/xdocs/bug_report.xml
    httpd/site/trunk/xdocs/docs-project/docsformat.xml
    httpd/site/trunk/xdocs/docs-project/index.xml
    httpd/site/trunk/xdocs/docs-project/translations.xml
    httpd/site/trunk/xdocs/download.xml
    httpd/site/trunk/xdocs/index.xml
    httpd/site/trunk/xdocs/lists.xml
    httpd/site/trunk/xdocs/related_projects.html
    httpd/site/trunk/xdocs/usersdelist.xml
    httpd/site/trunk/xdocs/userslist.xml

Modified: httpd/site/trunk/xdocs/ABOUT_APACHE.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/ABOUT_APACHE.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/ABOUT_APACHE.xml (original)
+++ httpd/site/trunk/xdocs/ABOUT_APACHE.xml Tue Jan 17 10:35:56 2006
@@ -114,7 +114,7 @@
 <section id="Involved">
 <title>Getting Involved</title>
 <p>If you just want to send in an occasional suggestion/fix, then you can
-just use the bug reporting form at
+simply use the bug reporting form at
 &lt;<a href="http://httpd.apache.org/bug_report.html"><samp
 >http://httpd.apache.org/bug_report.html</samp></a>&gt;.
 You can also subscribe to the announcements mailing list 
@@ -144,23 +144,23 @@
 
 <section id="Development">
 
-<p>There is a core group of contributors, formed from the project 
-founders, which is augmented from time to time with the outstanding 
+<p>There is a core group of contributors, formed initially of the project 
+founders, and augmented from time to time by other outstanding 
 contributors.  There are 'committers', who are granted access to the
 source code control respositories to help maintain the project or docs,
-and the core group now managing the project is called the Apache HTTP
+and the core group now managing the project, which is called the Apache HTTP
 Project Management Committee (PMC, for short).  In fact, each Apache
-Software Foundation project has its own PMC to determine committers, 
+Software Foundation project has its own PMC, to determine committers, 
 project direction and overall management.  The terms &quot;The Apache 
 Group&quot; or &quot;Apache Core&quot; are no longer used.</p>
 
 <p>The project is a meritocracy -- the more work you have done, the more 
-you are allowed to do.  The group founders set the original rules, but
+you will be allowed to do.  The group founders set the original rules, but
 they can be changed by vote of the active PMC members.  There is a group
 of people who have logins on our server and access to the source code
 repositories.  Everyone has read-only access to the repositories.  Changes 
 to the code are proposed on the mailing list and usually voted on by active
-members -- three +1 (yes votes) and no -1 (no votes, or vetoes) are needed
+members -- three +1 ('yes' votes) and no -1 ('no' votes, or vetoes) are needed
 to commit a code change during a release cycle; docs are usually committed
 first and then changed as needed, with conflicts resolved by majority vote.
 </p>
@@ -173,10 +173,10 @@
 communicated using a patch (output of a unified
 &quot;diff -u oldfile newfile&quot; command), and then applied to the
 source code control repositories by one of the committers.  
-Anyone on the mailing list can vote on a particular issue, but we only 
-count those made by active members or people who are known to be experts 
-on that part of the server.  Vetoes must be accompanied by a convincing 
-technical justification.</p>
+Anyone on the mailing list can vote on a particular issue, but only those made 
+by active members or people who are known to be experts  on that part of the 
+server are counted towards the requirements for committing. Vetoes must be 
+accompanied by a convincing technical justification.</p>
 
 <p>New members of the Apache HTTP Project Management Committee are added 
 when a frequent contributor is nominated by one member and unanimously 
@@ -196,31 +196,31 @@
 <p>Apache Software exists to provide robust and commercial-grade reference
 implementations of many types of software.  It must remain a platform upon 
 which individuals and institutions can build reliable systems, both for
-experimental purposes and for mission-critical purposes.  We believe the
-tools of online publishing should be in the hands of everyone, and
-software companies should make their money providing value-added services
+experimental purposes and for mission-critical purposes.  We believe that the
+tools of online publishing should be in the hands of everyone, and that
+software companies should make their money by providing value-added services
 such as specialized modules and support, amongst other things.  We realize
 that it is often seen as an economic advantage for one company to
-&quot;own&quot; a market - in the software industry that means to control 
-tightly a particular conduit such that all others must pay.  This is 
+&quot;own&quot; a market - in the software industry, that means to control 
+tightly a particular conduit such that all others must pay for its use. This is 
 typically done by &quot;owning&quot; the protocols through which 
 companies conduct business, at the expense of all those other companies.  
 To the extent that the protocols of the World Wide Web remain 
 &quot;unowned&quot; by a single company, the Web will remain a level 
 playing field for companies large and small. Thus, &quot;ownership&quot; 
-of the protocols must be prevented, and the existence of a robust reference 
+of the protocols must be prevented. To this end, the existence of robust reference 
 implementations of various protocols and application programming interfaces,
 available free to all companies and individuals, is a tremendously good 
 thing.</p>
 
 <p>Furthermore, the Apache Software Foundation is an organic entity; those 
-who benefit from this software by using it often contribute back to it by 
+who benefit from this software by using it, often contribute back to it by 
 providing feature enhancements, bug fixes, and support for others in public 
-lists and newsgroups.  The amount of effort expended by any particular 
+lists and newsgroups.  The effort expended by any particular 
 individual is usually fairly light, but the resulting product is made very 
 strong.  These kinds of communities can only happen with freely available
-software -- when someone pays for software, they usually aren't willing to 
-fix its bugs.  One can argue, then, that Apache's strength comes from the 
+software -- when someone has paid for software, they usually aren't willing to 
+fix its bugs for free.  One can argue, then, that Apache's strength comes from the 
 fact that it's free, and if it were made &quot;not free&quot; it would 
 suffer tremendously, even if that money were spent on a real development 
 team.</p>
@@ -231,10 +231,10 @@
 could afford commercial software, and would pay for it without blinking,
 might get a &quot;free ride&quot; by using Apache.  We are even happy when
 some commercial software companies completely drop their own HTTP server 
-development plans and used Apache as a base, with the proper attributions 
+development plans and use Apache as a base, with the proper attributions 
 as described in the <a href="http://www.apache.org/licenses/">LICENSE</a>.
-That is to say, Apache HTTP Sever only comes from the Apache Software
-Foundation, although many vendors ship their own product "based on the
+That is to say, the Apache HTTP Sever only comes from the Apache Software
+Foundation, but many vendors ship their own product "based on the
 Apache {Project}".  There is no "{Vendor} Apache {Product}", this is an
 abuse of the Apache Software Foundation's marks.</p>
 </section>

Modified: httpd/site/trunk/xdocs/bug_report.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/bug_report.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/bug_report.xml (original)
+++ httpd/site/trunk/xdocs/bug_report.xml Tue Jan 17 10:35:56 2006
@@ -8,7 +8,7 @@
 <title>Bug Reporting</title>
 
 <note>
-<strong>Reports of security issues should <em>not</em> be reported here.
+<strong>Reports of security issues should <em>not</em> be made here.
 Please see the <a href="security_report.html">security report page</a>
 if you have concerns or think you have discovered a security hole in
 the Apache Web server software.</strong>
@@ -30,7 +30,7 @@
   no other patches (so that we can make sure it's an Apache bug and 
   not a bug in a module or patch provided by someone else).  It is 
   frustrating to take time and effort to track down a problem only 
-  to figure out it caused by a broken third party module.
+  to figure out that it is caused by a broken third party module.
  </li>
  <li>Looked at the error log.  Please include any related messages in your
   report, or state that there are none.
@@ -59,7 +59,7 @@
 </ol>
 
 <note>
-  <p>Unless you are sure you have found a bug in the Apache HTTP
+  <p>Unless you are sure that you have found a bug in the Apache HTTP
   Server, we strongly recommend that you try the <a
   href="userslist.html">Apache HTTP Server Users List</a> before using
   the bug database.  If you don't receive a response within a few
@@ -67,17 +67,17 @@
   known issue, you'll probably get a faster response from the mailing
   list and you will help keep developer time free for improving
   Apache.  Most bug reports submitted are actually user configuration
-  problems that could be easily fixed by asking in the mailing
+  problems that could be easily fixed by asking on the mailing
   list.</p>
 
   <p>Do <strong>not</strong> post to the mailing list and submit a bug

   report at the same time.  This wastes everyone's time.  
-  Post to the mailing list and wait a few days.
+  Post to the mailing list and wait a few days before submitting a bug report.
   </p>
 </note>
 
 <p>If you have done all of the preceding, then please select the button
-below and fill out the form, and we will respond to it as soon as we can.
+below and fill out the form. We will respond to it as soon as we can.
 </p>
 
 <note>
@@ -93,7 +93,7 @@
   sites now says 'It Worked! Apache is installed!' -- then contact the
   mail originator or the Web site's Webmaster directly, because they're
   just using our software and we have nothing to do with them.  Don't
-  waste your time or ours by telling us about it.
+  waste your time, or ours, by telling us about it.
   </strong>
  </li>
 </ul>

Modified: httpd/site/trunk/xdocs/docs-project/docsformat.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/docs-project/docsformat.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/docs-project/docsformat.xml (original)
+++ httpd/site/trunk/xdocs/docs-project/docsformat.xml Tue Jan 17 10:35:56 2006
@@ -21,7 +21,7 @@
 Obviously, the file extension should be <code>xml</code>.  It was
 changed to make online viewing simpler.</p>
 
-<p>To assure that your documentation follows the defined format, you
+<p>To ensure that your documentation follows the defined format, you
 should parse it using the DTD.  Some help using Emacs with XML files
 is available from <a
 href="http://www-106.ibm.com/developerworks/xml/library/x-emacs/">IBM
@@ -31,27 +31,28 @@
 
 <section><title>Transformation</title>
 
-<p>The easiest way to view the tranformed docs is simply to open the
+<p>The easiest way to view the tranformed docs is to simply open the
 xml file directly in a recent verions of MSIE, Netscape, or Mozilla.
-(MSIE 6 seems to work consistently.  Some people have had luck with
-Netscape 6+ and Mozilla, but others have not.)  These browsers
+(MSIE 6 seems to work consistently. Some people have had luck with
+Netscape 6+ and Mozilla, but others have not.) These browsers
 will read the xsl file and perform the transformation for you
-automatically, so you can see what the final output will look like.
+automatically, so that you can see what the final output will look like.
 This means that you can work on the docs and check your work without
 any special transformation setup.</p>
 
 <p>For the final presentation, it is still necessary to transform to
-html to accomodate older browsers.  Although any standards-compliant
+html to accomodate older browsers. Although any standards-compliant
 xslt engine should do, changing engines can lead to massive diffs on
-the transformed files.  Therefore, we have chosen a single recommended
-transformation system based on Xalan+Xerces Java and Ant.  These are
+the transformed files. Therefore, we have chosen a single recommended
+transformation system based on Xalan+Xerces Java and Ant. These are
 all Apache projects distributed under the Apache license.</p>
 
-<p>The only requirement to do the transformation is a Java 1.2 or
-greater JVM (which can be obtained free from Sun).  Assuming you
+<p>The only prerequisite for the transformation is a Java 1.2 or
+greater JVM (which can be obtained free from Sun). Assuming you
 already have <a
 href="http://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x/docs/"
->httpd/httpd/branches/2.0.x/docs/</a> checked out from SVN,
+>httpd/httpd/branches/2.0.x/docs/</a> (or the equivalent from another branch) 
+checked out from SVN,
 here is what you need to do to build: (If you need instructions on setting
 up SVN, see <a
 href="http://www.apache.org/dev/version-control.html">this page</a>.)</p>
@@ -64,7 +65,7 @@
 </code></blockquote>
 
 <p>If you are running under win32, the build.sh script will work if
-cygwin is installed.  Alternatively, on Win32, you should be
+cygwin is installed. Alternatively, on Win32, you should be
 able to run the <code>build.bat</code> script.</p>
 
 <p>If you don't want to get the build files from SVN, you can download a
@@ -92,7 +93,7 @@
 accompanying metafile (<code>newfilename.xml.meta</code>). Since these
 tasks are written in <a href="http://www.perl.org/">perl</a>, you'll need
 a working perl installation for this. If not, you should take these steps
-manually or just drop a note onto the project mailing list that someone else
+manually, or just leave a note on the project mailing list so that someone else
 can do it.</p>
 
 </section>
@@ -100,13 +101,13 @@
 <section><title>Generating a PDF version</title>
 
 <p>The PDF version of the docs is generated by transforming the xml
-files to LaTeX using the "latex-en" Ant target.  The XSLT style files
-for the transformation are under <code>style/latex/</code>.  Once you
+files to LaTeX using the "latex-en" Ant target. The XSLT style files
+for the transformation are under <code>style/latex/</code>. Once you
 have the <code>.tex</code> equivalent of each <code>.xml</code> file,
 you can use <code>pdflatex</code> to convert this into a pdf file.
 Recommended versions of pdflatex can be obtained as part of TeTeX
 (unix) or MikTeX (win32), but any version of TeX should be fine, as
-long as it is sufficiently complete and modern.  To generate the PDF,
+long as it is sufficiently complete and modern. To generate the PDF,
 you should process the <code>sitemap.tex</code> file, which contains
 the main LaTeX document code and will include all the other files.
 The outputed PDF will then be called <code>sitemap.pdf</code>, which
@@ -114,36 +115,36 @@
 
 <p>Some notes about the XML to LaTeX conversion are necessary.
 Although HTML and LaTeX have many similarities, there are enough
-differences between the two to make targeting both outputs a difficult
-proposition.  In particular, the method of handling tables is very
-different.  To aid LaTeX in understanding tables designed for HTML, a
+differences between the two to make targetting both outputs a difficult
+task. In particular, the methods for handling tables are very
+different. To aid in the conversion to LaTeX of tables designed for HTML, a
 <code>&lt;columnspec&gt;</code> section should be added to each table.
 Inside the <code>&lt;columnspec&gt;</code>, place a <code>&lt;column
 width=".xx"/&gt;</code> for each column in the table, where
 <code>xx</code> is the percentage of the line-width devoted to that
-column.  This will let the conversion handle basic tables.  More
-complex stuff (like spanning rows or columns) will not work.</p>
+column. This will assist in the conversion of basic tables.  More
+complex stuff (like spanning rows or columns) is not currently convertible.</p>
 
-<p>In addition, <code>pdflatex</code> does not know how to incorporate
-GIF files.  So any graphics must be available in PNG format.</p>
+<p>Further, <code>pdflatex</code> cannot incorporate
+GIF files in a generated PDF, so any graphics must be available in PNG format.</p>
 
 <p>There are various other restrictive assumptions embedded
 in the XSLT that work for the current docs, but may need to be
-modified in the future.  For example, the code that transforms
-HTML-style links to LaTeX cross-references will work only with the
-main directory and one level of subdirectory.  Also, 
-<code>&lt;pre&gt;</code> sections are very likely not to work well
+modified in the future. For example, the code that transforms
+HTML-style links to LaTeX cross-references will only work within the
+main directory and one level of subdirectory. Also, 
+<code>&lt;pre&gt;</code> sections rarely work well
 in LaTeX because of differences in escaping and formatting rules
 in <code>verbatim</code> sections.</p>
 
 <p>Finally, there are various differences in escaping rules between
-XML/HTML and LaTeX.  Some characters need to be backslash-escaped in
+XML/HTML and LaTeX. Some characters need to be backslash-escaped in
 LaTeX, and all XML entitites (&amp;whatever;) must be converted to
-LaTeX equivalents.  This is currently handled for a limitted set of
-characters using a big ugly search-replace in the XSLT.  But this may
+LaTeX equivalents. This is currently handled for a limited set of
+characters using a big, ugly search-replace in the XSLT. This may
 need to be modified in the future, especially to handle translations.
-Perhaps pre-processing with a perl script and a substitution table
-would be better.</p>
+Pre-processing with a perl script and a substitution table
+may be a better solution.</p>
 
 </section>
 

Modified: httpd/site/trunk/xdocs/docs-project/index.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/docs-project/index.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/docs-project/index.xml (original)
+++ httpd/site/trunk/xdocs/docs-project/index.xml Tue Jan 17 10:35:56 2006
@@ -13,7 +13,7 @@
                      <a href="../docs/trunk/">Current</a> </p>
 
 <p align="center">Downloadable documentation in Microsoft Help (CHM) and PDF
-versions are available from our <a href="http://www.apache.org/dyn/closer.cgi/httpd/docs/">distribution
mirrors</a>.</p>
+formats are available from our <a href="http://www.apache.org/dyn/closer.cgi/httpd/docs/">distribution
mirrors</a>.</p>
 
 <p>The Documentation Project is an effort to maintain and improve the
 quality of the documentation included with the Apache HTTP Server.
@@ -37,7 +37,7 @@
 it to the <a href="../bug_report.html">bug database</a>.</p>
 
 <p>There are lots of ways to contribute to the documentation
-project, including fixing a few typos and spelling mistakes,
+project, including fixing typos and spelling mistakes,
 translating the documentation into other languages, writing
 tutorials to help new users, or just expressing your
 opinion about suggested changes.</p>
@@ -50,7 +50,7 @@
 <a href="http://apache-server.com/tutorials/ATdocs-project.html"
 >Documentation Project Tutorial</a>.</p>
 
-<p>For information on our project to use XML in the documentation, see
+<p>For information on our use of XML in the documentation, see
 our <a href="docsformat.html">Documentation Format and
 Transformation</a> page.</p>
 
@@ -70,7 +70,7 @@
 
 <ul>
 <li><a href="http://www.codefaktor.de/">Erik Abele</a></li>
-<li><a href="http://www.ntrnet.net/~rbb/">Ryan Bloom</a></li>
+<li><a href="http://rkbloom.net/rbb/">Ryan Bloom</a></li>
 <li><a href="http://www.rcbowen.com/">Rich Bowen</a></li>
 <li><a href="http://Golux.Com/coar/">Ken Coar</a></li>
 <li><a href="http://www.logilune.com/eric/">Eric Cholet</a></li>
@@ -79,6 +79,7 @@
 <li><a href="http://www.kess-net.de/">Astrid Ke&#223;ler</a></li>
 <li>Andr&#233; L. Malo</li>
 <li><a href="http://www.reppep.com/~pepper/">Chris Pepper</a></li>
+<li><a href="http://www.nerdchic.net/">Noirin Plunkett</a></li>
 <li>William A. Rowe, Jr.</li>
 <li><a href="http://slive.ca/">Joshua Slive</a></li>
 <li><a href="http://www.toftum.org/">Mads Toftum</a></li>

Modified: httpd/site/trunk/xdocs/docs-project/translations.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/docs-project/translations.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/docs-project/translations.xml (original)
+++ httpd/site/trunk/xdocs/docs-project/translations.xml Tue Jan 17 10:35:56 2006
@@ -9,10 +9,12 @@
 
 <p>We encourage translations of the documentation into other
 languages.  If you would like to assist in translating the
-docs, please start by subscribing to the <a href="./">documentation project
-mailing list</a>.  The documentation project participants are
-usually very willing to help you sort out any questions or technical
-difficulties that may arise in your work.</p>
+docs, please start by reading the general <a href="./">documentation project
+information</a>, and subscribing to the 
+<a href="http://mail-archives.apache.org/mod_mbox/httpd-docs/"
+>documentation project mailing list</a>. The documentation project participants
are
+usually very willing to help you with any questions or technical
+difficulties that may arise during your work.</p>
 </section>
 
 <section>
@@ -56,12 +58,12 @@
 <li>The <a
 href="http://httpd.apache.org/docs-project/docsformat.html">Documentation
 Format and Transformation</a> page gives some information about the
-transformation from xml to html. Especially translations of the version 2.0
-documentation should be sent as xml file. Commiters should take
-care of generating and commiting the corresponding html file.</li>
+transformation from xml to html. Translations of documentation for Apache 
+version 2.0 and higher should be sent as xml file. Committers will take
+care of generating and committing the corresponding html file.</li>
 <li>The <a href="http://apache-server.com/tutorials/ATdocs-project.html">
-Documentation Project Tutorial</a> gives you a general overview about the
-work with the documentation and how to send in new files and
+Documentation Project Tutorial</a> gives a general overview of the 
+documentation project, and how to send in new files and
 updates.</li>
 </ul>
 </section>
@@ -70,16 +72,16 @@
 
 <p>Because English is the main development language of the Apache HTTP
 Server, it is difficult for the developers to check the quality
-of documentation submitted in other languages.  For this reason, we
+of documentation submitted in other languages. Therefore, we
 require that all translated documentation be reviewed by another
-fluent speaker of the relevant language before they are accepted.
+fluent speaker of the relevant language, before it can be accepted.
 Each commit message should list the reviewer. If the translator is not
-the same as the commiter, the translator should be named in the commit
-message too.</p>
+the same as the committer, the translator should also be named in the commit
+message.</p>
 
 <p>We also encourage you to place the name of the translator
 in a comment at the top of the file, along with the CVS revision
-number of the english-language document that you are translating.
+number of the English-language document that you are translating.
 This should make it easier to determine when files need updating.</p>
 
 </section>

Modified: httpd/site/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/download.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/download.xml (original)
+++ httpd/site/trunk/xdocs/download.xml Tue Jan 17 10:35:56 2006
@@ -144,16 +144,16 @@
 href="http://www.apache.org/dist/httpd/Announcement1.3.html">Official
 Announcement</a>.</p>
 
-<p>The Apache 1.3 series is being actively maintained and leisurely
-developed, to maintain stability. Releases will be made to address security issues, or after
+<p>The Apache 1.3 series is being actively maintained, and 
+developed at a leisurely pace, to maintain stability. Releases will be made to address security
issues, or after
 a comfortable number of bug fixes or improvements have been made.
-Significantly new features will more than likely not be added to 1.3
+Significantly new features are unlikely to be added to 1.3
 in preference to 2.0, although important new features and
 enhancements will be seriously considered for inclusion in 1.3.</p>
 
 <p>Use the Apache 1.3.34 version if you need to use third party
-modules that are not yet available as an Apache 2.0 module.  Apache
-1.3 is not compatibile with Apache 2.0 modules.</p>
+modules that are not yet available as an Apache 2.x module.  Apache
+1.3 is not compatibile with Apache 2.x modules.</p>
 
 <ul>
 <li>Unix Source: <a
@@ -189,7 +189,7 @@
 
 <p>The PGP signatures can be verified using PGP or GPG.  First
 download the <a href="http://www.apache.org/dist/httpd/KEYS">KEYS</a>
-as well as the <code>asc</code> signature file for the particular
+as well as the <code>asc</code> signature file for the relevant
 distribution.  Make sure you get these files from the <a
 href="http://www.apache.org/dist/httpd/">main distribution
 directory</a>, rather than from a mirror. Then verify the signatures

Modified: httpd/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/index.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/index.xml (original)
+++ httpd/site/trunk/xdocs/index.xml Tue Jan 17 10:35:56 2006
@@ -15,7 +15,7 @@
 with the current HTTP standards.</p>
 
 <p>Apache has been the most popular web server on the Internet since
-April of 1996.  The November 2005 <a 
+April 1996.  The November 2005 <a 
 href="http://news.netcraft.com/archives/web_server_survey.html">Netcraft Web Server Survey</a>
 found that more than 70% of the web sites on the Internet are using Apache,
 thus making it more widely used than all other web servers combined.</p>
@@ -27,11 +27,12 @@
 <section id="ac2005">
 <title>ApacheCon US 2005, San Diego, California, USA - 10-14 December 2005</title>
 
-<p>The Apache Software Foundation invites you to 
+<p>The Apache Software Foundation would like to extend a big "thank you" to all of

+	our sponsors, exhibitors, speakers and delegates, for helping to make 
    <a href="http://www.apachecon.com/2005/US"
-     >ApacheCon US 2005</a>!</p>
+     >ApacheCon US 2005</a> a great success!</p>
 
-<p>Please make plans to join us in San Diego.</p>
+<p>We look forward to seeing you at ApacheCon EU and US in 2006.</p>
 </section>
 
 

Modified: httpd/site/trunk/xdocs/lists.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/lists.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/lists.xml (original)
+++ httpd/site/trunk/xdocs/lists.xml Tue Jan 17 10:35:56 2006
@@ -25,23 +25,23 @@
 to access most of the lists with a news reader.</p>
 
     <ul>
-     <li><a href="#http-announce">Announcements list</a></li>
+     <li><a href="#http-announce">Apache Server Announcements</a></li>
      <li><a href="#http-users">User Support and Discussion</a></li>
-     <li><a href="#http-dev">Development mailing list</a></li>
-     <li><a href="#http-bugdb">Bug database reports</a></li>
-     <li><a href="#http-cvs">Source change reports</a></li>
-     <li><a href="#http-docs">Documentation subproject discussions</a></li>
-     <li><a href="#http-modules">Module writers' lists</a></li>
-     <li><a href="#http-packagers">Packagers list</a></li>
-     <li><a href="#http-gui">Graphical User Interface (GUI) discussions</a></li>
-     <li><a href="#http-proxydev">Proxy rework subproject discussions</a></li>
-     <li><a href="#http-testers">Testers of release candidates</a></li>
+     <li><a href="#http-dev">Apache HTTP Server Development Main Discussion List</a></li>
+     <li><a href="#http-bugdb">Apache HTTP Server Bug Reports List</a></li>
+     <li><a href="#http-cvs">Source Change Reports</a></li>
+     <li><a href="#http-docs">Apache HTTP Server Documentation Project</a></li>
+     <li><a href="#http-modules">HTTP Server Module Writers' Lists</a></li>
+     <li><a href="#http-packagers">Packagers' List</a></li>
+     <li><a href="#http-gui">GUI Management Interface for the Apache Web Server</a></li>
+     <li><a href="#http-proxydev">Proxy Module Rework Discussion List</a></li>
+     <li><a href="#http-testers">Mailing List for Testers of Apache HTTP Server
Release Candidates</a></li>
     </ul>
 
 </section>
 <section id="http-announce"><title>Apache Server Announcements</title>
 <p>
-The <code>announce@httpd.Apache.Org</code> mailing list is used to announce
+The <code>announce@httpd.apache.org</code> mailing list is used to announce
 major releases and other important information about the Apache HTTP
 Server project.  Messages are posted only by the Foundation; there is
 no discussion.
@@ -54,12 +54,16 @@
  <tr>
   <td>Subscription address:</td>
   <td><a href="mailto:announce-subscribe@httpd.Apache.Org"
-      >announce-subscribe@httpd.Apache.Org</a></td>
+      >announce-subscribe@httpd.apache.org</a></td>
+ </tr>
+ <tr>
+  <td>Digest subscription address:</td>
+  <td>None.</td>
  </tr>
  <tr>
   <td>Unsubscription address:</td>
   <td><a href="mailto:announce-unsubscribe@httpd.Apache.Org"
-      >announce-unsubscribe@httpd.Apache.Org</a></td>
+      >announce-unsubscribe@httpd.apache.org</a></td>
  </tr>
  <tr>
   <td>Getting help with the list:</td>
@@ -77,8 +81,8 @@
     <li><a href="http://marc.theaimsgroup.com/?l=apache-httpd-announce"
         >Mailing list archives</a> at MARC</li>
     <li>Available back to 27 October 1999.  Send a message to
-      <a href="mailto:announce-help@httpd.Apache.Org"
-      >announce-help@httpd.Apache.Org</a> for information about accessing
+      <a href="mailto:announce-help@httpd.apache.org"
+      >announce-help@httpd.apache.org</a> for information about accessing
       the archives.</li>
    </ul>
   </td>
@@ -90,17 +94,17 @@
 
 <p>The lists and discussion groups listed here are the <strong>only</strong>

 place that configuration and how-to questions belong, ever.  Every day, users
-become frustrated, not with Apache, but how nobody will help them understand
+become frustrated, not with Apache, but with how nobody will help them understand
 how to get started.  95% of the time, it's not for lack of helpers, but for
 lack of effort and well stated questions.</p>
 
 <p>Before you go further, please read Eric S. Raymond and Rick Moen's
 explanation of <a
 href="http://www.catb.org/~esr/faqs/smart-questions.html" >"How To Ask
-Questions The Smart Way"</a>.  If you follow his advice, you will
+Questions The Smart Way"</a>.  If you follow their advice, you will
 discover that these forums have dozens of helpers ready to provide you
 with guidance on using the Apache HTTP Server!  <strong>Note: Do not
-sent your Apache questions to Eric himself!</strong></p>
+sent your Apache questions to Eric or Rick!</strong></p>
 
 <p>There are now a few <strong>Apache HTTP Server Users Mailing Lists</strong>
 available in different languages.</p>
@@ -145,7 +149,7 @@
 <note>Configuration and support questions should be addressed to a
 <a href="#http-users">user support group</a>.  This list is only
 for discussion of changes to the source code and related issues.
-Other questions will likely be ignored.</note>
+Other questions are likely to be ignored.</note>
 
 <table>
  <tr>
@@ -156,7 +160,7 @@
   <td>Subscription address:</td>
   <td><a href="mailto:dev-subscribe@httpd.apache.org"
       >dev-subscribe@httpd.apache.org</a>
-      (<strong>No user support list!</strong>)</td>
+      (<strong>Not a user support list!</strong>)</td>
  </tr>
  <tr>
   <td>Digest subscription address:</td>
@@ -164,7 +168,7 @@
       >dev-digest-subscribe@httpd.apache.org</a></td>
  </tr>
  <tr>
-  <td>Unsubscription addresses:</td>
+  <td>Unsubscription address:</td>
   <td><a href="mailto:dev-unsubscribe@httpd.apache.org"
       >dev-unsubscribe@httpd.apache.org</a></td>
  </tr>
@@ -199,8 +203,8 @@
 </table>
 </section>
 
-<section id="http-bugdb"><title>Apache HTTP server bug reports
-list</title>
+<section id="http-bugdb"><title>Apache HTTP Server Bug Reports
+List</title>
 <p>
 This is the mailing list to which all activity in the <a
 href="http://issues.apache.org/bugzilla/">problem report database</a>
@@ -209,7 +213,7 @@
 </p>
 
 <p>If you take ownership of bug by assigning it to yourself, please
-remember to add this mailing list to the cc: list so that it continues
+remember to add this mailing list to the cc: list so that the list continues
 to receive updates.</p>
 
 <table>
@@ -310,13 +314,11 @@
 </table>
 </section>
 
-<section id="http-docs"><title>HTTP Server Documentation Project</title>
+<section id="http-docs"><title>Apache HTTP Server Documentation Project</title>
 <p>
 This mailing list is used by the people working on improving and
-translating the documentation of the Apache HTTP server.  Messages
-posted to it include both discussion messages from people, and 
-automatic source-change notifications of alterations applied to the
-documentation sources.
+translating the documentation of the Apache HTTP server. It is primarily 
+used for discussion of changes to the documentation.
 </p>
 <table>
  <tr>
@@ -393,6 +395,10 @@
       >packagers-subscribe@httpd.apache.org</a></td>
  </tr>
  <tr>
+  <td>Digest subscription address:</td>
+  <td>None.</td>
+ </tr>
+ <tr>
   <td>Unsubscription addresses:</td>
   <td><a href="mailto:packagers-unsubscribe@apache.org"
       >packagers-unsubscribe@apache.org</a></td>
@@ -465,8 +471,8 @@
 </table>
 </section>
 
-<section id="http-proxydev"><title>Proxy module rework discussion
-list</title>
+<section id="http-proxydev"><title>Proxy Module Rework Discussion
+List</title>
 <p>This group is no longer active.  Proxy development discussion
 should take place on the main dev list.</p>
 <table>
@@ -515,14 +521,14 @@
 </table>
 </section>
 
-<section id="http-testers"><title>Mailing list for HTTP server
-testers of release candidates</title>
+<section id="http-testers"><title>Mailing List for Testers of 
+Apache HTTP Server Release Candidates</title>
 <p>
 This mailing list is for folks who want to test out snapshots and release
 candidates of the current development trees.  Reports of <b>differences</b>
 in behaviour between the latest public release and the latest development
-snapshots are appreciated.  This list is not for testing released versions,
-people should continue to submit bug reports to the bugdb for problems that 
+snapshots are appreciated.  This list is not for testing released versions -
+you should continue to submit bug reports to the bugdb for problems that 
 exist the final released versions.
 </p>
 <p>
@@ -530,8 +536,8 @@
 consideration as the 'next release', or when some major milestone in the 
 development process has been achieved.  Subscribers to this list are invited 
 (and encouraged) to 'test-drive' these candidates just before they're 
-generally released, note these candidates are <strong>NOT</strong> yet
-released and should not be carried on announcement channels, until the
+generally released. Note these candidates are <strong>NOT</strong> yet
+released, and should not be carried on announcement channels, until the
 testing is complete and they have been voted for release on the dev@ list.
 </p>
 <table>

Modified: httpd/site/trunk/xdocs/related_projects.html
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/related_projects.html?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/related_projects.html (original)
+++ httpd/site/trunk/xdocs/related_projects.html Tue Jan 17 10:35:56 2006
@@ -134,9 +134,9 @@
 The mod_ssl package is <A
 HREF="http://www.modssl.org/source/">distributed</A> as a
 source extension and set of patches for the Apache 1.3 webserver from outside
-the United States.  Inside the United States you are able to use it for
+the United States.  Inside the United States you may use it for
 non-commercial purposes for free if you use RSAREF (due to various patents).
-Outside the United States you can use it for non-commercial and commercial
+Outside the United States you may use it for both commercial and non-commercial
 purposes for free.
 
 <P><HR>
@@ -151,7 +151,7 @@
 <P><HR>
 <H3><A NAME="quickref">Apache Quick Reference Card</A></h3>
 
-<P>A compact, tri-fold double-sided page listing all major directives,
+<P>A compact, tri-fold, double-sided page listing all major directives,
 available at <A HREF="http://www.refcards.com/">http://www.refcards.com/</A>.
 A
 mod_perl refcard is also available.
 
@@ -164,16 +164,16 @@
 source code.
 
 <P>The webserver is distributed with the full source code.  Inside the
-United States you are able to use it for non-commercial purposes for
+United States you may use it for non-commercial purposes for
 free if you use RSAREF (due to various patents). Outside the United
-States you can use it for non-commercial and commercial purposes for
+States you may use it for both commercial and non-commercial purposes for
 free.
 
-<P>Inside the United States in order to use Apache with SSL commercially
+<P>If you wish to use Apache with SSL commercially, inside the United States,
 you may want to look at <A HREF="#stronghold">Stronghold</A> or <A
 HREF="#raven">Raven</A>.
 
-<A HREF="http://www.apache-ssl.org/">Get Apache-SSL from here</A>.
+<A HREF="http://www.apache-ssl.org/">Apache-SSL is available here</A>.
 
 <P><HR>
 <H3><A NAME="tcs" HREF="http://www.tcs-sec.com/"
@@ -238,7 +238,7 @@
 Covalent Antivirus is a commercial Apache module that
 automatically scans all outgoing data: HTML, Java,
 Javascript, binary downloads, audio streams, or any
-other datatype for viruses. When a virus is found a
+other datatype for viruses. When a virus is found, a
 "Service Not Available" message is shown. Extensive
 logging and reporting allows for notification of the
 webmaster by means of a logfile, snmp-trap, syslog or
@@ -374,7 +374,7 @@
 an Apache based HTTP server integrated with Stratos application server.
 StWeb is platform and database independent. It runs on all major
 hardware  and operating systems and can be used with most of popular
-database servers. Application once developed, can be deployed on any of
+database servers. Applications, once developed, can be deployed on any of
 the supported systems ("write once, use anywhere" ).
 The Personal Edition  of StWeb is free and is available for download
 from the StWeb site.
@@ -425,8 +425,8 @@
 <H3><A NAME="ww">WebWeaving Internet Engineering</A></H3>
 
 WebWeaving is a commercial consulting company specialized
-in apache related technology, integrated entitlement systems, 
-apache performance tuning and integration with legacy systems.
+in Apache related technology, integrated entitlement systems, 
+Apache performance tuning and integration with legacy systems.
 
 <BLOCKQUOTE>
 For more information visit

Modified: httpd/site/trunk/xdocs/usersdelist.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/usersdelist.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/usersdelist.xml (original)
+++ httpd/site/trunk/xdocs/usersdelist.xml Tue Jan 17 10:35:56 2006
@@ -32,7 +32,7 @@
 Please configure your email client to send plain text so that everyone
 will be able to read your message.</dd>
 
-<dt><strong>Send german mails:</strong></dt><dd>The users-de
list
+<dt><strong>Send German mails:</strong></dt><dd>The users-de
list
 is a German-language mailing list. English mails should be directed
 to our <a href="userslist.html">English-language mailing list</a>.</dd>
 
@@ -46,7 +46,8 @@
 questions in the group most targeted to your problem.  For example, if
 you have a problem with a module that is not distributed as part of
 the standard Apache HTTP Server, you will probably find a more knowledgable
-group by sending to a mailing list devoted to that module.
+group by sending to a mailing list devoted to that module. In general, mails to
+these groups should be sent in English.
 Some examples:
 <ul>
 <li><a href="http://www.php.net/support.php">PHP</a></li>
@@ -73,7 +74,7 @@
 <section id="unsubscribe">
 <title>Un-Subscribe</title>
 
-<p>To get off the mailing list, send a messages to
+<p>To unsubscribe, send a messages to
 <code><strong>users-de-unsubscribe@httpd.apache.org</strong></code>.
 You must send the unsubscribe message from the same email address that
 you used to subscribe to the list.</p>

Modified: httpd/site/trunk/xdocs/userslist.xml
URL: http://svn.apache.org/viewcvs/httpd/site/trunk/xdocs/userslist.xml?rev=369860&r1=369859&r2=369860&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/userslist.xml (original)
+++ httpd/site/trunk/xdocs/userslist.xml Tue Jan 17 10:35:56 2006
@@ -67,7 +67,7 @@
     measure.  The list is moderated by volunteers from the Apache Software
     Foundation; moderation will mostly be notable by its absence.
     However, blatant abuse of the forum's purpose or the sensibilities
-    of the subscribers will not be tolerated.  Any actions taken
+    of the subscribers will not be tolerated.  Any action taken
     by the moderators is final, solely at their discretion, and not
     subject to formal appeal.
   </blockquote>
@@ -93,7 +93,7 @@
 <section id="unsubscribe">
 <title>Un-Subscribe</title>
 
-<p>To get off the mailing list, send a messages to
+<p>To unsubscribe, send a messages to
 <code><strong>users-unsubscribe@httpd.apache.org</strong></code>.
 You must send the unsubscribe message from the same email address that
 you used to subscribe to the list.</p>



Mime
View raw message