summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-26 22:36:51 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-26 22:36:51 +0000
commitaf4f7d7bebfc3b6346c86e90b99f37c98d6bca73 (patch)
treea9d70312640c9a85a0c77b330f76ced4b5192b9c /lib
parent37acfb9bc8675f33aef159f298e35e3e43998c4f (diff)
downloadpuppet-af4f7d7bebfc3b6346c86e90b99f37c98d6bca73.tar.gz
puppet-af4f7d7bebfc3b6346c86e90b99f37c98d6bca73.tar.xz
puppet-af4f7d7bebfc3b6346c86e90b99f37c98d6bca73.zip
Fixing documentation references to refer to the wiki
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2098 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions.rb2
-rw-r--r--lib/puppet/reports/tagmail.rb3
-rwxr-xr-xlib/puppet/type/pfile/content.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 1174d7dad..9fbec43df 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -189,7 +189,7 @@ module Functions
end
newfunction(:template, :type => :rvalue, :doc => "Evaluate a template and
- return its value. See [the templating docs](../advanced/templating.html)
+ return its value. See [the templating docs](/trac/puppet/wiki/PuppetTemplating)
for more information. Note that if multiple templates are specified, their
output is all concatenated and returned as the output of the function.") do |vals|
require 'erb'
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 6c1dca675..a7b3ffd3b 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -17,7 +17,8 @@ require 'net/smtp'
Puppet::Server::Report.newreport(:tagmail) do
desc "This report sends specific log messages to specific email addresses
based on the tags in the log messages. See the
- [tag documentation](../advanced/tags.html) for more information on tags.
+ [tag documentation](/trac/puppet/wiki/UsingTags) for more information
+ on tags.
To use this report, you must create a ``tagmail.conf`` (in the location
specified by ``tagmap``). This is a simple file that maps tags to
diff --git a/lib/puppet/type/pfile/content.rb b/lib/puppet/type/pfile/content.rb
index a8422431f..e05e639c1 100755
--- a/lib/puppet/type/pfile/content.rb
+++ b/lib/puppet/type/pfile/content.rb
@@ -18,7 +18,7 @@ module Puppet
}
This attribute is especially useful when used with
- [templating](templating.html)."
+ [templating](/trac/puppet/wiki/PuppetTemplating)."
def change_to_s
"synced"