[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 67bf142f6227db8f675726a104766b72c1e90141
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Apr 22 18:03:36 2010 +1000

    Fixed README contents to reflect Puppet Labs and docs and wiki changes

diff --git a/README b/README
index 7b6a3af..d6b7d66 100644
--- a/README
+++ b/README
@@ -1,5 +1,9 @@
 Documentation (and detailed install instructions) can be found
-online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .
+online at http://docs.puppetlabs.com/.
+
+Additional documentation can also be found at the Puppet Wiki:
+
+http://projects.puppetlabs.com/projects/puppet/wiki/
 
 Generally, you need the following things installed:
 
@@ -22,6 +26,6 @@ Generally, you need the following things installed:
   the library.
 
 * Facter => 1.5.1
-  You can get this from < http://reductivelabs.com/projects/facter >
+  You can get this from < http://puppetlabs.com/projects/facter >
 
 $Id$
diff --git a/README.rst b/README.rst
index 7e34d0d..63452ef 100644
--- a/README.rst
+++ b/README.rst
@@ -5,8 +5,10 @@ Puppet, an automated administrative engine for your Linux and Unix systems, perf
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
 
-Documentation (and detailed install instructions) can be found
-online at the `Puppet Wiki`_.
+Documentation (and detailed install instructions) can be found online at the 
+`Puppet Documentation`_ site.
+
+Additional documentation can also be found at the `Puppet Wiki`_.
 
 Installation
 ------------
@@ -31,8 +33,9 @@ Generally, you need the following things installed:
   running 'ruby -rxmlrpc/client -e "puts :yep"'.  If that errors out, you're missing
   the library.
 
-* Facter => 1.1.1
+* Facter => 1.5.1
   You can get this from your package management system or the `Facter site`_
 
-.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart
-.. _Facter site: http://reductivelabs.com/projects/facter
+.. _Puppet Documentation: http://docs.puppetlabs.com
+.. _Puppet Wiki: http://projects.puppetlabs.com/projects/puppet/wiki/
+.. _Facter site: http://puppetlabs.com/projects/facter

-- 
Puppet packaging for Debian