Author: sebb
Date: Mon Nov 12 16:28:58 2007
New Revision: 594362

URL: http://svn.apache.org/viewvc?rev=594362&view=rev
Log:
Synch

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/localising/index.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=594362&r1=594361&r2=594362&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Mon Nov 12 16:28:58 2007
@@ -209,6 +209,16 @@
                                                </li>
                                                                        
 
+                                                                               
                <li     >
+                                                               Ensure Listener 
nodes get own save configuration when copy-pasted
+                                               </li>
+                                                                       
+
+                                                                               
                <li     >
+                                                               Correct Proxy 
Server include and exclude matching description - port and query are included, 
contrary to previously documented.
+                                               </li>
+                                                                       
+
                                                </ul>
                                                                                
                                                                                
<h4     >
                                                                Improvements
@@ -2851,7 +2861,6 @@
                                                                All Beanshell 
access is now via a single class; only need BSH jar at run-time
                                                </li>
                                                                        
-
 
                                                                                
                <li     >
                                                                Bug 32464 - 
document Direct Draw settings in jmeter.bat

Modified: jakarta/jmeter/trunk/docs/localising/index.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/localising/index.html?rev=594362&r1=594361&r2=594362&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/localising/index.html (original)
+++ jakarta/jmeter/trunk/docs/localising/index.html Mon Nov 12 16:28:58 2007
@@ -119,7 +119,7 @@
                                                                                
                                                                                
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
                <tr><td bgcolor="#525D76">
                  <font color="#ffffff" face="arial,helvetica,sanserif">
-                        <a name=""><strong>Introduction</strong></a>
+                        <a name="intro"><strong>Introduction</strong></a>
                  </font>
                </td></tr>
                <tr><td>
@@ -211,7 +211,8 @@
                                                                
[email protected]
                                                </a>
                                                                        
-stating your intention. Surely one of the project contributors will be very 
happy to grab the current texts
+stating your intention. The files you need (*.properties and *.metaprop) are 
included in the source archive.
+But if you are having any difficulty, one of the project contributors will be 
able to grab the current texts
 from SVN and send them to you. You'll receive a jar, zip, tar or tgz file that 
you'll need to unpack in your
 local disk.
                                                </p>
@@ -223,7 +224,7 @@
                                                                
http://jakarta.apache.org/site/cvsindex.html
                                                </a>
                                                                        
--- the files necessary to the translation process are all in the 
jakarta-jmeter/src directory.
+-- the files necessary to the translation process are all under the 
jakarta-jmeter/src directory.
 
                                                </p>
                                                                                
                                                                                
<p      >
@@ -370,7 +371,7 @@
                  <blockquote>
                                                                                
                                        <p      >
                                                                Once you're 
done translating, just pack up the whole set of files in jakarta-jmeter/src in 
a jar, zip, tar,
-tgz, or alike and send them to [EMAIL PROTECTED] or, even better, post them in 
a JMeter bug report
+tgz, or alike and attach them to a JMeter bug report
 (follow link to "Known bugs" in 
                                                                                
                <a       href="http://jakarta.apache.org/jmeter";>
                                                                JMeter's home 
page
@@ -385,7 +386,7 @@
                                                                                
                                         <table border="0" cellspacing="0" 
cellpadding="2" width="100%">
                <tr><td bgcolor="#525D76">
                  <font color="#ffffff" face="arial,helvetica,sanserif">
-                        <a name="submitting"><strong>Merging in new 
translations</strong></a>
+                        <a name="merging"><strong>Merging in new 
translations</strong></a>
                  </font>
                </td></tr>
                <tr><td>

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=594362&r1=594361&r2=594362&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Mon Nov 12 
16:28:58 2007
@@ -11252,23 +11252,50 @@
                </table>
        </p>
                                                                                
                                                                                
<p      >
-                                                               These entries 
will be treated as regular expressions (using Jakarta ORO).
-They will be matched against the host name, port (actual or implied) and path 
of each browser request.
+                                                               The 
+                                                                               
                <b      >
+                                                               include and 
exclude patterns
+                                               </b>
+                                                                        are 
treated as regular expressions (using Jakarta ORO).
+They will be matched against the host name, port (actual or implied) path and 
query (if any) of each browser request.
 If the URL you are browsing is 
+                                                                               
                <br     >
+                                               </br>
+                                                                        
+
+                                                                               
                <b      >
+                                                               
"http://jakarta.apache.org/jmeter/index.html?username=xxxx";
+                                               </b>
+                                                                       ,
+                                                                               
                <br     >
+                                               </br>
+                                                                        
+then the regular expression will be tested against the string:
+                                                                               
                <br     >
+                                               </br>
+                                                                        
+
                                                                                
                <b      >
-                                                               
http://jakarta.apache.org/jmeter/index.html?username=xxxx
+                                                               
"jakarta.apache.org:80/jmeter/index.html?username=xxxx"
                                                </b>
-                                                                       ,
-then the regular expression will be tested against the string: 
+                                                                       .
+                                                                               
                <br     >
+                                               </br>
+                                                                          
+Thus, if you want to include all .html files, your regular expression might 
look like: 
+                                                                               
                <br     >
+                                               </br>
+                                                                        
+
                                                                                
                <b      >
-                                                               
"jakarta.apache.org:80/jmeter/index.html"
+                                                               
".*\.html(\?.*)?"
                                                </b>
-                                                                       .  Thus,
-if you want to include all .html files, your regular expression might look 
like: 
+                                                                        - or 
                                                                                
                <b      >
                                                                ".*\.html"
                                                </b>
-                                                                       .
+                                                                        
+if you know that there is no query string or you only want html pages without 
query strings.
 
                                                </p>
                                                                                
                                                                                
<p      >



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to