Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Dec 2018 11:04:17 +0000 (12:04 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Dec 2018 11:04:17 +0000 (12:04 +0100)
1  2 
release/scripts/startup/bl_operators/wm.py

@@@ -1022,11 -1037,11 +1022,11 @@@ class WM_OT_doc_view(Operator)
      bl_idname = "wm.doc_view"
      bl_label = "View Documentation"
  
 -    doc_id = doc_id
 +    doc_id: doc_id
      if bpy.app.version_cycle == "release":
-         _prefix = ("https://docs.blender.org/api/blender_python_api_current")
+         _prefix = ("https://docs.blender.org/api/current")
      else:
-         _prefix = ("https://docs.blender.org/api/blender_python_api_master")
+         _prefix = ("https://docs.blender.org/api/master")
  
      def execute(self, context):
          url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)