Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-19 19:19:49 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-19 19:20:50 +0300
commit6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch)
tree17d66beede9df8d8b43f9db39265649c2d72e732 /doc
parenta7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff)
parenta4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'doc')
-rw-r--r--doc/python_api/examples/bpy.app.handlers.1.py2
-rw-r--r--doc/python_api/rst/info_api_reference.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/python_api/examples/bpy.app.handlers.1.py b/doc/python_api/examples/bpy.app.handlers.1.py
index 34b16c27b86..cd24873fcbc 100644
--- a/doc/python_api/examples/bpy.app.handlers.1.py
+++ b/doc/python_api/examples/bpy.app.handlers.1.py
@@ -3,7 +3,7 @@ Persistent Handler Example
++++++++++++++++++++++++++
By default handlers are freed when loading new files, in some cases you may
-wan't the handler stay running across multiple files (when the handler is
+want the handler stay running across multiple files (when the handler is
part of an add-on for example).
For this the :data:`bpy.app.handlers.persistent` decorator needs to be used.
diff --git a/doc/python_api/rst/info_api_reference.rst b/doc/python_api/rst/info_api_reference.rst
index 5d5d38bf18b..cc7128f3b5d 100644
--- a/doc/python_api/rst/info_api_reference.rst
+++ b/doc/python_api/rst/info_api_reference.rst
@@ -53,7 +53,7 @@ Here are some characteristics ID Data-Blocks share.
Simple Data Access
------------------
-Lets start with a simple case, say you want a python script to adjust the objects location.
+Lets start with a simple case, say you want a python script to adjust the object's location.
Start by finding this setting in the interface ``Properties Window -> Object -> Transform -> Location``