Index: source/blender/python/api2_2x/doc/Object.py
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/doc/Object.py,v
retrieving revision 1.39
diff -u -r1.39 Object.py
--- source/blender/python/api2_2x/doc/Object.py	20 Jul 2005 00:03:52 -0000	1.39
+++ source/blender/python/api2_2x/doc/Object.py	7 Aug 2005 04:06:29 -0000
@@ -179,7 +179,7 @@
         of: 2 - axis, 4 - texspace, 8 - drawname, 16 - drawimage,
         32 - drawwire.
     @ivar name: The name of the object.
-    @ivar sel: The selection state of the object, 1/0.  
+    @ivar sel: The selection state of the object in the current scene, 1/0.  
   """
 
   def buildParts():
@@ -248,7 +248,7 @@
 
   def getEuler():
     """
-    Returns the object's rotation as Euler rotation vector (rotX, rotY, rotZ).  Angles are in radians.
+    Returns the object's localspace rotation as Euler rotation vector (rotX, rotY, rotZ).  Angles are in radians.
     @rtype: Py_Euler
     @return: A python euler 
     """
@@ -268,14 +268,14 @@
     """
   def isSelected():
     """
-    Returns the objects selection state as a boolean value True or False.
+    Returns the objects selection state in the current scene as a boolean value True or False.
     @rtype: Boolean
     @return: Selection state as True or False
     """
   
   def getLocation():
     """
-    Returns the object's location (x, y, z).
+    Returns the object's localspace location (x, y, z).
     @return: (x, y, z)
 
     I{B{Example:}}
@@ -351,7 +351,7 @@
 
   def getSize():
     """
-    Returns the object's size.
+    Returns the object's localspace size.
     @return: (SizeX, SizeY, SizeZ)
     """
 
@@ -426,12 +426,12 @@
     @return: py_none
     """
 
-  def link(object):
+  def link(datablock):
     """
-    Links Object with data provided in the argument. The data must match the
+    Links Object with datablock provided in the argument. The data must match the
     Object's type, so you cannot link a Lamp to a Mesh type object.
-    @type object: Blender Object
-    @param object: A Blender Object.
+    @type datablock: Blender datablock
+    @param datablock: A Blender datablock matching the objects type.
     """
 
   def makeParent(objects, noninverse = 0, fast = 0):
@@ -535,7 +535,7 @@
 
   def setEuler(euler):
     """
-    Sets the object's rotation according to the specified Euler angles.
+    Sets the object's localspace rotation according to the specified Euler angles.
     @type euler: Py_Euler or a list of floats
     @param euler: a python euler or x,y,z rotations as floats
     """
@@ -549,7 +549,7 @@
 
   def setLocation(x, y, z):
     """
-    Sets the object's location.
+    Sets the object's localspace location relative to the parent object (if any).
     @type x: float
     @param x: The X coordinate of the new location.
     @type y: float
@@ -560,7 +560,7 @@
 
   def setMaterials(materials):
     """
-    Sets the materials. The argument must be a list of valid material objects.
+    Sets the materials. The argument must be a list 16 items or less, consisting of material objects, None for an empty material slot.
     @type materials: Materials list
     @param materials: A list of Blender material objects.
     """
@@ -574,14 +574,14 @@
 
   def setName(name):
     """
-    Sets the name of the object.
+    Sets the name of the object. A string longer then 20 characters will be shortened.
     @type name: String
     @param name: The new name for the object.
     """
 
   def setSize(x, y, z):
     """
-    Sets the object's size.
+    Sets the object's size, relative to the parent object (if any)
     @type x: float
     @param x: The X size multiplier.
     @type y: float
@@ -607,7 +607,7 @@
   
   def select(boolean):
     """
-    Sets the object's selection state.
+    Sets the object's selection state in the current scene.
     @type boolean: Integer
     @param boolean:
         - 0  - unselected
@@ -616,7 +616,7 @@
   
   def getBoundBox():
     """
-    Returns the bounding box of this object.  This works for meshes (out of
+    Returns the worldspace bounding box of this object.  This works for meshes (out of
     edit mode) and curves.
     @rtype: list of 8 (x,y,z) float coordinate vectors
     @return: The coordinates of the 8 corners of the bounding box.
