Updated User Guide links to point to new location instead of Google Code wiki.

pekkaklarck · pekkaklarck · commit 157b7184b038 · 2014-07-28T19:41:14.000+03:00
diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -14,7 +14,7 @@ source is not helpful either, questions may be sent to the
 `robotframework-users`__ mailing list.
 
 __ http://robotframework.org
-__ http://code.google.com/p/robotframework/wiki/UserGuide
+__ http://robotframework.org/robotframework/#user-guide
 __ http://groups.google.com/group/robotframework-users
 
 .. toctree::
@@ -27,14 +27,15 @@ Command line entry points are implemented as Python modules and they also
 provide programmatic APIs. Following entry points exist:
 
   * :py:mod:`robot.run` entry point for executing tests.
-  * :py:mod:`robot.rebot` entry point for post-processing outputs.
-  * :py:mod:`robot.libdoc` entry point for the `libdoc`__ tool.
-  * :py:mod:`robot.testdoc` entry point for the `testdoc`__ tool.
-  * :py:mod:`robot.tidy` entry point for the `tidy`__ tool.
-
-__ http://robotframework.googlecode.com/hg/doc/userguide/RobotFrameworkUserGuide.html#libdoc
-__ http://robotframework.googlecode.com/hg/doc/userguide/RobotFrameworkUserGuide.html#testdoc
-__ http://robotframework.googlecode.com/hg/doc/userguide/RobotFrameworkUserGuide.html#tidy
+  * :py:mod:`robot.rebot` entry point for post-processing outputs (Rebot).
+  * :py:mod:`robot.libdoc` entry point for Libdoc tool.
+  * :py:mod:`robot.testdoc` entry point for Testdoc tool.
+  * :py:mod:`robot.tidy` entry point for Tidy tool.
+
+See `built-in tool documentation`__ for more details about Rebot, Libdoc,
+Testdoc, and Tidy tools.
+
+__ http://robotframework.org/robotframework/#built-in-tools
 
 Java entry points
 =================
diff --git a/src/java/org/robotframework/RobotFramework.java b/src/java/org/robotframework/RobotFramework.java
@@ -53,9 +53,10 @@ public static void main(String[] args) {
      * @param args
      *              The command line options to Robot Framework.
      *
-     * @return      Robot Framework return code. See the {@link
-     *              <a href="http://robotframework.googlecode.com/hg/doc/userguide/RobotFrameworkUserGuide.html">
-     *              the user guide</a>} for meaning of different return codes.
+     * @return      Robot Framework return code. See
+     *              <a href="http://robotframework.org/robotframework/#user-guide"
+                       target="_top">Robot Framework User Guide</a>
+     *              for meaning of different return codes.
      */
     public static int run(String[] args) {
         RobotRunner runner = new RunnerFactory().createRunner();
diff --git a/src/robot/htmldata/rebot/report.html b/src/robot/htmldata/rebot/report.html
@@ -658,7 +658,7 @@ <h3>Patterns</h3>
               precedence, from highest to lowest, is <em>AND</em>, <em>OR</em>,
               <em>NOT</em>. See <em>Simple patterns</em> and
               <em>Tag patterns</em> sections in
-              <a href="https://code.google.com/p/robotframework/wiki/UserGuide">Robot
+              <a href="http://robotframework.org/robotframework/#user-guide">Robot
               Framework User Guide</a> version 2.8.4 or newer for more details.
             </p>
             <table class="search-help-examples">
diff --git a/src/robot/libdoc.py b/src/robot/libdoc.py
@@ -117,12 +117,12 @@
 =====================
 
 Libdoc works with all interpreters supported by Robot Framework (Python,
-Jython and IronPython). In the examples above libdoc is executed as an
+Jython and IronPython). In the examples above Libdoc is executed as an
 installed module, but it can also be executed as a script like
 `python path/robot/libdoc.py`.
 
-For more information see libdoc section in Robot Framework User Guide at
-http://code.google.com/p/robotframework/wiki/UserGuide
+For more information about Libdoc and other built-in tools, see
+http://robotframework.org/robotframework/#built-in-tools.
 """
 
 import sys
diff --git a/src/robot/libraries/Telnet.py b/src/robot/libraries/Telnet.py
@@ -249,7 +249,7 @@ class Telnet:
     in format like '15 seconds' or '1min 10s'. If the timeout is given as
     just a number, for example, '10' or '1.5', it is considered to be seconds.
     The time string format is described in more detail in an appendix of
-    [http://code.google.com/p/robotframework/wiki/UserGuide|Robot Framework User Guide].
+    [http://robotframework.org/robotframework/#user-guide|Robot Framework User Guide].
     """
     ROBOT_LIBRARY_SCOPE = 'TEST_SUITE'
     ROBOT_LIBRARY_VERSION = get_version()
diff --git a/src/robot/rebot.py b/src/robot/rebot.py
@@ -56,8 +56,9 @@
 module (e.g. `python -m robot.rebot`) or `robot/rebot.py` script using a
 selected interpreter. Finally, there is also a standalone JAR distribution.
 
-For more information about Robot Framework run, for example, `pybot --help` or
-go to http://robotframework.org.
+For more information about Rebot and other built-in tools, see
+http://robotframework.org/robotframework/#built-in-tools. For more details
+about Robot Framework in general, go to http://robotframework.org.
 
 Options
 =======
diff --git a/src/robot/testdoc.py b/src/robot/testdoc.py
@@ -76,6 +76,9 @@
   python -m robot.testdoc my_test.html testdoc.html
   jython -m robot.testdoc -N smoke_tests -i smoke path/to/my_tests smoke.html
   ipy path/to/robot/testdoc.py first_suite.txt second_suite.txt output.html
+
+For more information about Testdoc and other built-in tools, see
+http://robotframework.org/robotframework/#built-in-tools.
 """
 
 import os.path
diff --git a/src/robot/tidy.py b/src/robot/tidy.py
@@ -106,6 +106,9 @@
 In the above examples Tidy is used only with Python, but it works also with
 Jython and IronPython. Above it is executed as an installed module, but it
 can also be run as a script like `python path/robot/tidy.py`.
+
+For more information about Tidy and other built-in tools, see
+http://robotframework.org/robotframework/#built-in-tools.
 """
 
 import os
