Merged changes in the trunk up to revision 41368.

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c

6 files changed, 12 insertions, 9 deletions

diff --git a/doc/build_systems/cmake.txt b/doc/build_systems/cmake.txt
index d0e8a088ca7..b7a6bd9871e 100644
--- a/doc/build_systems/cmake.txt
+++ b/doc/build_systems/cmake.txt
@@ -1,4 +1,3 @@
-$Id$
 
     Blender CMake build system
     ============================
diff --git a/doc/build_systems/scons-dev.txt b/doc/build_systems/scons-dev.txt
index 4cc4e6c6ec2..b7cac8109d4 100644
--- a/doc/build_systems/scons-dev.txt
+++ b/doc/build_systems/scons-dev.txt
@@ -1,5 +1,3 @@
-$Id$
-
 
     Internals of Blenders SCons scripts
     ===================================
diff --git a/doc/build_systems/scons.txt b/doc/build_systems/scons.txt
index 9d018bcc790..d6ead8d32ae 100644
--- a/doc/build_systems/scons.txt
+++ b/doc/build_systems/scons.txt
@@ -1,4 +1,3 @@
-$Id$
 
     Blenders SCons build scripts
     ============================
diff --git a/doc/python_api/rst/info_quickstart.rst b/doc/python_api/rst/info_quickstart.rst
index e7f2900b212..be4ccdbcf72 100644
--- a/doc/python_api/rst/info_quickstart.rst
+++ b/doc/python_api/rst/info_quickstart.rst
@@ -67,7 +67,7 @@ Data Access
 Accessing datablocks
 ^^^^^^^^^^^^^^^^^^^^
 
-Python accesses Blender's data in the same way as the animation system and user interface, which means any setting that is changed via a button can also be changed from Python.
+Python accesses Blender's data in the same way as the animation system and user interface; this implies that any setting that can be changed via a button can also be changed from Python.
 
 Accessing data from the currently loaded blend file is done with the module :mod:`bpy.data`. This gives access to library data. For example:
 
@@ -101,7 +101,7 @@ Unlike Python's dictionaries, both methods are acceptable; however, the index of
 Accessing attributes
 ^^^^^^^^^^^^^^^^^^^^
 
-Once you have a data block such as a material, object, groups etc. its attributes can be accessed just like changing a setting in the interface; in fact, the button tooltip also displays the Python attribute which can help in finding what settings to change in a script.
+Once you have a data block, such as a material, object, groups etc., its attributes can be accessed much like you would change a setting using the graphical interface. In fact, the tooltip for each button also displays the Python attribute which can help in finding what settings to change in a script.
 
    >>> bpy.data.objects[0].name 
    'Camera'
@@ -179,7 +179,7 @@ So ``bpy.context.object = obj`` will raise an error.
 But ``bpy.context.scene.objects.active = obj`` will work as expected.
 
 
-The context attributes change depending on where it is accessed. The 3D view has different context members to the Console, so take care when accessing context attributes that the user state is known.
+The context attributes change depending on where they are accessed. The 3D view has different context members than the console, so take care when accessing context attributes that the user state is known.
 
 See :mod:`bpy.context` API reference
 
@@ -256,6 +256,8 @@ To run the script:
 
 #. Press Ctrl+Right twice to change to the Scripting layout.
 
+#. Click the button labeled ``New`` and the confirmation pop up in order to create a new text block.
+
 #. Press Ctrl+V to paste the code into the text panel (the upper left frame).
 
 #. Click on the button **Run Script**.
@@ -269,6 +271,7 @@ To run the script:
 .. seealso:: The class members with the **bl_** prefix are documented in the API
    reference :class:`bpy.types.Operator`
 
+.. note:: The output from the ``main`` function is sent to the terminal; in order to see this, be sure to :ref:`use the terminal <use_the_terminal>`.
 
 Example Panel
 -------------
@@ -285,6 +288,8 @@ To run the script:
 
 #. Press Ctrl+Right twice to change to the Scripting layout
 
+#. Click the button labeled ``New`` and the confirmation pop up in order to create a new text block.
+
 #. Press Ctrl+V to paste the code into the text panel (the upper left frame)
 
 #. Click on the button **Run Script**.
@@ -310,7 +315,7 @@ Types
 
 Blender defines a number of Python types but also uses Python native types.
 
-Blender's Python API can be split up into 3 categories. 
+Blender's Python API can be split up into 3 categories.
 
 
 Native Types
diff --git a/doc/python_api/rst/info_tips_and_tricks.rst b/doc/python_api/rst/info_tips_and_tricks.rst
index f88be5de3a8..5de7ded7674 100644
--- a/doc/python_api/rst/info_tips_and_tricks.rst
+++ b/doc/python_api/rst/info_tips_and_tricks.rst
@@ -7,6 +7,8 @@ Here are various suggestions that you might find useful when writing scripts.
 Some of these are just python features that scripters may not have thought to use with blender, others are blender specific.
 
 
+.. _use_the_terminal:
+
 Use The Terminal
 ================
 
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 1e0b3c2da0a..c0e70292784 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -103,7 +103,7 @@ sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out
 # extra info, not api reference docs
 # stored in ./rst/info/
 INFO_DOCS = (
-    ("info_quickstart.rst", "Blender/Python Quickstart: new to blender/scripting and want to get you're feet wet?"),
+    ("info_quickstart.rst", "Blender/Python Quickstart: new to blender/scripting and want to get your feet wet?"),
     ("info_overview.rst", "Blender/Python API Overview: a more complete explanation of python integration"),
     ("info_best_practice.rst", "Best Practice: Conventions to follow for writing good scripts"),
     ("info_tips_and_tricks.rst", "Tips and Tricks: Hints to help you while writeing scripts for blender"),