Commit: c07f6c02b325c6188a013462a4de1b53ce17cbcb
Author: Campbell Barton
Date: Mon Dec 8 11:15:56 2014 +0100
Branches: master
https://developer.blender.org/rBc07f6c02b325c6188a013462a4de1b53ce17cbcb
Docs: reference the new manual
===================================================================
M intern/cycles/device/device_cuda.cpp
M release/scripts/startup/bl_ui/space_info.py
M release/text/readme.html
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp
b/intern/cycles/device/device_cuda.cpp
index 05f45ab..7e622e0 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -76,7 +76,7 @@ public:
{
if(first_error) {
fprintf(stderr, "\nRefer to the Cycles GPU rendering
documentation for possible solutions:\n");
- fprintf(stderr,
"http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/GPU_Rendering\n\n";);
+ fprintf(stderr,
"http://www.blender.org/manual/render/cycles/gpu_rendering.html\n\n";);
first_error = false;
}
}
diff --git a/release/scripts/startup/bl_ui/space_info.py
b/release/scripts/startup/bl_ui/space_info.py
index 1fbe516..2b07512 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -279,7 +279,7 @@ class INFO_MT_help(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("wm.url_open", text="Manual", icon='HELP').url =
"http://wiki.blender.org/index.php/Doc:2.6/Manual";
+ layout.operator("wm.url_open", text="Manual", icon='HELP').url =
"http://www.blender.org/manual";
layout.operator("wm.url_open", text="Release Log", icon='URL').url =
"http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/%d.%d"; %
bpy.app.version[:2]
layout.separator()
diff --git a/release/text/readme.html b/release/text/readme.html
index 0a0d16f..6dbd354 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -57,7 +57,7 @@
<p class="p5"><span class="s3">General information <a
href="http://www.blender.org/";><span class="s4">www.blender.org</span></a> <br>
Full release log <a
href="http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.73";><span
class="s4">wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.73</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="http://wiki.blender.org/index.php/Doc:2.6/Manual";><span
class="s4">wiki.blender.org/index.php/Doc:2.6/Manual</span></a><br>
+Manual <a href="http://www.blender.org/manual";><span
class="s4">www.blender.org/manual</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"><span
class="s4">#blenderchat</span></a> or <a
href="irc://irc.freenode.net/#blender"><span class="s4">#blender</span></a> on
irc.freenode.net</span></p>
<p class="p4">Developers:</p>
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 3ed00cf..a606c6a 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1990,7 +1990,7 @@ static uiBlock *wm_block_create_splash(bContext *C,
ARegion *ar, void *UNUSED(ar
BLENDER_VERSION / 100, BLENDER_VERSION % 100);
uiItemStringO(col, IFACE_("Release Log"), ICON_URL, "WM_OT_url_open",
"url", url);
uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url",
- "http://wiki.blender.org/index.php/Doc:2.6/Manual";);
+ "http://www.blender.org/manual";);
uiItemStringO(col, IFACE_("Blender Website"), ICON_URL,
"WM_OT_url_open", "url", "http://www.blender.org";);
if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
BLI_snprintf(url, sizeof(url),
"http://www.blender.org/documentation/blender_python_api_%d_%d";
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
