svn merge -r 30418:30512 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / intern / audaspace / Python / AUD_PyAPI.cpp

diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp
index a89bd66e3efb5afe974a291f587ee6491933e3ba..f62135b66e56070d81bc4749615a14b5622d77d5 100644 (file)
--- a/intern/audaspace/Python/AUD_PyAPI.cpp
+++ b/intern/audaspace/Python/AUD_PyAPI.cpp
@@ -136,7 +136,8 @@ Sound_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 PyDoc_STRVAR(M_aud_Sound_sine_doc,
 }
 
 PyDoc_STRVAR(M_aud_Sound_sine_doc,

-                        "Creates a sine sound at a specific frequency.");
+                        "sine()\n"
+                        "\tCreates a sine sound at a specific frequency.\n");

 
 static PyObject *
 Sound_sine(PyObject* nothing, PyObject* args);
 
 static PyObject *
 Sound_sine(PyObject* nothing, PyObject* args);


@@ -1652,7 +1653,9 @@ Device_get_status(Device *self, PyObject *object)
 }
 
 PyDoc_STRVAR(M_aud_Device_lock_doc,
 }
 
 PyDoc_STRVAR(M_aud_Device_lock_doc,

-                        "Locks the sound device.");
+                        ".. function:: lock()\n"
+                        "\n"
+                        "   Locks the sound device.\n");

 
 static PyObject *
 Device_lock(Device *self)
 
 static PyObject *
 Device_lock(Device *self)