Merge pull request #394 from kianmeng/fix-typos

Fix typos

CHANGELOG.md

@@ -225,7 +225,7 @@
 - [TSUN-131] - tsung can stop too early when static users are used
 - [TSUN-132] - http cookies: accept domains equals to hostname with a leading "."
 - [TSUN-133] - proxy-recorder with SSL fails on large client packets (multiple TCP packets)
-- [TSUN-138] - when an error occured( for ex a timeout during a request) and a client exits, started transactions are not updated
+- [TSUN-138] - when an error occurred( for ex a timeout during a request) and a client exits, started transactions are not updated
 - [TSUN-140] - tsung does not honor the Proxy-Connection: keep-Alive or Connection: keep-Alive header if the proxy is HTTP/1.0
 - [TSUN-142] - http recorder can fail with https rewriting and chunked encoding
 - [TSUN-147] - UDP & bidi does not seem to work
@@ -307,7 +307,7 @@
 - [TSUN-40] - problem to rewrite url for https with gzip-encoded html.
 - [TSUN-48] - tcp/udp buffer size should be customizable in the XML config file.
 - [TSUN-59] - if a User-Agent header is set in <header>, it should override the global one.
-- [TSUN-62] - add abilty to loop back to a previous request in a session
+- [TSUN-62] - add ability to loop back to a previous request in a session
 - [TSUN-63] - check for ssl and crypto application at compile time
 - [TSUN-65] - enhance dynamic variables.
 - [TSUN-66] - add global mean and counter computation and reporting for samples
@@ -344,7 +344,7 @@
 - [TSUN-28] - Refactoring needed to ease the change of the userid / password generation code
 - [TSUN-29] - Multiple file_server support
 - [TSUN-32] - make snmp server options tunable
-- [TSUN-34] - add costum http headers
+- [TSUN-34] - add custom http headers
 - [TSUN-44] - tsung should ignore whitespace keepalive from xmpp server
 - [TSUN-45] - add kernel-poll support for better performance
 - [TSUN-46] - add number of open connections in statistics
@@ -454,7 +454,7 @@
 - fix: broken 'global', 'local' and 'no_ack' requests and size computation
 - fix: broken ids in jabber messages
 - fix: broken online/offline in user_server
-- default thinktime can now be overriden
+- default thinktime can now be overridden
 
 ### Added ###
 - add script to convert apache log file (combined) to idx-tsunami XML
@@ -520,12 +520,12 @@
 - Extension of XML attribute entity normalisation
 - HTTP: Content-type support in the recorder (needed to handle non-HTML form encoded posts)
 - add autoconf support to detect Erlang installation path
-- Preliminary Windows support: A workaround has been introduced in the code to handle behaviour difference between Erlang Un*x and Erlang Windows on how the command-line is handled. When an assumtion is made on the string type of a parameter, it should be check that this is actually a string and not an atom.
+- Preliminary Windows support: A workaround has been introduced in the code to handle behaviour difference between Erlang Un*x and Erlang Windows on how the command-line is handled. When an assumption is made on the string type of a parameter, it should be check that this is actually a string and not an atom.
 
 ## [1.0.beta4] - 2004-03-16 - Minor bugfixes ##
 ### Fixed ###
 - fix lost cookie when transfer-encoding:chunked is used
-- fix config parsing (the last request of the last page of a sesssion was not marked as endpage)
+- fix config parsing (the last request of the last page of a session was not marked as endpage)
 - don't crash anymore on error during start or stop
 
 ## [1.0.beta3] - 2004-02-24 - Minor feature enhancements ##
@@ -594,7 +594,7 @@
 - switch to R9C
 
 
-## [0.1.1] - 2002-08-13 - Bugfix realease ##
+## [0.1.1] - 2002-08-13 - Bugfix release ##
 
 ### Fixed ###
 - fix config file

config.guess

@@ -141,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward

docs/conf-client-server.rst

@@ -51,7 +51,7 @@ server).
 ``udp6`` ; only available in  version **1.4.2** and newer)
 or ``websocket`` (only available in version **1.5.0** and newer))
 
-There's also a specific type fo BOSH: ``bosh`` for unencrypted BOSH, and ``bosh_ssl`` for encrypted connection
+There's also a specific type of BOSH: ``bosh`` for unencrypted BOSH, and ``bosh_ssl`` for encrypted connection
 
 .. index:: cpu
 

docs/conf-file.rst

@@ -49,8 +49,8 @@ pid         erlang process id
 id          tsung user id
 host        server hostname
 url         URL (relative)
-HTTP        status HTTP reponse status (200, 304, etc.)
-size        reponse size (in bytes)
+HTTP        status HTTP response status (200, 304, etc.)
+size        response size (in bytes)
 duration    request duration (msec)
 transaction name of the transaction (if any) this request was made in
 match       if a match is defined in the request: match|nomatch (last <match> if several are defined)

docs/conf-monitoring.rst

@@ -59,7 +59,7 @@ mysqladmin. Use it like this:
      <mysqladmin port="3306" username="root" password="sesame" />
     </monitor>
 
-Availabe stats: number of mysql threads and Questions (queries)
+Available stats: number of mysql threads and Questions (queries)
 
 .. index:: snmp
 

docs/conf-sessions.rst

@@ -675,7 +675,7 @@ offline and random users (also used for pubsub):
 
 
 The username (resp. passwd) should be the first (resp. second) entry in the each CSV line (the
-delimiter is by default ``";"`` and can be overriden).
+delimiter is by default ``";"`` and can be overridden).
 
 raw XML
 """""""

docs/features.rst

@@ -76,7 +76,7 @@ WEBDAV related features
 =======================
 
 The WebDAV (:RFC:`4918`) plugin is a superset of the HTTP plugin. It adds the
-following features (some versionning extensions to WebDAV (:RFC:`3253`)
+following features (some versioning extensions to WebDAV (:RFC:`3253`)
 are also supported):
 
 

examples/http_distributed.xml.in

@@ -13,7 +13,7 @@
     <client host="myhost" weight="2" maxusers="500">
       <!-- Several virtual IP can be used to simulate more
       machines. Very useful when a load-balancer use the client's IP to
-      distribute the traffic amoung a cluster of servers-->
+      distribute the traffic among a cluster of servers-->
       <ip value="192.168.2.223"></ip> 
       <ip value="192.168.2.224"></ip> 
     </client>
@@ -75,7 +75,7 @@
 
   <!-- HTTP parameters -->
 
-  <!-- If you want to benchmark a proxy server instead of a reguler web server-->
+  <!-- If you want to benchmark a proxy server instead of a regular web server-->
 <!--   <default type="ts_http" name="http_use_server_as_proxy" value="true"/> -->
 
    <option type="ts_http" name="user_agent">

include/ts_amqp.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%

include/ts_config.hrl

@@ -73,7 +73,7 @@
           user_server_maxuid = none, % user_id max
           oids=[],
           rate_limit,
-          total_popularity = 0, % should be 100 if we use probabilites; sum of all weights if we use weights
+          total_popularity = 0, % should be 100 if we use probabilities; sum of all weights if we use weights
           use_weights      , % true if we use weights instead of probabilities
           total_server_weights=0,
           job_notify_port,

include/ts_http.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%

include/ts_jabber.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%

include/ts_mqtt.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%

include/ts_profile.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%

include/ts_raw.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%

include/ts_websocket.hrl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%

man/tsplot.1

@@ -11,7 +11,7 @@ Tsung comes with a plotting tool using
 \fBgnuplot\fR, producing some graphs from the
 \fItsung.log\fR file data.
 \fBtsplot\fR is able to plot data from several
-\fItsung.log\fR files onto the same charts serie,
+\fItsung.log\fR files onto the same charts series,
 for further comparison and analyze.
 .SH "OPTIONS"
 .PP
@@ -108,7 +108,7 @@ styles you want to use, separated by spaces, as available
 here:
 http://matplotlib.sourceforge.net/matplotlib.pylab.html#-plot.
 
-For exemple, set \fBstyles = b- g+ r- cx\fR
+For example, set \fBstyles = b- g+ r- cx\fR
 for plotting first dataset (see \fBstats\fR
 below) with a blue solid line, second with green plus
 symbols, third with a red line and last with cyan cross
@@ -172,7 +172,7 @@ on command line.
 Each plot on a chart has a legend entry, you configure
 here the meaning of the plot (say 'concurrent users') and
 \fBtsplot\fR will add it the name of the data
-serie being plotted (say 'scenario x'). You'd obtain this
+series being plotted (say 'scenario x'). You'd obtain this
 legend: 'concurrent users scenario x'.
 .TP
 \fBylabel\fR

man/tsplot.1.sgml

@@ -221,7 +221,7 @@ Plot several tsung logs on the same charts, for comparison purpose.
 	    http://matplotlib.sourceforge.net/matplotlib.pylab.html#-plot.
 	  </para>
 	  <para>
-	    For exemple, set <command>styles = b- g+ r- cx</command>
+	    For example, set <command>styles = b- g+ r- cx</command>
 	    for plotting first dataset (see <command>stats</command>
 	    below) with a blue solid line, second with green plus
 	    symbols, third with a red line and last with cyan cross

src/lib/mochiweb_util.erl

@@ -513,7 +513,7 @@ extract_q(KVRe, QRe, [Param | Rest], Acc) ->
 %%
 %%      The returned list of encodings is sorted, descendingly, according to the
 %%      Q values of the given list. The last element of this list is the given
-%%      default encoding unless this encoding is explicitily or implicitily
+%%      default encoding unless this encoding is explicitly or implicitily
 %%      marked with a Q value of 0.0 in the given Q values list.
 %%      Note: encodings with the same Q value are kept in the same order as
 %%            found in the input Q values list.

src/lib/mochiweb_xpath_functions.erl

@@ -17,7 +17,7 @@
 %% @type WildCardArgSpec = {'*', XPathType}
 %% @type XPathType = node_set | string | number | boolean
 %% 
-%% The engine is responsable of calling the function with
+%% The engine is responsible of calling the function with
 %% the correct arguments, given the function signature. 
 -spec lookup_function(atom()) -> mochiweb_xpath:xpath_fun_spec() | false.
 lookup_function('last') ->

src/lib/pgsql_proto.erl

@@ -369,7 +369,7 @@ process_squery_cols(Log) ->
 process_equery(Log) ->
     receive 
 	%% Consume parse and bind complete messages when waiting for the first
-	%% first row_description message. What happens if the equery doesnt
+	%% first row_description message. What happens if the equery doesn't
 	%% return a result set?
 	{pgsql, {parse_complete, _}} ->
 	    process_equery(Log);
@@ -475,7 +475,7 @@ process_execute_resultset(Sock, Ref, Pid, Types, Log) ->
 	    exit(Any)
     end.
 
-%% With a message type Code and the payload Packet apropriate 
+%% With a message type Code and the payload Packet appropriate 
 %% decoding procedure can proceed.
 decode_packet(Code, Packet) ->
     Ret = fun(CodeName, Values) -> {ok, {CodeName, Values}} end,

src/lib/websocket.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%
@@ -106,7 +106,7 @@ encode_text(Data) ->
     encode(Data, ?OP_TEXT).
 
 encode_close(Reason) ->
-    %% According RFC6455, we shoud add a status code for close frame,
+    %% According RFC6455, we should add a status code for close frame,
     %% check here: http://tools.ietf.org/html/rfc6455#section-7.4,
     %% we add a normal closure status code 1000 here.
     StatusCode = <<3, 232>>,

src/test/ts_test_config.erl

@@ -19,15 +19,15 @@ test()->
     ok.
 
 popularity_test() ->
-    ?assertError({"can't mix probabilites and weights",10,10}, ts_config:get_popularity(10,10,undefined,100)),
+    ?assertError({"can't mix probabilities and weights",10,10}, ts_config:get_popularity(10,10,undefined,100)),
     ?assertError({"can't use probability when using weight"}, ts_config:get_popularity(10,-1,true,100)),
     ?assertError({"can't use weights when using probabilities"}, ts_config:get_popularity(-1,10,false,100)),
     ?assertEqual({10,false,110}, ts_config:get_popularity(10,-1,false,100)),
     ?assertEqual({10,true,110}, ts_config:get_popularity(-1,10,true,100)),
     ?assertEqual({30,false,60}, ts_config:get_popularity(30,-1,false,30)),
     ?assertError({"must set weight or probability in session"} , ts_config:get_popularity(-1,-1,undefined,100)),
-    ?assertError({"can't mix probabilites and weights",0,0}, ts_config:get_popularity(0,0,true,100)),
-    ?assertError({"can't mix probabilites and weights",0,0}, ts_config:get_popularity(0,0,false,100)),
+    ?assertError({"can't mix probabilities and weights",0,0}, ts_config:get_popularity(0,0,true,100)),
+    ?assertError({"can't mix probabilities and weights",0,0}, ts_config:get_popularity(0,0,false,100)),
     ?assertEqual({0,true,100}, ts_config:get_popularity(-1,0,true,100)),
     ?assertEqual({0,false,100}, ts_config:get_popularity(0,-1,false,100)).
 

src/test/ts_test_mqtt.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%

src/tsung-plotter/pgsql.plots.en.conf

@@ -70,7 +70,7 @@ ylabel  = Number of timeouts per second
 stats   = error_connect_etimedout.count
 legend  = Timeout
 
-[trafic]
+[traffic]
 title   = Network Traffic
 ylabel  = kbits/sec
 stats   = size_sent.count, size_rcv.count

src/tsung-plotter/tsplot.py.in

@@ -51,7 +51,7 @@ from pylab import *
 
 
 class Plot:
-    """ The ploting class, using matplotlib """
+    """ The plotting class, using matplotlib """
 
     def __init__(self,
                  name    = "",

src/tsung/ts_amqp.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by Zhihui Jiao(jzhihui521@gmail.com).
+%%%  This code was developed by Zhihui Jiao(jzhihui521@gmail.com).
 %%%
 %%%  Copyright (C) 2013 Zhihui Jiao
 %%%

src/tsung/ts_client.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%
@@ -263,7 +263,7 @@ handle_info2({gen_ts_transport, _Socket, closed}, think,
 %% inet close messages
 handle_info2({gen_ts_transport, _Socket, closed}, _StateName, State) ->
     ?LOG("connection closed, abort", ?WARN),
-    %% the connexion was closed after the last msg was sent, stop quietly
+    %% the connection was closed after the last msg was sent, stop quietly
     ts_mon_cache:add({ count, error_closed }),
     set_connected_status(false),
     catch (State#state_rcv.protocol):close(State#state_rcv.socket), % mandatory for ssl
@@ -937,7 +937,7 @@ finish_session(State) ->
     case State#state_rcv.transactions of
         [] -> % no pending transactions, do nothing
             ok;
-        TrList -> % pending transactions (an error has probably occured)
+        TrList -> % pending transactions (an error has probably occurred)
             ?LOGF("Pending transactions: ~p, compute transaction time~n",[TrList],?NOTICE),
             lists:foreach(fun({Tname,StartTime}) ->
                                   ts_mon_cache:add({sample,Tname,ts_utils:elapsed(StartTime,Now)})
@@ -1266,7 +1266,7 @@ update_stats_noack(#state_rcv{page_timestamp=PageTime,request=Request}) ->
     Now = ?NOW,
     Stats= [{ count, request_noack}], % count and not sample because response time is not defined in this case
     case Request#ts_request.endpage of
-        true -> % end of a page, compute page reponse time
+        true -> % end of a page, compute page response time
             PageElapsed = ts_utils:elapsed(PageTime, Now),
             ts_mon_cache:add(lists:append([Stats,[{sample, page, PageElapsed}]])),
             {0, []};
@@ -1300,7 +1300,7 @@ update_stats(S=#state_rcv{size_mon_thresh=T,page_timestamp=PageTime,
                                      S#state_rcv.buffer,
                                      S#state_rcv.dynvars),
     case Request#ts_request.endpage of
-        true -> % end of a page, compute page reponse time
+        true -> % end of a page, compute page response time
             PageElapsed = ts_utils:elapsed(PageTime, Now),
             ts_mon_cache:add(lists:append([Stats,[{sample, page, PageElapsed}]])),
             {0, DynVars, Elapsed};

src/tsung/ts_client_sup.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%

src/tsung/ts_cport.erl

@@ -96,7 +96,7 @@ init([]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call({get, ClientIP}, _From, State) ->
-    %% use the process dictionnary to store the last port of each ip
+    %% use the process dictionary to store the last port of each ip
     %% should we use ets instead ?
     Reply = case get(ClientIP) of
                 ?EPMD_PORT ->

src/tsung/ts_fs.erl

@@ -189,10 +189,10 @@ parse({file, del_dir, [Path], {error,Reason}},State) ->
 parse({file, make_dir, [_Path], ok},State) ->
     {State#state_rcv{ack_done=true, datasize=0}, [], false};
 parse({file, make_dir, [Path], {error, eexist} },State) ->
-    ?LOGF("error while creating diretory: ~p already exists~n",[Path],?NOTICE),
+    ?LOGF("error while creating directory: ~p already exists~n",[Path],?NOTICE),
     {State#state_rcv{ack_done=true, datasize=0}, [], false};
 parse({file, make_dir, [Path], {error,Reason}},State) ->
-    ?LOGF("error while creating diretory: ~p (~p)~n",[Path, Reason],?ERR),
+    ?LOGF("error while creating directory: ~p (~p)~n",[Path, Reason],?ERR),
     ts_mon_cache:add({count,error_fs_mkdir}),
     {State#state_rcv{ack_done=true, datasize=0}, [], false};
 

src/tsung/ts_http.erl

@@ -1,4 +1,4 @@
-%%%  This code was developped by IDEALX (http://IDEALX.org/) and
+%%%  This code was developed by IDEALX (http://IDEALX.org/) and
 %%%  contributors (their names can be found in the CONTRIBUTORS file).
 %%%  Copyright (C) 2000-2001 IDEALX
 %%%