From fdcfc263e97324dd991b7251143e6403c61f3c50 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Thu, 4 Jul 2019 18:24:13 -0400
Subject: Use latest/version number for manual links

We want users to go to the current version for their current version
when possible if not point to latest.

/dev should really only be for development related work. End users
should not be browsing /dev unless they are reading about upcoming
features ahead of time.
---
 intern/cycles/blender/addon/__init__.py                      | 2 +-
 intern/cycles/device/device_cuda.cpp                         | 2 +-
 release/scripts/startup/bl_operators/uvcalc_follow_active.py | 2 +-
 release/scripts/startup/bl_operators/wm.py                   | 7 ++++++-
 release/scripts/templates_py/addon_add_object.py             | 6 +++---
 release/text/readme.html                                     | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 4b838cce281..6d6f89603fe 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "blender": (2, 80, 0),
     "description": "Cycles renderer integration",
     "warning": "",
-    "wiki_url": "https://docs.blender.org/manual/en/dev/render/cycles/",
+    "wiki_url": "https://docs.blender.org/manual/en/latest/render/cycles/",
     "tracker_url": "",
     "support": 'OFFICIAL',
     "category": "Render"}
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 7ab823423b5..4d7d87828c2 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -199,7 +199,7 @@ class CUDADevice : public Device {
       fprintf(stderr,
               "\nRefer to the Cycles GPU rendering documentation for possible solutions:\n");
       fprintf(stderr,
-              "https://docs.blender.org/manual/en/dev/render/cycles/gpu_rendering.html\n\n");
+              "https://docs.blender.org/manual/en/latest/render/cycles/gpu_rendering.html\n\n");
       first_error = false;
     }
   }
diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
index d7a86302312..7b25491764b 100644
--- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py
+++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
@@ -19,7 +19,7 @@
 # <pep8 compliant>
 
 # for full docs see...
-# https://docs.blender.org/manual/en/dev/editors/uv_image/uv/editing/unwrapping/mapping_types.html#follow-active-quads
+# https://docs.blender.org/manual/en/latest/editors/uv_image/uv/editing/unwrapping/mapping_types.html#follow-active-quads
 
 import bpy
 from bpy.types import Operator
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 7a39bd103b0..e7b9a847120 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1753,12 +1753,17 @@ class WM_MT_splash(Menu):
         if found_recent:
             col2_title.label(text="Recent Files")
         else:
+            if bpy.app.version_cycle in {'rc', 'release'}:
+                manual_version = '%d.%d' % bpy.app.version[:2]
+            else:
+                manual_version = 'dev'
+
             # Links if no recent files
             col2_title.label(text="Getting Started")
 
             col2.operator(
                 "wm.url_open", text="Manual", icon='URL'
-            ).url = "https://docs.blender.org/manual/en/dev/"
+            ).url = "https://docs.blender.org/manual/en/" + manual_version + "/"
             col2.operator(
                 "wm.url_open", text="Release Notes", icon='URL',
             ).url = "https://www.blender.org/download/releases/%d-%d/" % bpy.app.version[:2]
diff --git a/release/scripts/templates_py/addon_add_object.py b/release/scripts/templates_py/addon_add_object.py
index 6e51149e451..47997069cbb 100644
--- a/release/scripts/templates_py/addon_add_object.py
+++ b/release/scripts/templates_py/addon_add_object.py
@@ -68,11 +68,11 @@ def add_object_button(self, context):
         icon='PLUGIN')
 
 
-# This allows you to right click on a button and link to the manual
+# This allows you to right click on a button and link to documentation
 def add_object_manual_map():
-    url_manual_prefix = "https://docs.blender.org/manual/en/dev/"
+    url_manual_prefix = "https://docs.blender.org/manual/en/latest/"
     url_manual_mapping = (
-        ("bpy.ops.mesh.add_object", "editors/3dview/object"),
+        ("bpy.ops.mesh.add_object", "scene_layout/object/types.html"),
     )
     return url_manual_prefix, url_manual_mapping
 
diff --git a/release/text/readme.html b/release/text/readme.html
index ccffe35b29f..3972f137d8e 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -85,7 +85,7 @@ Release Notes <a href="https://wiki.blender.org/wiki/Reference/Release_Notes/BLE
 <span class="s4">wiki.blender.org/wiki/Reference/Release_Notes/BLENDER_VERSION</span></a><br>
 Tutorials <a href="http://www.blender.org/support/tutorials/">
 <span class="s4">www.blender.org/support/tutorials/</span></a> <br>
-Manual <a href="https://docs.blender.org/manual/en/dev/"><span class="s4">https://docs.blender.org/manual/en/dev/</span></a><br>
+Manual <a href="https://docs.blender.org/manual/en/latest/"><span class="s4">https://docs.blender.org/manual/en/latest/</span></a><br>
 User Forum <a href="http://www.blenderartists.org/">
 <span class="s4">www.blenderartists.org</span></a><br>
 IRC <a href="irc://irc.freenode.net/#blenderchat">
-- 
cgit v1.2.3