Merged changes in the trunk up to revision 48227.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c

4 files changed, 6 insertions, 8 deletions

diff --git a/doc/python_api/examples/bpy.ops.2.py b/doc/python_api/examples/bpy.ops.2.py
index 86b7438888c..575d020a5a0 100644
--- a/doc/python_api/examples/bpy.ops.2.py
+++ b/doc/python_api/examples/bpy.ops.2.py
@@ -15,4 +15,3 @@ you would pass {'active_object': object}.
 import bpy
 override = {'selected_bases': list(bpy.context.scene.object_bases)}
 bpy.ops.object.delete(override)
-
diff --git a/doc/python_api/examples/bpy.ops.3.py b/doc/python_api/examples/bpy.ops.3.py
index 0b5bcafe5be..7dec69cf566 100644
--- a/doc/python_api/examples/bpy.ops.3.py
+++ b/doc/python_api/examples/bpy.ops.3.py
@@ -9,10 +9,9 @@ import bpy
 
 for window in bpy.context.window_manager.windows:
     screen = window.screen
-    
+
     for area in screen.areas:
         if area.type == 'VIEW_3D':
             override = {'window': window, 'screen': screen, 'area': area}
             bpy.ops.screen.screen_full_area(override)
             break
-
diff --git a/doc/python_api/examples/bpy.types.Object.py b/doc/python_api/examples/bpy.types.Object.py
index 5301797aae2..2ddce248a5b 100644
--- a/doc/python_api/examples/bpy.types.Object.py
+++ b/doc/python_api/examples/bpy.types.Object.py
@@ -2,7 +2,7 @@
 Basic Object Operations Example
 +++++++++++++++++++++++++++++++
 This script demonstrates basic operations on object like creating new
-object, placing it into scene, selecting it and making it active
+object, placing it into scene, selecting it and making it active.
 """
 
 import bpy
@@ -11,15 +11,15 @@ from mathutils import Matrix
 scene = bpy.context.scene
 
 # Create new lamp datablock
-lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+lamp_data = bpy.data.lamps.new(name="New Lamp", type='POINT')
 
-# Create new object with out lamp datablock
+# Create new object with our lamp datablock
 lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
 
 # Link lamp object to the scene so it'll appear in this scene
 scene.objects.link(lamp_object)
 
-# Place lamp to specified location
+# Place lamp to a specified location
 lamp_object.location = (5.0, 5.0, 5.0)
 
 # And finally select it make active
diff --git a/doc/python_api/examples/bpy.types.Panel.1.py b/doc/python_api/examples/bpy.types.Panel.1.py
index cd85d30cea0..fbcdae8baeb 100644
--- a/doc/python_api/examples/bpy.types.Panel.1.py
+++ b/doc/python_api/examples/bpy.types.Panel.1.py
@@ -2,7 +2,7 @@
 Simple Object Panel
 +++++++++++++++++++
 This panel has a :class:`Panel.poll` and :class:`Panel.draw_header` function,
-even though the contents is basic this closely resemples blenders panels.
+even though the contents is basic this closely resembles blenders panels.
 """
 import bpy