ros · mikepurvis · Nov 20, 2018 · Nov 20, 2018
diff --git a/clients/roscpp/include/ros/names.h b/clients/roscpp/include/ros/names.h
@@ -47,7 +47,7 @@ ROSCPP_DECL std::string clean(const std::string& name);
 /**
  * \brief Resolve a graph resource name into a fully qualified graph resource name
  *
- * See http://www.ros.org/wiki/Names for more details
+ * See http://wiki.ros.org/Names for more details
  *
  * \param name Name to resolve
  * \param remap Whether or not to apply remappings to the name
@@ -57,7 +57,7 @@ ROSCPP_DECL std::string resolve(const std::string& name, bool remap = true);
 /**
  * \brief Resolve a graph resource name into a fully qualified graph resource name
  *
- * See http://www.ros.org/wiki/Names for more details
+ * See http://wiki.ros.org/Names for more details
  *
  * \param ns Namespace to use in resolution
  * \param name Name to resolve

diff --git a/clients/roscpp/include/ros/roscpp.dox b/clients/roscpp/include/ros/roscpp.dox
@@ -15,6 +15,6 @@
 
 @par Examples
 
-Many examples of using ROS can be found <a href="http://www.ros.org/wiki/ROS/Tutorials">on the wiki</a> and in the <a href="http://www.ros.org/wiki/roscpp_tutorials">roscpp_tutorials</a> package.
+Many examples of using ROS can be found <a href="http://wiki.ros.org/ROS/Tutorials">on the wiki</a> and in the <a href="http://wiki.ros.org/roscpp_tutorials">roscpp_tutorials</a> package.
 
 */
diff --git a/clients/roscpp/package.xml b/clients/roscpp/package.xml
@@ -3,7 +3,7 @@
   <version>1.14.3</version>
   <description>
     roscpp is a C++ implementation of ROS. It provides
-    a <a href="http://www.ros.org/wiki/Client%20Libraries">client
+    a <a href="http://wiki.ros.org/Client%20Libraries">client
     library</a> that enables C++ programmers to quickly interface with
     ROS <a href="http://ros.org/wiki/Topics">Topics</a>,
     <a href="http://ros.org/wiki/Services">Services</a>,

diff --git a/clients/rospy/src/rospy/names.py b/clients/rospy/src/rospy/names.py
@@ -35,7 +35,7 @@
 """
 Support for ROS Names
 
-See: U{http://www.ros.org/wiki/Names}
+See: U{http://wiki.ros.org/Names}
 """
 
 import sys

diff --git a/clients/rospy/src/rospy/numpy_msg.py b/clients/rospy/src/rospy/numpy_msg.py
@@ -35,7 +35,7 @@
 """
 Support for using numpy with rospy messages.
 
-For tutorials, see U{http://www.ros.org/wiki/rospy_tutorials/Tutorials/numpy}
+For tutorials, see U{http://wiki.ros.org/rospy_tutorials/Tutorials/numpy}
 
 Listener example::
     from rospy.numpy_msg import numpy_msg

diff --git a/ros_comm/package.xml b/ros_comm/package.xml
@@ -7,7 +7,7 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
 
-  <url>http://www.ros.org/wiki/ros_comm</url>
+  <url>http://wiki.ros.org/ros_comm</url>
   <author email="mquigley@cs.stanford.edu">Morgan Quigley</author>
   <author email="berger@willowgarage.com">Eric Berger</author>
   <author email="kwc@willowgarage.com">Ken Conley</author>

diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
@@ -206,7 +206,7 @@ def test_simtime(self):
         """
         test that node obeys simtime (/Clock) contract
 
-        http://www.ros.org/wiki/Clock
+        http://wiki.ros.org/Clock
         """
         try:
             use_sim_time = self.master.getParam('/use_sim_time')

diff --git a/tools/roslaunch/scripts/roscore b/tools/roslaunch/scripts/roscore
@@ -42,7 +42,7 @@ def _get_optparse():
     parser = OptionParser(usage="usage: %prog [options]",
                           prog=NAME,
                           description="roscore will start up a ROS Master, a ROS Parameter Server and a rosout logging node",
-                          epilog="See http://www.ros.org/wiki/roscore"
+                          epilog="See http://wiki.ros.org/roscore"
                           )
     parser.add_option("-p", "--port",
                       dest="port", default=None,

diff --git a/tools/roslaunch/src/roslaunch/server.py b/tools/roslaunch/src/roslaunch/server.py
@@ -402,7 +402,7 @@ def start(self):
 
 For more tips, please see
 
-\thttp://www.ros.org/wiki/ROS/NetworkSetup
+\thttp://wiki.ros.org/ROS/NetworkSetup
 """%(self.uri, p.hostname))
         printlog_bold("started roslaunch server %s"%(self.uri))
 

diff --git a/tools/rosmsg/package.xml b/tools/rosmsg/package.xml
@@ -5,9 +5,9 @@
     rosmsg contains two command-line tools: <tt>rosmsg</tt> and
     <tt>rossrv</tt>. <tt>rosmsg</tt> is a command-line tool for
     displaying information about <a
-    href="http://www.ros.org/wiki/msg">ROS Message
+    href="http://wiki.ros.org/msg">ROS Message
     types</a>. <tt>rossrv</tt> is a command-line tool for displaying
-    information about <a href="http://www.ros.org/wiki/srv">ROS
+    information about <a href="http://wiki.ros.org/srv">ROS
     Service types</a>.
   </description>
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>

diff --git a/tools/rosnode/package.xml b/tools/rosnode/package.xml
@@ -3,7 +3,7 @@
   <version>1.14.3</version>
   <description>
     rosnode is a command-line tool for displaying debug information
-    about ROS <a href="http://www.ros.org/wiki/Nodes">Nodes</a>,
+    about ROS <a href="http://wiki.ros.org/Nodes">Nodes</a>,
     including publications, subscriptions and connections. It also
     contains an experimental library for retrieving node
     information. This library is intended for internal use only.

diff --git a/tools/rosparam/package.xml b/tools/rosparam/package.xml
@@ -4,12 +4,12 @@
   <description>
     rosparam contains the rosparam command-line tool for getting and
     setting ROS Parameters on the <a
-    href="http://www.ros.org/wiki/Parameter%20Server">Parameter
+    href="http://wiki.ros.org/Parameter%20Server">Parameter
     Server</a> using YAML-encoded files. It also contains an
     experimental library for using YAML with the Parameter
     Server. This library is intended for internal use only.
 
-    rosparam can be invoked within a <a href="http://www.ros.org/wiki/roslaunch">roslaunch</a> file.
+    rosparam can be invoked within a <a href="http://wiki.ros.org/roslaunch">roslaunch</a> file.
   </description>
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>

diff --git a/tools/rosservice/package.xml b/tools/rosservice/package.xml
@@ -4,7 +4,7 @@
   <description>
     rosservice contains the rosservice command-line tool for listing
     and querying ROS <a
-    href="http://www.ros.org/wiki/Services">Services</a>. It also
+    href="http://wiki.ros.org/Services">Services</a>. It also
     contains a Python library for retrieving information about
     Services and dynamically invoking them. The Python library is
     experimental and is for internal-use only.

diff --git a/tools/rostopic/package.xml b/tools/rostopic/package.xml
@@ -4,9 +4,9 @@
   <description>
     rostopic contains the rostopic command-line tool for displaying
     debug information about
-    ROS <a href="http://www.ros.org/wiki/Topics">Topics</a>, including
+    ROS <a href="http://wiki.ros.org/Topics">Topics</a>, including
     publishers, subscribers, publishing rate,
-    and ROS <a href="http://www.ros.org/wiki/Messages">Messages</a>. It also
+    and ROS <a href="http://wiki.ros.org/Messages">Messages</a>. It also
     contains an experimental Python library for getting information about
     and interacting with topics dynamically. This library is for
     internal-use only as the code API may change, though it does provide