[Bf-blender-cvs] [d4a9da2] master: Doc fix: rather then -> rather than

Wed Aug 5 12:53:36 CEST 2015

Commit: d4a9da28e8b7bc6e2952faa3bdfec314ff4cbb97
Author: Sybren A. Stüvel
Date:   Wed Aug 5 12:47:37 2015 +0200
Branches: master
https://developer.blender.org/rBd4a9da28e8b7bc6e2952faa3bdfec314ff4cbb97

Doc fix: rather then -> rather than

===================================================================

M	doc/python_api/examples/bpy.types.Operator.1.py
M	doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
M	doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
M	doc/python_api/rst/info_gotcha.rst
M	doc/python_api/rst/info_quickstart.rst
M	doc/python_api/rst/info_tips_and_tricks.rst
M	source/blender/python/intern/bpy_rna.c

===================================================================

diff --git a/doc/python_api/examples/bpy.types.Operator.1.py b/doc/python_api/examples/bpy.types.Operator.1.py
index fc01650..f007cdf 100644
--- a/doc/python_api/examples/bpy.types.Operator.1.py
+++ b/doc/python_api/examples/bpy.types.Operator.1.py
@@ -31,7 +31,7 @@ class SimpleMouseOperator(bpy.types.Operator):
     y = bpy.props.IntProperty()
 
     def execute(self, context):
-        # rather then printing, use the report function,
+        # rather than printing, use the report function,
         # this way the message appears in the header,
         self.report({'INFO'}, "Mouse coords are %d %d" % (self.x, self.y))
         return {'FINISHED'}
diff --git a/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py b/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
index faf3b12..6889fe7 100644
--- a/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
+++ b/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
@@ -1,7 +1,7 @@
 """
 Note that when keying data paths which contain nested properties this must be
 done from the :class:`ID` subclass, in this case the :class:`Armature` rather
-then the bone.
+than the bone.
 """
 
 import bpy
diff --git a/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst b/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
index 88b1d7d..74df50d 100644
--- a/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
+++ b/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
@@ -137,7 +137,7 @@ base class --- :class:`SCA_IObject`
 
       .. note::
 
-         A value of 0.0 disables this option (rather then setting it stationary).
+         A value of 0.0 disables this option (rather than setting it stationary).
 
    .. attribute:: angularVelocityMin
 
diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst
index 716bb58..430a862 100644
--- a/doc/python_api/rst/info_gotcha.rst
+++ b/doc/python_api/rst/info_gotcha.rst
@@ -184,7 +184,7 @@ There are now 3 ways to access faces:
 
 - :class:`bpy.types.MeshPolygon` -
   this is the data structure which now stores faces in object mode
-  (access as ``mesh.polygons`` rather then ``mesh.faces``).
+  (access as ``mesh.polygons`` rather than ``mesh.faces``).
 - :class:`bpy.types.MeshTessFace` -
   the result of triangulating (tessellated) polygons,
   the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
@@ -444,7 +444,7 @@ this way you don't run this risk of referencing existing data from the blend fil
    
    # normally some code, or function calls...
    
-   # use own dictionary rather then bpy.data
+   # use own dictionary rather than bpy.data
    mesh = mesh_name_mapping[meshid]
 
 
@@ -494,7 +494,7 @@ A common case where you would run into this problem is when exporting a material
 
 
 When using blender data from linked libraries there is an unfortunate complication
-since the path will be relative to the library rather then the open blend file.
+since the path will be relative to the library rather than the open blend file.
 When the data block may be from an external blend file pass the library argument from the :class:`bpy.types.ID`.
 
    >>> bpy.path.abspath(image.filepath, library=image.library)
@@ -759,7 +759,7 @@ internally the array which stores this data is re-allocated.
    point.co = 1.0, 2.0, 3.0
 
 This can be avoided by re-assigning the point variables after adding the new one or by storing
-indices's to the points rather then the points themselves.
+indices's to the points rather than the points themselves.
 
 The best way is to sidestep the problem altogether add all the points to the curve at once.
 This means you don't have to worry about array re-allocation and its faster too
@@ -782,7 +782,7 @@ The following example shows how this precortion works.
    mesh = bpy.data.meshes.new(name="MyMesh")
    # normally the script would use the mesh here...
    bpy.data.meshes.remove(mesh)
-   print(mesh.name)  # <- give an exception rather then crashing:
+   print(mesh.name)  # <- give an exception rather than crashing:
 
    # ReferenceError: StructRNA of type Mesh has been removed
 
diff --git a/doc/python_api/rst/info_quickstart.rst b/doc/python_api/rst/info_quickstart.rst
index 8ded6e6..ab106dd 100644
--- a/doc/python_api/rst/info_quickstart.rst
+++ b/doc/python_api/rst/info_quickstart.rst
@@ -59,7 +59,7 @@ text editor or entering commands in the Python console.
 
 Both the *Text Editor* and *Python Console* are space types you can select from the view header.
 
-Rather then manually configuring your spaces for Python development,
+Rather than manually configuring your spaces for Python development,
 you may prefer to use the *Scripting* screen, included default with Blender,
 accessible from the top headers screen selector.
 
diff --git a/doc/python_api/rst/info_tips_and_tricks.rst b/doc/python_api/rst/info_tips_and_tricks.rst
index da213e3..28d129b 100644
--- a/doc/python_api/rst/info_tips_and_tricks.rst
+++ b/doc/python_api/rst/info_tips_and_tricks.rst
@@ -81,7 +81,7 @@ Editing a text file externally and having the same text open in Blender does wor
 so here are 2 ways you can easily use an external file from Blender.
 
 Using the following examples you'll still need textblock in Blender to execute,
-but reference an external file rather then including it directly.
+but reference an external file rather than including it directly.
 
 
 Executing External Scripts
@@ -306,7 +306,7 @@ Python Safety (Build Option)
 Since it's possible to access data which has been removed (see Gotcha's),
 this can be hard to track down the cause of crashes.
 
-To raise Python exceptions on accessing freed data (rather then crashing),
+To raise Python exceptions on accessing freed data (rather than crashing),
 enable the CMake build option WITH_PYTHON_SAFETY.
 
 This enables data tracking which makes data access about 2x slower
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index e74eaef..bd07c73 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -3357,7 +3357,7 @@ static PyObject *pyrna_prop_path_from_id(BPy_PropertyRNA *self)
 PyDoc_STRVAR(pyrna_prop_as_bytes_doc,
 ".. method:: as_bytes()\n"
 "\n"
-"   Returns this string property as a byte rather then a python string.\n"
+"   Returns this string property as a byte rather than a python string.\n"
 "\n"
 "   :return: The string as bytes.\n"
 "   :rtype: bytes\n"


