Skip to content

Commit

Permalink
Merge pull request #193 from jfacorro/jfacorro.fix.typo.in.docs
Browse files Browse the repository at this point in the history
Typos in docs.
  • Loading branch information
heyman committed Sep 25, 2014
2 parents 95f1ac6 + 3e7a631 commit 3495920
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ locust.wpr
locust.egg-info/**
locustio.egg-info/**
docs/_build/**
mock.*.egg
unittest2-*.egg/
dist/**
.idea/**
*.iml
Expand Down
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ Smaller API Changes
the current way of writing Locust tests, where tasks are either methods under a Locust class or SubLocust
classes containing task methods.
* Changed signature of :func:`locust.core.Locust.schedule_task`. Previously all extra arguments that
was given to the method was passed on to the the task when it was called. It no longer accepts extra arguments.
was given to the method was passed on to the task when it was called. It no longer accepts extra arguments.
Instead, it takes an *args* argument (list) and a *kwargs* argument (dict) which are be passed to the task when
it's called.
* Arguments for :py:class:`request_success <locust.events.request_success>` event hook has been changed.
Expand Down
2 changes: 1 addition & 1 deletion docs/extending-locust.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Event listeners can be registered at the module level in a locust file. Here's a
Adding Web Routes
==================

Locust uses Flask to serve the web UI and therefor it is easy to add web end-points to the web UI.
Locust uses Flask to serve the web UI and therefore it is easy to add web end-points to the web UI.
Just import the Flask app in your locustfile and set up a new route::

from locust import web
Expand Down
2 changes: 1 addition & 1 deletion locust/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class TaskSet(object):
TaskTests can be nested, which means that a TaskSet's *tasks* attribute can contain
another TaskSet. If the nested TaskSet it scheduled to be executed, it will be
instantiated and called from the current executing TaskSet. Execution in the the
instantiated and called from the current executing TaskSet. Execution in the
currently running TaskSet will then be handed over to the nested TaskSet which will
continue to run until it throws an InterruptTaskSet exception, which is done when
:py:meth:`TaskSet.interrupt() <locust.core.TaskSet.interrupt>` is called. (execution
Expand Down
2 changes: 1 addition & 1 deletion locust/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class StatsEntry(object):

response_times = None
"""
A {response_time => count} dict that holds the the response time distribution of all
A {response_time => count} dict that holds the response time distribution of all
the requests.
The keys (the response time in ms) are rounded to store 1, 2, ... 9, 10, 20. .. 90,
Expand Down

0 comments on commit 3495920

Please sign in to comment.