Skip to content

Commit 2516a45

Browse files
author
Jonathan McKinsey
authored
Merge pull request #389 from timgates42/bugfix_typos
docs: Fix a few typos
2 parents 61e67c1 + d28ab52 commit 2516a45

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

examples/analytics/bottle.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def __init__(self, catchall=True, autojson=True, config=None):
407407

408408
self.mounts = {}
409409
self.error_handler = {}
410-
#: If true, most exceptions are catched and returned as :exc:`HTTPError`
410+
#: If true, most exceptions are caught and returned as :exc:`HTTPError`
411411
self.catchall = catchall
412412
self.config = config or {}
413413
self.serve = True
@@ -638,8 +638,8 @@ def remove_hook(self, name, func):
638638

639639
def handle(self, path, method='GET'):
640640
""" (deprecated) Execute the first matching route callback and return
641-
the result. :exc:`HTTPResponse` exceptions are catched and returned.
642-
If :attr:`Bottle.catchall` is true, other exceptions are catched as
641+
the result. :exc:`HTTPResponse` exceptions are caught and returned.
642+
If :attr:`Bottle.catchall` is true, other exceptions are caught as
643643
well and returned as :exc:`HTTPError` instances (500).
644644
"""
645645
depr("This method will change semantics in 0.10. Try to avoid it.")
@@ -1081,7 +1081,7 @@ def set_cookie(self, key, value, secret=None, **kargs):
10811081
:param value: the value of the cookie.
10821082
:param secret: required for signed cookies. (default: None)
10831083
:param max_age: maximum age in seconds. (default: None)
1084-
:param expires: a datetime object or UNIX timestamp. (defaut: None)
1084+
:param expires: a datetime object or UNIX timestamp. (default: None)
10851085
:param domain: the domain that is allowed to read the cookie.
10861086
(default: current domain)
10871087
:param path: limits the cookie to a given path (default: /)

examples/analytics/js/jquery.flot.selection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ you want to know what's happening while it's happening,
3434
A "plotunselected" event with no arguments is emitted when the user
3535
clicks the mouse to remove the selection.
3636
37-
The plugin allso adds the following methods to the plot object:
37+
The plugin also adds the following methods to the plot object:
3838
3939
- setSelection(ranges, preventEvent)
4040

examples/async/async.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def do_search(query):
9898
return results
9999

100100
# We specify many queries to get show the advantages
101-
# of paralleism.
101+
# of parallelism.
102102
queries = [
103103
'search * | head 100',
104104
'search * | head 100',

examples/handlers/tiny-proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ def daemonize(logger, opts):
282282
sys.exit(0)
283283
else:
284284
if os.fork () != 0:
285-
## allow the child pid to instanciate the server
285+
## allow the child pid to instantiate the server
286286
## class
287287
time.sleep (1)
288288
sys.exit (0)

examples/job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# All job commands operate on search 'specifiers' (spec). A search specifier
2020
# is either a search-id (sid) or the index of the search job in the list of
21-
# jobs, eg: @0 would specify the frist job in the list, @1 the second, and so
21+
# jobs, eg: @0 would specify the first job in the list, @1 the second, and so
2222
# on.
2323

2424
from __future__ import absolute_import

splunklib/binding.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ def __init__(self, message, cause):
10701070
#
10711071

10721072
# Encode the given kwargs as a query string. This wrapper will also _encode
1073-
# a list value as a sequence of assignemnts to the corresponding arg name,
1073+
# a list value as a sequence of assignments to the corresponding arg name,
10741074
# for example an argument such as 'foo=[1,2,3]' will be encoded as
10751075
# 'foo=1&foo=2&foo=3'.
10761076
def _encode(**kwargs):

splunklib/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ class Entity(Endpoint):
856856
ent.whitelist
857857
858858
However, because some of the field names are not valid Python identifiers,
859-
the dictionary-like syntax is preferrable.
859+
the dictionary-like syntax is preferable.
860860
861861
The state of an :class:`Entity` object is cached, so accessing a field
862862
does not contact the server. If you think the values on the

tests/test_job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import pytest
3838

39-
# TODO: Determine if we should be importing ExpatError if ParseError is not avaialble (e.g., on Python 2.6)
39+
# TODO: Determine if we should be importing ExpatError if ParseError is not available (e.g., on Python 2.6)
4040
# There's code below that now catches SyntaxError instead of ParseError. Should we be catching ExpathError instead?
4141

4242
# from xml.etree.ElementTree import ParseError

0 commit comments

Comments
 (0)