Permalink
Browse files

Merge pull request #783 from luzpaz/trivial-typos

Trivial typos
  • Loading branch information...
2 parents b2dd36b + 778ccb2 commit 9b255f4c36608455d901ebe75be809df38f03710 @davidism davidism committed Nov 9, 2017
Showing with 11 additions and 11 deletions.
  1. +1 −1 CHANGES.rst
  2. +1 −1 docs/api.rst
  3. +1 −1 jinja2/compiler.py
  4. +1 −1 jinja2/ext.py
  5. +6 −6 scripts/pylintrc
  6. +1 −1 setup.py
View
@@ -122,7 +122,7 @@ Version 2.9.3
old behavior where limited assignments to outer scopes was possible.
For more information and a discussion see #641
- Resolved an issue where ``block scoped`` would not take advantage of the
- new scoping rules. In some more exotic cases a variable overriden in a
+ new scoping rules. In some more exotic cases a variable overridden in a
local scope would not make it into a block.
- Change the code generation of the ``with`` statement to be in line with the
new scoping rules. This resolves some unlikely bugs in edge cases. This
View
@@ -278,7 +278,7 @@ function for this::
loader=PackageLoader('mypackage'))
The :func:`~jinja.select_autoescape` function returns a function that
-works rougly like this::
+works roughly like this::
def autoescape(template_name):
if template_name is None:
View
@@ -410,7 +410,7 @@ def signature(self, node, frame, extra_kwargs=None):
"""Writes a function call to the stream for the current node.
A leading comma is added automatically. The extra keyword
arguments may not include python keywords otherwise a syntax
- error could occour. The extra keyword arguments should be given
+ error could occur. The extra keyword arguments should be given
as python dict.
"""
# if any of the given keyword arguments is a python keyword
View
@@ -545,7 +545,7 @@ def babel_extract(fileobj, keywords, comment_tags, options):
.. versionchanged:: 2.3
Basic support for translation comments was added. If `comment_tags`
is now set to a list of keywords for extraction, the extractor will
- try to find the best preceeding comment that begins with one of the
+ try to find the best preceding comment that begins with one of the
keywords. For best results, make sure to not have more than one
gettext call in one line of code and the matching comment in the
same line or the line before.
View
@@ -1,6 +1,6 @@
# lint Python modules using external checkers.
#
-# This is the main checker controling the other ones and the reports
+# This is the main checker controlling the other ones and the reports
# generation. It is itself both a raw checker and an astng checker in order
# to:
# * handle message activation / deactivation at the module level
@@ -66,12 +66,12 @@ include-ids=yes
# written in a file name "pylint_global.[txt|html]".
files-output=no
-# Tells wether to display a full report or only the messages
+# Tells whether to display a full report or only the messages
reports=yes
# Python expression which should return a note less than 10 (10 is the highest
# note).You have access to the variables errors warning, statement which
-# respectivly contain the number of errors / warnings messages and the total
+# respectively contain the number of errors / warnings messages and the total
# number of statements analyzed. This is used by the global evaluation report
# (R0004).
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
@@ -95,7 +95,7 @@ comment=no
#
[VARIABLES]
-# Tells wether we should check for unused import in __init__ files.
+# Tells whether we should check for unused import in __init__ files.
init-import=no
# A regular expression matching names used for dummy variables (i.e. not used).
@@ -110,7 +110,7 @@ additional-builtins=
#
[TYPECHECK]
-# Tells wether missing members accessed in mixin class should be ignored. A
+# Tells whether missing members accessed in mixin class should be ignored. A
# mixin class is detected if its name ends with "mixin" (case insensitive).
ignore-mixin-members=yes
@@ -241,7 +241,7 @@ int-import-graph=
# checks for :
# * methods without self as first argument
# * overridden methods signature
-# * access only to existant members via self
+# * access only to existent members via self
# * attributes not defined in the __init__ method
# * supported interfaces implementation
# * unreachable code
View
@@ -28,7 +28,7 @@
Application logic is for the controller but don't try to make the life
for the template designer too hard by giving him too few functionality.
-For more informations visit the new `Jinja2 webpage`_ and `documentation`_.
+For more information visit the new `Jinja2 webpage`_ and `documentation`_.
.. _sandboxed: https://en.wikipedia.org/wiki/Sandbox_(computer_security)
.. _Django: https://www.djangoproject.com/

0 comments on commit 9b255f4

Please sign in to comment.