20 files changed, 20 insertions, 20 deletions
diff --git a/examples/modules/sample-module/README.txt b/examples/modules/sample-module/README.txt
index ee4b8201a..cd35c83a1 100644
--- a/examples/modules/sample-module/README.txt
+++ b/examples/modules/sample-module/README.txt
@@ -13,5 +13,5 @@ Note the consistent naming of files for Puppet::Util::Autoload
 
 Reference Documents:
 http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
-http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+http://docs.puppetlabs.com/guides/custom_functions.html
 http://reductivelabs.com/trac/puppet/wiki/FunctionReference
diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
index 34ab280fb..fe4e54992 100644
--- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
+++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
@@ -27,7 +27,7 @@
 
 # Jeff McCune <jeff.mccune@northstarlabs.net>
 # 2007-08-14
-# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+# See: http://docs.puppetlabs.com/guides/custom_functions.html
 
 module Puppet::Parser::Functions
   newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
diff --git a/ext/extlookup.rb b/ext/extlookup.rb
index b72fc1287..d87583ba7 100644
--- a/ext/extlookup.rb
+++ b/ext/extlookup.rb
@@ -74,7 +74,7 @@
 # need to edit a load of manifests to do simple things like adjust a desired version number.
 #
 # For more information on installing and writing your own custom functions see:
-#    http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+#    http://docs.puppetlabs.com/guides/custom_functions.html
 #
 # For further help contact Volcane on #puppet
 require 'csv'
diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb
index e234985ca..871215511 100644
--- a/ext/regexp_nodes/regexp_nodes.rb
+++ b/ext/regexp_nodes/regexp_nodes.rb
@@ -2,7 +2,7 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# http://reductivelabs.com/trac/puppet/wiki/ExternalNodes
+# http://docs.puppetlabs.com/guides/external_nodes.html
 #
 # = Usage
 # regexp_nodes.rb <host>
diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb
index 11d980fab..46e000383 100644
--- a/lib/puppet/parser/functions/inline_template.rb
+++ b/lib/puppet/parser/functions/inline_template.rb
@@ -1,6 +1,6 @@
 Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc =>
   "Evaluate a template string and return its value.  See `the templating docs
-  </trac/puppet/wiki/PuppetTemplating>`_ for more information.  Note that
+  <http://docs.puppetlabs.com/guides/templating.html>`_ for more information.  Note that
   if multiple template strings are specified, their output is all concatenated
   and returned as the output of the function.") do |vals|
     require 'erb'
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb
index 76fc466ac..965a2aa60 100644
--- a/lib/puppet/provider/nameservice/directoryservice.rb
+++ b/lib/puppet/provider/nameservice/directoryservice.rb
@@ -41,7 +41,7 @@ class DirectoryService < Puppet::Provider::NameService
 
   # JJM 2007-07-25: This map is used to map NameService attributes to their
   #     corresponding DirectoryService attribute names.
-  #     See: http://images.apple.com/server/docs/Open_Directory_v10.4.pdf
+  #     See: http://images.apple.com/server/docs.Open_Directory_v10.4.pdf
   # JJM: Note, this is de-coupled from the Puppet::Type, and must
   #     be actively maintained.  There may also be collisions with different
   #     types (Users, Groups, Mounts, Hosts, etc...)
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb
index 4506fbf9d..39e377d66 100644
--- a/lib/puppet/provider/package/pkgdmg.rb
+++ b/lib/puppet/provider/package/pkgdmg.rb
@@ -29,7 +29,7 @@ require 'puppet/provider/package'
 require 'facter/util/plist'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
-  desc "Package management based on Apple's Installer.app and DiskUtility.app.  This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages.  See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail."
+  desc "Package management based on Apple's Installer.app and DiskUtility.app.  This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages.  See `the wiki docs <http://projects.puppetlabs.com/projects/puppet/wiki/Package_Management_With_Dmg_Patterns>` for more detail."
 
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index a0f10633b..ef33a559b 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -95,7 +95,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
 
     ret += h(type.name.to_s + "_", 2)
 
-    ret += ".. _#{type.name}: #{"http://reductivelabs.com/trac/puppet/wiki/TypeReference##{type.name}"}\n\n"
+    ret += ".. _#{type.name}: #{"http://docs.puppetlabs.com/references/stable/type.html##{type.name}"}\n\n"
     ret += option("Default provider", default)
     ret += doctable(headers, table_data)
 
diff --git a/lib/puppet/util/command_line/filebucket b/lib/puppet/util/command_line/filebucket
index ba9d8cdd9..8302d7b12 100755
--- a/lib/puppet/util/command_line/filebucket
+++ b/lib/puppet/util/command_line/filebucket
@@ -53,7 +53,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
diff --git a/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet
index f65ef9007..7b6c0ae7f 100755
--- a/lib/puppet/util/command_line/puppet
+++ b/lib/puppet/util/command_line/puppet
@@ -22,7 +22,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd
index 3af2fdabf..571b15486 100755
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@ -69,7 +69,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet agent with
 # '--genconfig'.
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd
index c58612c0f..74efb3818 100755
--- a/lib/puppet/util/command_line/puppetmasterd
+++ b/lib/puppet/util/command_line/puppetmasterd
@@ -21,7 +21,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
diff --git a/lib/puppet/util/command_line/puppetqd b/lib/puppet/util/command_line/puppetqd
index 439db5cb0..48fc952bd 100755
--- a/lib/puppet/util/command_line/puppetqd
+++ b/lib/puppet/util/command_line/puppetqd
@@ -20,7 +20,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
diff --git a/lib/puppet/util/command_line/ralsh b/lib/puppet/util/command_line/ralsh
index b866eded6..68ad92d84 100755
--- a/lib/puppet/util/command_line/ralsh
+++ b/lib/puppet/util/command_line/ralsh
@@ -34,7 +34,7 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
+# http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index de2dee733..2cfc82cea 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -64,7 +64,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index 02176ce81..d34711bb2 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -30,7 +30,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index c2d5cb530..a913531a0 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -66,7 +66,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as
 an argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetd with
 \(aq\-\-genconfig\(aq.
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index 5bfea2ef2..680e5059d 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -29,7 +29,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetmasterdd
 with \(aq\-\-genconfig\(aq.
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index bf08f2bb2..2da8b985d 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -24,7 +24,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as
 an argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetd with
 \(aq\-\-genconfig\(aq.
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index 98892e0c9..8380b883a 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -42,7 +42,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs/puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.