Merged 15170:15635 from trunk (no conflicts or even merges)

source/blender/python/api2_2x/doc/Curve.py

@@ -535,6 +535,8 @@ class CurNurb:
 	@type flagU: int
 	@ivar flagV: The CurNurb knot flag V.  See L{setFlagU} for description.
 	@type flagV: int
+	@ivar orderU: The CurNurb knot order U, for nurbs curves only, this is clamped by the number of points, so the orderU will never be greater.
+	@type orderU: int
 	@ivar type: The type of the curve (Poly: 0, Bezier: 1, NURBS: 4)
 	@type type: int
 	@ivar knotsU: The knot vector in the U direction. The tuple will be empty

source/blender/python/api2_2x/doc/Render.py

@@ -833,9 +833,7 @@ class RenderData:
 
   def enableCropping(toggle):
     """
-    Enable/disable exclusion of border rendering from total image.
-    @type toggle: int
-    @param toggle: pass 1 for on / 0 for off
+    Deprecated: see the L{crop} attribute.
     """
 
   def setImageType(type):