* replace references to old website to references to new site

6 files changed, 8 insertions, 8 deletions

diff --git a/REQUIREMENTS b/REQUIREMENTS
index d9adaeaf..cc12c4bc 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -88,4 +88,4 @@ where you installed Ruby (typically C:\Ruby\)
 Further instructions
 ====================
 
-For further instructions, check http://linuxbrit.co.uk/rbot/wiki/InstallGuide
+For further instructions, check http://ruby-rbot.org/rbot-trac/wiki/InstallGuide
diff --git a/Rakefile b/Rakefile
index 7a6bd81e..f0a42717 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s|
 
   s.author = 'Tom Gilbert'
   s.email = 'tom@linuxbrit.co.uk'
-  s.homepage = 'http://linuxbrit.co.uk/rbot/'
+  s.homepage = 'http://ruby-rbot.org'
   s.rubyforge_project = 'rbot'
 end
 
diff --git a/data/rbot/plugins/alias.rb b/data/rbot/plugins/alias.rb
index a587736c..bafd8528 100644
--- a/data/rbot/plugins/alias.rb
+++ b/data/rbot/plugins/alias.rb
@@ -12,10 +12,10 @@
 # exisitng rbot command and that is run.
 #
 # == Example Session
-#   < alias googlerbot *terms => google site:linuxbrit.co.uk/rbot/ <terms>
+#   < alias googlerbot *terms => google site:ruby-rbot.org <terms>
 #   > okay
 #   < googlerbot plugins
-#   > Results for site:linuxbrit.co.uk/rbot/ plugins: ....
+#   > Results for site:ruby-rbot.org plugins: ....
 #
 # == Security
 # By default, only the owner can define and remove aliases, while everyone else can
@@ -171,7 +171,7 @@ class AliasPlugin < Plugin
         end.join ' | '
       end
     when 'create'
-      _('"alias <text> => <command>" => add text as an alias of command. Text can contain placeholders marked with : or * for :words and *multiword arguments. The command can contain placeholders enclosed with < > which will be substituded with argument values. For example: alias googlerbot *terms => google site:linuxbrit.co.uk/rbot/ <terms>')
+      _('"alias <text> => <command>" => add text as an alias of command. Text can contain placeholders marked with : or * for :words and *multiword arguments. The command can contain placeholders enclosed with < > which will be substituded with argument values. For example: alias googlerbot *terms => google site:ruby-rbot.org <terms>')
     when 'commands'
       _('alias list => list defined aliases | alias whatis <alias> => show definition of the alias | alias remove <alias> => remove defined alias | see the "create" topic about adding aliases')
     end
diff --git a/lib/rbot/core/utils/httputil.rb b/lib/rbot/core/utils/httputil.rb
index 2c83cebb..3d4133e0 100644
--- a/lib/rbot/core/utils/httputil.rb
+++ b/lib/rbot/core/utils/httputil.rb
@@ -283,7 +283,7 @@ class HttpUtil
       'Accept-Charset' => 'utf-8;q=1.0, *;q=0.8',
       'Accept-Encoding' => 'gzip;q=1, deflate;q=1, identity;q=0.8, *;q=0.2',
       'User-Agent' =>
-        "rbot http util #{$version} (http://linuxbrit.co.uk/rbot/)"
+        "rbot http util #{$version} (#{Irc::Bot::SOURCE_URL})"
     }
     debug "starting http cache cleanup timer"
     @timer = @bot.timer.add(300) {
diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 5cb9e4f3..42e3c9b6 100644
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -124,7 +124,7 @@ module Irc
 # handles them or passes them to plugins, and contains core functionality.
 class Bot
   COPYRIGHT_NOTICE = "(c) Tom Gilbert and the rbot development team"
-  SOURCE_URL = "http://linuxbrit.co.uk/rbot"
+  SOURCE_URL = "http://ruby-rbot.org"
   # the bot's Auth data
   attr_reader :auth
 
diff --git a/lib/rbot/plugins/dice.rb b/lib/rbot/plugins/dice.rb
index 928da894..a09d2b1a 100644
--- a/lib/rbot/plugins/dice.rb
+++ b/lib/rbot/plugins/dice.rb
@@ -5,7 +5,7 @@
 # Version: 0.3.2
 # Date: Sat 6 Apr 2002
 #
-# You can get rbot from: http://www.linuxbrit.co.uk/rbot/
+# You can get rbot from: http://ruby-rbot.org
 #
 # Changelog
 # 0.1 - Initial release