From 9fccfd313cd52618fed6bca0148154f75431e3c0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 29 Sep 2012 11:51:18 +0000
Subject: [PATCH] correct addon example, it used both __doc__ and
 bl_description

---
 release/scripts/templates/addon_add_object.py | 3 +--
 source/blender/python/intern/bpy.c            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/release/scripts/templates/addon_add_object.py b/release/scripts/templates/addon_add_object.py
index 931f7d51aad..a4df5fb7436 100644
--- a/release/scripts/templates/addon_add_object.py
+++ b/release/scripts/templates/addon_add_object.py
@@ -39,10 +39,9 @@ def add_object(self, context):
 
 
 class OBJECT_OT_add_object(Operator, AddObjectHelper):
-    """Add a Mesh Object"""
+    """Create a new Mesh Object"""
     bl_idname = "mesh.add_object"
     bl_label = "Add Mesh Object"
-    bl_description = "Create a new Mesh Object"
     bl_options = {'REGISTER', 'UNDO'}
 
     scale = FloatVectorProperty(
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index f2222825c42..3bf44e43c56 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -171,7 +171,7 @@ static PyObject *bpy_user_resource(PyObject *UNUSED(self), PyObject *args, PyObj
 }
 
 PyDoc_STRVAR(bpy_resource_path_doc,
-".. function:: resource_path(type, major=2, minor=57)\n"
+".. function:: resource_path(type, major=bpy.app.version[0], minor=bpy.app.version[1])\n"
 "\n"
 "   Return the base path for storing system files.\n"
 "\n"