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:
authorSebastián Barschkis <sebbas@sebbas.org>2019-08-18 23:53:13 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2019-08-18 23:53:13 +0300
commit8beba05ecce265564ae7f14ea91add88905ac5e7 (patch)
tree32fb71420ff6a666c28b708db02973ddf94d67c0 /doc
parenta97d7a829f75ae6ca80d24672ea340e0c50bfbd3 (diff)
parent38380ddca373cd7f49e3d6e831480ff05a2af72e (diff)
Merge branch 'master' into fluid-mantaflow
Diffstat (limited to 'doc')
-rw-r--r--doc/doxygen/Doxyfile2
-rw-r--r--doc/guides/interface_API.txt2
-rw-r--r--doc/python_api/rst/info_gotcha.rst4
-rw-r--r--doc/python_api/rst/info_quickstart.rst4
-rw-r--r--doc/python_api/rst/info_tips_and_tricks.rst2
5 files changed, 8 insertions, 6 deletions
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index de2026a6ca0..366d0b1b507 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = Blender
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "V2.79"
+PROJECT_NUMBER = "V2.81"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/guides/interface_API.txt b/doc/guides/interface_API.txt
index 631f2098a22..65f19e2a5a0 100644
--- a/doc/guides/interface_API.txt
+++ b/doc/guides/interface_API.txt
@@ -177,7 +177,7 @@ font:
With the new truetype option in Blender, this is used for all font families
When a uiBlock is created, each uiButton that is defined gets the uiBlock properties.
-Changing Block properties in between will affact uiButtons defined thereafter.
+Changing Block properties in between will effect uiButtons defined thereafter.
diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst
index df4cd0d256b..983ce764229 100644
--- a/doc/python_api/rst/info_gotcha.rst
+++ b/doc/python_api/rst/info_gotcha.rst
@@ -40,7 +40,7 @@ In most cases you can figure out what context an operator needs
simply be seeing how it's used in Blender and thinking about what it does.
Unfortunately if you're still stuck - the only way to **really** know
-whats going on is to read the source code for the poll function and see what its checking.
+what's going on is to read the source code for the poll function and see what its checking.
For Python operators it's not so hard to find the source
since it's included with Blender and the source file/line is included in the operator reference docs.
@@ -125,7 +125,7 @@ While a script executes Blender waits for it to finish and is effectively locked
while in this state Blender won't redraw or respond to user input.
Normally this is not such a problem because scripts distributed with Blender
tend not to run for an extended period of time,
-nevertheless scripts *can* take ages to execute and its nice to see whats going on in the view port.
+nevertheless scripts *can* take ages to execute and its nice to see what's going on in the view port.
Tools that lock Blender in a loop and redraw are highly discouraged
since they conflict with Blenders ability to run multiple operators
diff --git a/doc/python_api/rst/info_quickstart.rst b/doc/python_api/rst/info_quickstart.rst
index aa3a38974c4..75aeb765f53 100644
--- a/doc/python_api/rst/info_quickstart.rst
+++ b/doc/python_api/rst/info_quickstart.rst
@@ -317,7 +317,9 @@ To run the script:
#. Click the button labeled ``New`` and the confirmation pop up in order to create a new text block.
#. Press :kbd:`Ctrl-V` to paste the code into the text panel (the upper left frame).
#. Click on the button **Run Script**.
-#. Move your cursor into the 3D view, press spacebar for the operator search menu, and type "Simple".
+#. Move your cursor into the 3D Viewport,
+ open the :ref:`operator search menu <blender_manual:bpy.ops.wm.search_menu>`,
+ and type "Simple".
#. Click on the "Simple Operator" item found in search.
diff --git a/doc/python_api/rst/info_tips_and_tricks.rst b/doc/python_api/rst/info_tips_and_tricks.rst
index 63f7b9410c8..5b6736973ca 100644
--- a/doc/python_api/rst/info_tips_and_tricks.rst
+++ b/doc/python_api/rst/info_tips_and_tricks.rst
@@ -239,7 +239,7 @@ Drop Into a Python Interpreter in Your Script
=============================================
In the middle of a script you may want to inspect some variables,
-run some function and generally dig about to see whats going on.
+run some function and generally dig about to see what's going on.
.. code-block:: python