Author: kkolinko
Date: Fri Mar  5 00:16:33 2010
New Revision: 919243

URL: http://svn.apache.org/viewvc?rev=919243&view=rev
Log:
Rearrange, rewrite and amend information on the bugreport.html page.
Update server name on the IRC page.

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/xdocs/bugreport.xml
    tomcat/site/trunk/xdocs/irc.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=919243&r1=919242&r2=919243&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri Mar  5 00:16:33 2010
@@ -217,6 +217,34 @@
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Bugzilla is not a support forum">
+<strong>Bugzilla is not a support forum</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<p>
+<blockquote>
+<p>Support questions should not be sent to Bugzilla. If you cannot diagnose
+your problem, or if the problem is in your configuration, use the
+<a href="lists.html">mailing lists</a>.
+</p>
+</blockquote>
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="Resources to help resolve Apache Tomcat problems">
 <strong>Resources to help resolve Apache Tomcat problems</strong>
 </a>
@@ -271,6 +299,70 @@
 <tr>
 <td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Apache Tomcat discussion lists">
+<strong>Apache Tomcat discussion lists</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<blockquote>
+    <p>It is very likely you are not the first to run into a problem.
+      Others may have already found a solution.  The <b>tomcat-user</b>,
+      <b>taglibs-user</b> or <b>tomcat-dev</b> list archives may contain
+      discussions which will help you resolve the problem.
+      Here are three resources to view the Apache Tomcat User List archives:
+       <a 
href="http://marc.theaimsgroup.com/?l=tomcat-user&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
+       <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse</a>,
+       <a href="http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail 
Archive</a>.
+
+      Here are three resources to view the Apache Tomcat Developer List 
archives
+      <a 
href="http://marc.theaimsgroup.com/?l=tomcat-dev&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
+      <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Eyebrowse</a>,
+      and <a href="http://www.mail-archive.com/dev@tomcat.apache.org/";>Mail 
Archive</a>.
+    </p>
+    <p>See the <a href="lists.html">mailing lists</a> page for the further
+    information on the lists.</p>
+  </blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Apache Tomcat on IRC">
+<strong>Apache Tomcat on IRC</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<blockquote>
+    <p>An <a href="irc.html">IRC channel</a> dedicated to Apache Tomcat
+    exists on Freenode.net.</p>
+  </blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+
+  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="Bug Database">
 <strong>Bug Database</strong>
 </a>
@@ -280,30 +372,31 @@
 <tr>
 <td>
 <blockquote>
-    <p>Please search the bug database to see if the bug you are
+    <p>Please <a 
href="https://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205&amp;product=Tomcat%206&amp;product=Tomcat%207&amp;product=Tomcat%20Connectors&amp;product=Tomcat%20Native";>search
+      the bug database</a> to see if the bug you are
       seeing has already been reported.
-      <ul>
-        <li>The bug may have already been fixed and is available in a later
-        version or nightly build.</li>
-        <li>Someone else may have reported the bug, you could add supporting
-        information to help reproduce and resolve the bug.</li>
-      </ul>
-      Search the Apache Tomcat 6 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%206";>
-      here</a>.<br/>
-      Search the Apache Tomcat 5 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205";>
-      here</a>.<br/>
-      Search the Apache Tomcat 4 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%204";>
-      here</a>.<br/>
-      Search the Apache Tomcat Connectors bug database
-      <a 
href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Connectors";>
-      here</a>.<br/>
-      Search the Apache Tomcat Native bug database
-      <a 
href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Native";>
-      here</a>.
     </p>
+    <ul>
+      <li>The bug may have already been fixed and is available in a later
+      version or nightly build.</li>
+      <li>Someone else may have reported the bug, you could add supporting
+      information to help reproduce and resolve the bug.</li>
+    </ul>
+    <p>Supported Tomcat projects:</p>
+    <ul>
+      <li>
+<b>Tomcat 7</b> - future Tomcat 7.0</li>
+      <li>
+<b>Tomcat 6</b> - Tomcat 6.0.x</li>
+      <li>
+<b>Tomcat 5</b> - Tomcat 5.5.x</li>
+      <li>
+<b>Tomcat Connectors</b> - Integration of Tomcat with other Web servers</li>
+      <li>
+<b>Tomcat Native</b> - APR based native HTTP and AJP connectors for Tomcat</li>
+      <li>
+<b>Taglibs</b> - Apache Taglibs</li>
+    </ul>
   </blockquote>
 </td>
 </tr>
@@ -318,8 +411,8 @@
 <tr>
 <td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="Apache Tomcat discussion lists">
-<strong>Apache Tomcat discussion lists</strong>
+<a name="Recent version">
+<strong>Recent version</strong>
 </a>
 </font>
 </td>
@@ -327,28 +420,9 @@
 <tr>
 <td>
 <blockquote>
-    <p>It is very likely you are not the first to run into a problem.
-      Others may have already found a solution.  The <b>tomcat-user</b>
-      or <b>tomcat-dev</b> list archives may contain discussions which
-      will help you resolve the problem.
-      Here are four resources to view the Apache Tomcat User List archives:
-       <a 
href="http://marc.theaimsgroup.com/?l=tomcat-user&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
-       <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse</a>,
-       <a href="http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail 
Archive</a>,
-       and <a href="http://mikal.org/interests/java/tomcat/";>mikal.org</a>.
+    <p>Try to reproduce your problem with the latest released version of
+    Apache Tomcat.</p>
 
-      Here are four resources to view the Apache Tomcat Developer List archives
-      <a 
href="http://marc.theaimsgroup.com/?l=tomcat-dev&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
-      <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Eyebrowse</a>,
-      and <a href="http://www.mail-archive.com/dev@tomcat.apache.org/";>Mail 
Archive</a>.
-    </p>
-    <p>If you have already subscribed to the
-      <a href="mailto:us...@tomcat.apache.org";>Tomcat User</a>
-      or <a href="mailto:dev@tomcat.apache.org";>Tomcat Developer</a>
-      discussion lists you can ask about the problem on those lists.
-      If you are not subscribed, you can learn about the lists and subscribe
-      <a href="lists.html">here</a>.
-    </p>
   </blockquote>
 </td>
 </tr>
@@ -363,8 +437,8 @@
 <tr>
 <td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="Apache Tomcat on IRC">
-<strong>Apache Tomcat on IRC</strong>
+<a name="Recently fixed issues">
+<strong>Recently fixed issues</strong>
 </a>
 </font>
 </td>
@@ -372,12 +446,48 @@
 <tr>
 <td>
 <blockquote>
-    <p>An IRC channel dedicated to Apache Tomcat exists on OpenProjects.</p>
 
-    <p>
-<code>#tomcat</code> at <code>irc.us.openprojects.net</code>.
-    Click <a href="irc://irc.freenode.net/#tomcat">here</a> to
-    connect to the channel using Mozilla.</p>
+
+    <p>Problems fixed in released versions of Tomcat can be found on the
+    <em>Changelog</em> pages in Documentation. Here are the links to them:</p>
+
+    <ul>
+      <li>
+        <a 
href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html";>Tomcat 6.0</a>,
+        <a 
href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html";>Tomcat 5.5</a>
+        Changelog
+      </li>
+      <li>
+        <a 
href="http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>Tomcat
 Connectors</a>
+      </li>
+      <li>
+        <a 
href="http://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>Tomcat 
Native</a>
+      </li>
+    </ul>
+
+    <p>A copy of the above files for not yet released versions can be found
+    in the sources repository. Those files are in XML format, but if you are
+    using a fairly modern browser it will render them for you:</p>
+
+    <ul>
+      <li>
+        <a 
href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml";>Tomcat
 6.0</a>,
+        <a 
href="http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml";>Tomcat
 5.5</a>
+        changelog.xml
+      </li>
+    </ul>
+
+    <p>Patches that are already prepared, but have not yet collected enough
+    committer votes to be applied, are listed in the STATUS files in the
+    root of the source trees for the released versions of Tomcat.</p>
+
+    <ul>
+      <li>
+        <a 
href="http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?view=markup";>Tomcat
 6.0</a>,
+        <a 
href="http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?view=markup";>Tomcat
 5.5</a>
+        STATUS.txt
+      </li>
+    </ul>
   </blockquote>
 </td>
 </tr>
@@ -412,43 +522,57 @@
 <td>
 <p>
 <blockquote>
-<p>If after you have exhausted all other resources to resolve a problem
-with Apache Tomcat you may want to file a bug report.  Please make sure the
-problem is a bug in Apache Tomcat and not a bug in your web application.</p>
+<p>Please make sure the problem is a bug in Apache Tomcat and not a
+bug in your web application.</p>
 
-<p>Please make sure you provide as much information as possible. Its
-very hard to fix a bug if the person looking into the problem can't
+<p>Please provide as much information as possible. It is
+very hard to fix a bug if the person looking into the problem cannot
 reproduce it.  Here is a listing of information which should be included:
 <ul>
-  <li>
-<b>Version</b> - Apache Tomcat version, if from a nightly build, version
-    and date of build.</li>
-  <li>
-<b>Component</b> - Apache Tomcat component which has the bug.</li>
-  <li>
-<b>Platform</b> - Hardward platform Tomcat is running on.</li>
-  <li>
-<b>OS</b> - Computer operating system and version.</li>
-  <li>
-<b>JVM</b> - JVM Version</li>
-  <li>
-<b>Web Server</b> - Web Server and version, Apache Tomcat Connector and 
version.</li>
-  <li>
-<b>Configuration</b> - Attach configuration files if they would help track
-    down the bug.</li>
-  <li>
-<b>Log file excerpts</b> - Review your logs files, reproduce the bug with
-    debugging enabled in your Apache Tomcat configuration.  Then submit any 
relevant
-    sections of the log which help document the bug.</li>
-  <li>
+  <li>Environment details:
+    <ul>
+      <li>
+<b>Version</b> - Apache Tomcat version, if from a nightly build,
+      version and date of build. Please not only select the version from a
+      list, but also repeat it in the text of your bug report.</li>
+      <li>
+<b>Platform</b> and <b>OS</b> - Hardware platform and operating system
+      Tomcat is running on.</li>
+      <li>
+<b>Java version</b> - Vendor and version of your Java Runtime
+      Environment used to run Tomcat.</li>
+    </ul>
+  </li>
+  <li>Configuration:
+    <ul>
+      <li>
+<b>Component</b> - Apache Tomcat component which has the bug.
+      If you do not know, just guess.</li>
+      <li>
+<b>Web Server</b> - Web Server and version, Apache Tomcat Connector
+      and version.</li>
+      <li>
+<b>Configuration</b> - Attach configuration files if they would
+      help track down the bug.</li>
+    </ul>
+  </li>
+  <li>Evidences:
+    <ul>
+      <li>
+<b>Log file excerpts</b> - Review your logs files, reproduce the bug
+      with debugging enabled in your Apache Tomcat configuration.  Then submit
+      any relevant sections of the log which help document the bug.</li>
+      <li>
 <b>Stack Traces</b> - Any stack traces generated by the bug.</li>
+    </ul>
+  </li>
   <li>
 <b>Example</b> - Example configuration files or web applications which
     demonstrate the bug.  When submitting an example which reproduces the bug,
     please try to make it as simple as possible.</li>
   <li>
-<b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> which
-    fixes the bug.
+<b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> or
+    <code>svn diff</code> which fixes the bug.
     (If you have found a bug fix which can be applied to the Apache Tomcat 
code)</li>
   <li>
 <b>Miscellaneous</b> - Any other information you feel will help track
@@ -456,15 +580,15 @@
     with Apache Tomcat.</li>
 </ul>
 
+Report an Apache Tomcat 7 bug
+<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%207";>
+here</a>.<br/>
 Report an Apache Tomcat 6 bug
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>
 here</a>.<br/>
 Report an Apache Tomcat 5 bug
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>
 here</a>.<br/>
-Report an Apache Tomcat 4 bug
-<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%204";>
-here</a>.<br/>
 Report an Apache Tomcat Connectors bug
 <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>
 here</a>.<br/>
@@ -472,6 +596,7 @@
 <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Native";>
 here</a>.<br/>
 </p>
+<p/>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr>
 <td bgcolor="#828DA6">
@@ -486,11 +611,9 @@
 <td>
 <blockquote>
 <p>Security-related bugs are of special concern.  If you have a verified
-security bug to report please do not post it
-to email lists or submit a bug report.  Security bugs should be reported
-privately by email to <a href="mailto:secur...@tomcat.apache.org";>
-secur...@tomcat.apache.org</a>.
-</p>
+security bug to report please neither post it
+to public email lists nor submit a bug report.
+See <a href="security.html">Security Reports</a> page on how to report them</p>
 </blockquote>
 </td>
 </tr>

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=919243&r1=919242&r2=919243&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Fri Mar  5 00:16:33 2010
@@ -188,7 +188,7 @@
 <p>
 <blockquote>
 
-<p>An IRC channel dedicated to Tomcat exists on OpenProjects.</p> 
+<p>An IRC channel dedicated to Tomcat exists on Freenode.net.</p> 
 
 <p>
 <code>#tomcat</code> at <code>irc.freenode.net</code>.

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=919243&r1=919242&r2=919243&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Fri Mar  5 00:16:33 2010
@@ -27,6 +27,13 @@
 </p>
 </section>
 
+<section name="Bugzilla is not a support forum">
+<p>Support questions should not be sent to Bugzilla. If you cannot diagnose
+your problem, or if the problem is in your configuration, use the
+<a href="lists.html">mailing lists</a>.
+</p>
+</section>
+
 <section name="Resources to help resolve Apache Tomcat problems">
 <p>Here are some resources you can use to help you resolve the
 problem you are having before reporting a bug.</p>
@@ -45,110 +52,162 @@
     </p>
   </subsection>
 
-  <subsection name="Bug Database">
-    <p>Please search the bug database to see if the bug you are
-      seeing has already been reported.
-      <ul>
-        <li>The bug may have already been fixed and is available in a later
-        version or nightly build.</li>
-        <li>Someone else may have reported the bug, you could add supporting
-        information to help reproduce and resolve the bug.</li>
-      </ul>
-      Search the Apache Tomcat 6 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%206";>
-      here</a>.<br />
-      Search the Apache Tomcat 5 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205";>
-      here</a>.<br />
-      Search the Apache Tomcat 4 bug database
-      <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%204";>
-      here</a>.<br />
-      Search the Apache Tomcat Connectors bug database
-      <a 
href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Connectors";>
-      here</a>.<br />
-      Search the Apache Tomcat Native bug database
-      <a 
href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Native";>
-      here</a>.
-    </p>
-  </subsection>
-
   <subsection name="Apache Tomcat discussion lists">
     <p>It is very likely you are not the first to run into a problem.
-      Others may have already found a solution.  The <b>tomcat-user</b>
-      or <b>tomcat-dev</b> list archives may contain discussions which
-      will help you resolve the problem.
-      Here are four resources to view the Apache Tomcat User List archives:
+      Others may have already found a solution.  The <b>tomcat-user</b>,
+      <b>taglibs-user</b> or <b>tomcat-dev</b> list archives may contain
+      discussions which will help you resolve the problem.
+      Here are three resources to view the Apache Tomcat User List archives:
        <a 
href="http://marc.theaimsgroup.com/?l=tomcat-user&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
        <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse</a>,
-       <a href="http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail 
Archive</a>,
-       and <a href="http://mikal.org/interests/java/tomcat/";>mikal.org</a>.
+       <a href="http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail 
Archive</a>.
 
-      Here are four resources to view the Apache Tomcat Developer List archives
+      Here are three resources to view the Apache Tomcat Developer List 
archives
       <a 
href="http://marc.theaimsgroup.com/?l=tomcat-dev&amp;r=1&amp;w=2";>Mailing list 
ARChives</a>,
       <a 
href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Eyebrowse</a>,
       and <a href="http://www.mail-archive.com/dev@tomcat.apache.org/";>Mail 
Archive</a>.
     </p>
-    <p>If you have already subscribed to the
-      <a href="mailto:us...@tomcat.apache.org";>Tomcat User</a>
-      or <a href="mailto:dev@tomcat.apache.org";>Tomcat Developer</a>
-      discussion lists you can ask about the problem on those lists.
-      If you are not subscribed, you can learn about the lists and subscribe
-      <a href="lists.html">here</a>.
-    </p>
+    <p>See the <a href="lists.html">mailing lists</a> page for the further
+    information on the lists.</p>
   </subsection>
 
   <subsection name="Apache Tomcat on IRC">
-    <p>An IRC channel dedicated to Apache Tomcat exists on OpenProjects.</p>
+    <p>An <a href="irc.html">IRC channel</a> dedicated to Apache Tomcat
+    exists on Freenode.net.</p>
+  </subsection>
+
+  <subsection name="Bug Database">
+    <p>Please <a 
href="https://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205&amp;product=Tomcat%206&amp;product=Tomcat%207&amp;product=Tomcat%20Connectors&amp;product=Tomcat%20Native";>search
+      the bug database</a> to see if the bug you are
+      seeing has already been reported.
+    </p>
+    <ul>
+      <li>The bug may have already been fixed and is available in a later
+      version or nightly build.</li>
+      <li>Someone else may have reported the bug, you could add supporting
+      information to help reproduce and resolve the bug.</li>
+    </ul>
+    <p>Supported Tomcat projects:</p>
+    <ul>
+      <li><b>Tomcat 7</b> - future Tomcat 7.0</li>
+      <li><b>Tomcat 6</b> - Tomcat 6.0.x</li>
+      <li><b>Tomcat 5</b> - Tomcat 5.5.x</li>
+      <li><b>Tomcat Connectors</b> - Integration of Tomcat with other Web 
servers</li>
+      <li><b>Tomcat Native</b> - APR based native HTTP and AJP connectors for 
Tomcat</li>
+      <li><b>Taglibs</b> - Apache Taglibs</li>
+    </ul>
+  </subsection>
+
+  <subsection name="Recent version">
+    <p>Try to reproduce your problem with the latest released version of
+    Apache Tomcat.</p>
+
+  </subsection>
 
-    <p><code>#tomcat</code> at <code>irc.us.openprojects.net</code>.
-    Click <a href="irc://irc.freenode.net/#tomcat">here</a> to
-    connect to the channel using Mozilla.</p>
+  <subsection name="Recently fixed issues">
+
+
+    <p>Problems fixed in released versions of Tomcat can be found on the
+    <em>Changelog</em> pages in Documentation. Here are the links to them:</p>
+
+    <ul>
+      <li>
+        <a 
href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html";>Tomcat 6.0</a>,
+        <a 
href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html";>Tomcat 5.5</a>
+        Changelog
+      </li>
+      <li>
+        <a 
href="http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>Tomcat
 Connectors</a>
+      </li>
+      <li>
+        <a 
href="http://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>Tomcat 
Native</a>
+      </li>
+    </ul>
+
+    <p>A copy of the above files for not yet released versions can be found
+    in the sources repository. Those files are in XML format, but if you are
+    using a fairly modern browser it will render them for you:</p>
+
+    <ul>
+      <li>
+        <a 
href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml";>Tomcat
 6.0</a>,
+        <a 
href="http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml";>Tomcat
 5.5</a>
+        changelog.xml
+      </li>
+    </ul>
+
+    <p>Patches that are already prepared, but have not yet collected enough
+    committer votes to be applied, are listed in the STATUS files in the
+    root of the source trees for the released versions of Tomcat.</p>
+
+    <ul>
+      <li>
+        <a 
href="http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?view=markup";>Tomcat
 6.0</a>,
+        <a 
href="http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?view=markup";>Tomcat
 5.5</a>
+        STATUS.txt
+      </li>
+    </ul>
   </subsection>
 
 </section>
 
 <section name="Reporting Apache Tomcat bugs">
-<p>If after you have exhausted all other resources to resolve a problem
-with Apache Tomcat you may want to file a bug report.  Please make sure the
-problem is a bug in Apache Tomcat and not a bug in your web application.</p>
+<p>Please make sure the problem is a bug in Apache Tomcat and not a
+bug in your web application.</p>
 
-<p>Please make sure you provide as much information as possible. Its
-very hard to fix a bug if the person looking into the problem can't
+<p>Please provide as much information as possible. It is
+very hard to fix a bug if the person looking into the problem cannot
 reproduce it.  Here is a listing of information which should be included:
 <ul>
-  <li><b>Version</b> - Apache Tomcat version, if from a nightly build, version
-    and date of build.</li>
-  <li><b>Component</b> - Apache Tomcat component which has the bug.</li>
-  <li><b>Platform</b> - Hardward platform Tomcat is running on.</li>
-  <li><b>OS</b> - Computer operating system and version.</li>
-  <li><b>JVM</b> - JVM Version</li>
-  <li><b>Web Server</b> - Web Server and version, Apache Tomcat Connector and 
version.</li>
-  <li><b>Configuration</b> - Attach configuration files if they would help 
track
-    down the bug.</li>
-  <li><b>Log file excerpts</b> - Review your logs files, reproduce the bug with
-    debugging enabled in your Apache Tomcat configuration.  Then submit any 
relevant
-    sections of the log which help document the bug.</li>
-  <li><b>Stack Traces</b> - Any stack traces generated by the bug.</li>
+  <li>Environment details:
+    <ul>
+      <li><b>Version</b> - Apache Tomcat version, if from a nightly build,
+      version and date of build. Please not only select the version from a
+      list, but also repeat it in the text of your bug report.</li>
+      <li><b>Platform</b> and <b>OS</b> - Hardware platform and operating 
system
+      Tomcat is running on.</li>
+      <li><b>Java version</b> - Vendor and version of your Java Runtime
+      Environment used to run Tomcat.</li>
+    </ul>
+  </li>
+  <li>Configuration:
+    <ul>
+      <li><b>Component</b> - Apache Tomcat component which has the bug.
+      If you do not know, just guess.</li>
+      <li><b>Web Server</b> - Web Server and version, Apache Tomcat Connector
+      and version.</li>
+      <li><b>Configuration</b> - Attach configuration files if they would
+      help track down the bug.</li>
+    </ul>
+  </li>
+  <li>Evidences:
+    <ul>
+      <li><b>Log file excerpts</b> - Review your logs files, reproduce the bug
+      with debugging enabled in your Apache Tomcat configuration.  Then submit
+      any relevant sections of the log which help document the bug.</li>
+      <li><b>Stack Traces</b> - Any stack traces generated by the bug.</li>
+    </ul>
+  </li>
   <li><b>Example</b> - Example configuration files or web applications which
     demonstrate the bug.  When submitting an example which reproduces the bug,
     please try to make it as simple as possible.</li>
-  <li><b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> which
-    fixes the bug.
+  <li><b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> or
+    <code>svn diff</code> which fixes the bug.
     (If you have found a bug fix which can be applied to the Apache Tomcat 
code)</li>
   <li><b>Miscellaneous</b> - Any other information you feel will help track
     down the problem.  For example other Java API's and versions being used
     with Apache Tomcat.</li>
 </ul>
 
+Report an Apache Tomcat 7 bug
+<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%207";>
+here</a>.<br />
 Report an Apache Tomcat 6 bug
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206";>
 here</a>.<br />
 Report an Apache Tomcat 5 bug
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>
 here</a>.<br />
-Report an Apache Tomcat 4 bug
-<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%204";>
-here</a>.<br />
 Report an Apache Tomcat Connectors bug
 <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>
 here</a>.<br />
@@ -156,13 +215,12 @@
 <a 
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Native";>
 here</a>.<br />
 </p>
+<p></p>
 <subsection name="Security Issues">
 <p>Security-related bugs are of special concern.  If you have a verified
-security bug to report please do not post it
-to email lists or submit a bug report.  Security bugs should be reported
-privately by email to <a href="mailto:secur...@tomcat.apache.org";>
-secur...@tomcat.apache.org</a>.
-</p>
+security bug to report please neither post it
+to public email lists nor submit a bug report.
+See <a href="security.html">Security Reports</a> page on how to report them</p>
 </subsection>
 
 </section>

Modified: tomcat/site/trunk/xdocs/irc.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/irc.xml?rev=919243&r1=919242&r2=919243&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/irc.xml (original)
+++ tomcat/site/trunk/xdocs/irc.xml Fri Mar  5 00:16:33 2010
@@ -10,7 +10,7 @@
 
 <section name="Apache Tomcat on IRC">
 
-<p>An IRC channel dedicated to Tomcat exists on OpenProjects.</p> 
+<p>An IRC channel dedicated to Tomcat exists on Freenode.net.</p> 
 
 <p><code>#tomcat</code> at <code>irc.freenode.net</code>.
 Click <a href="irc://irc.freenode.net/#tomcat">here</a> to connect to the



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to