Updating docs with correct links for the doc restructuring, as mentioned in #322.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1850 980ebf18-57e1-0310-9a29-db15c13687c0

9 files changed, 21 insertions, 30 deletions

diff --git a/documentation/documentation/about/glossary.page b/documentation/documentation/about/glossary.page
index cc3ef2fe0..79f3f9e4e 100644
--- a/documentation/documentation/about/glossary.page
+++ b/documentation/documentation/about/glossary.page
@@ -44,12 +44,4 @@ certain terms found to be useful in working with Puppet:
   manage -- e.g., what attributes are valid, and what the valid values are for
   those attributes.
 
-Here is a simple glossary of term
-
-About Puppet
-=====================
-* [Introduction](introduction.html)
-* [Puppet vs. Cfengine](notcfengine.html)
-
-
 *$Id$*
diff --git a/documentation/documentation/about/introduction.page b/documentation/documentation/about/introduction.page
index 6eb0babb8..9f26456e5 100644
--- a/documentation/documentation/about/introduction.page
+++ b/documentation/documentation/about/introduction.page
@@ -372,7 +372,7 @@ considered the name:
         isnamevar
     end
 
-See [Creating a Puppet Type](creating-a-puppet-type.html) for more
+See [Creating a Puppet Type](../programmers/creating-a-puppet-type.html) for more
 information.
 
 *$Id$*
diff --git a/documentation/documentation/about/notcfengine.page b/documentation/documentation/about/notcfengine.page
index af482f35d..5300673a0 100644
--- a/documentation/documentation/about/notcfengine.page
+++ b/documentation/documentation/about/notcfengine.page
@@ -192,7 +192,7 @@ or anything else in the stack.  In contract, new types in cfengine require
 modifications all the way through the stack, including the lexer.  Puppet will
 even automatically load any new types you create -- just drop them into your
 search path and you can start using them (or, even better, drop them into the
-[plugins directory](configref.html) and the client will automatically
+[plugins directory](../reference/configref.html) and the client will automatically
 retrieve and load them).
 
 Puppet also uses the industry-standard XMLRPC protocol for communication
diff --git a/documentation/documentation/advanced/cfengine_module.page b/documentation/documentation/advanced/cfengine_module.page
index b809323a8..e8ef81777 100644
--- a/documentation/documentation/advanced/cfengine_module.page
+++ b/documentation/documentation/advanced/cfengine_module.page
@@ -34,7 +34,7 @@ directory at once:
 
 ## Setting Up Cfengine
 
-Currently, the module must be retrieved [from subversion](fromsvn.html) or
+Currently, the module must be retrieved [from subversion](../installing/fromsvn.html) or
 from the online
 [source browser](https://reductivelabs.com/cgi-bin/puppet.cgi/browser/trunk/ext/module_puppet).
 
@@ -107,9 +107,9 @@ Puppet was largely developed as a successor to Cfengine, based on years of
 Cfengine consulting and development; as a result, it overcomes some
 significant shortcomings in Cfengine, and it makes the most sense to use
 Puppet in those places where Cfengine is weakest.  Specifically, Puppet
-provides [higher-level types](typedocs.html#user) than Cfengine, supports
+provides [higher-level types](../reference/typedocs.html#user) than Cfengine, supports
 high-level abstractions akin to functions, and makes it easy to define your
-own [custom types](creating-a-puppet-type.html).
+own [custom types](../programmers/creating-a-puppet-type.html).
 
 Generally, it's probably best to start out using Puppet to manage elements
 that Cfengine cannot manage or is not good at managing, such as users,
@@ -126,7 +126,7 @@ being restricted to use Cfengine's shell-script module interface.
 If you are using a templating system with Cfengine or are generating your
 Cfengine configurations somehow, you might be especially happy with this
 Puppet module, since you can create reusable types with external templates.
-For an example, see the [Puppet vs. Cfengine comparison](notcfengine.html).
+For an example, see the [Puppet vs. Cfengine comparison](../about/notcfengine.html).
 
 ## Transitioning
 
diff --git a/documentation/documentation/advanced/reports.page b/documentation/documentation/advanced/reports.page
index c9fe470a7..bd1eb7901 100644
--- a/documentation/documentation/advanced/reports.page
+++ b/documentation/documentation/advanced/reports.page
@@ -52,11 +52,11 @@ or we can include these configuration parameters in the configuration file, typi
     
 Note that in the configuration file, the list of reports should be comma-separated without spaces and not enclosed in quotes (which is otherwise acceptable for a command-line invocation).
 
-You may also wish to specify the directory where reports will be stored with the  [reportdirectory](configref.html#reportdirectory) parameter.  Furthermore, transaction 
+You may also wish to specify the directory where reports will be stored with the  [reportdirectory](../reference/configref.html#reportdirectory) parameter.  Furthermore, transaction 
 reports can optionally be sent to a special report server (not necessarily the server or 
-client).  This server can be specified with the [reportserver](configref.html#reportserver).
+client).  This server can be specified with the [reportserver](../reference/configref.html#reportserver).
 
-For more about configuring your server, take a look at the section on [Configuration Reference](configref.html).
+For more about configuring your server, take a look at the section on [Configuration Reference](../reference/configref.html).
 
 ## Available reports:
 
diff --git a/documentation/documentation/advanced/tags.page b/documentation/documentation/advanced/tags.page
index fdebf3d9b..46960f00d 100644
--- a/documentation/documentation/advanced/tags.page
+++ b/documentation/documentation/advanced/tags.page
@@ -9,7 +9,7 @@ Puppet allows for arbitrary tags to be applied to any or all objects in its conf
 
 ## Invoking `puppet` in a Tag-Restricted Context
 
-One way to make use of tagging in `puppet` is to use tags at invocation-time to restrict which objects will be taken into consideration at run-time.  In addition to the section below, you might want to glance at the [tags](configref.html#tags) section of the [Configuration Reference](configref.html).
+One way to make use of tagging in `puppet` is to use tags at invocation-time to restrict which objects will be taken into consideration at run-time.  In addition to the section below, you might want to glance at the [tags](../reference/configref.html#tags) section of the [Configuration Reference](../reference/configref.html).
 
 ### Testing Configurations with Tags
 
@@ -43,7 +43,7 @@ tags in your object definitions.
 
 ### Specifying Tags Explicitly in Object Definitions
 
-The easiest way to mark an object with a tag is to do it explicitly with the "tag" [metaparameter](typedocs.html#metaparameters).  Since it is a metaparameter, it can be set on
+The easiest way to mark an object with a tag is to do it explicitly with the "tag" [metaparameter](../reference/typedocs.html#metaparameters).  Since it is a metaparameter, it can be set on
 any object.  In the example below, we're tagging this file object, "/etc/httpd", with the tag
 "apache", since it is part of the Apache webserver configuration.
 
@@ -59,7 +59,7 @@ any object.  In the example below, we're tagging this file object, "/etc/httpd",
 
 ### Automatic Tagging
 
-All language statements enclosed in a `node`, `define` or `class` structure (read more about puppet control structures [here](structures.html)) will automatically be tagged with the name of that statement.  These automatically-applied tags will be inherited by any object enclosed in that class, regardless of the depth of enclosure.
+All language statements enclosed in a `node`, `define` or `class` structure (read more about puppet control structures [here](../language/structures.html)) will automatically be tagged with the name of that statement.  These automatically-applied tags will be inherited by any object enclosed in that class, regardless of the depth of enclosure.
 
 Let's take a look at the configuration we looked at above, with a slight change:
 
@@ -78,4 +78,4 @@ Let's take a look at the configuration we looked at above, with a slight change:
 Now, since the file object `"/etc/httpd"` is automatically tagged with "apache" because it is contained in the class named "apache", it is no longer necessary to explicitly tag it with the
 "tag" metaparam.
 
-* $Id$
\ No newline at end of file
+* $Id$
diff --git a/documentation/documentation/installing/installation.page b/documentation/documentation/installing/installation.page
index 97908703c..0cd56a481 100644
--- a/documentation/documentation/installing/installation.page
+++ b/documentation/documentation/installing/installation.page
@@ -54,10 +54,9 @@ feel the particular need to build it manually, you can get the source from
 Puppet and Facter are now available in Fedora Extras, thanks to David
 Lutterkort at Red Hat.  Fedora users should be able to retrieve them via
 yum from the Fedora Extras repository. Users of RHEL4 can get the package
-from David's [yum
-repository](http://people.redhat.com/dlutter/yum/rhel4). Please let the
-puppet-users mailing list know if you have built RPM's for RHEL2.1 or RHEL3
-(or the equivalent CentOS builds)
+from David's [yum repository](http://people.redhat.com/dlutter/yum/rhel4).
+Please let the puppet-users mailing list know if you have built RPM's for
+RHEL2.1 or RHEL3 (or the equivalent CentOS builds)
 
 If you are building ruby on Red Hat (at least on version 3), you
 apparently must build it with ``CPPFLAGS=-I/usr/kerberos/include/``, else you
@@ -67,7 +66,7 @@ tracking that one down).
 #### Solaris
 
 There are Solaris packages for Puppet and Facter in the
-[downloads](http://reductivelabs.com/downloads/packages/SunOS.  These packages
+[downloads](http://reductivelabs.com/downloads/packages/SunOS).  These packages
 suffice for both sparc and x86 (even though they're marked x86), but they
 don't specify dependencies.  They're automatically built during new releases,
 so they should always be the latest.
@@ -302,7 +301,7 @@ Otherwise, you will need to define each of your nodes in your site manifest:
     }
 
 Alternatively, you can tell ``puppetmasterd`` to use
-[LDAP for node storage](ldapnodes.html).
+[LDAP for node storage](../advanced/ldapnodes.html).
 
 # Verifying Installation
 
diff --git a/documentation/documentation/internals/big-picture.page b/documentation/documentation/internals/big-picture.page
index 31aaa0e74..9372f48ec 100644
--- a/documentation/documentation/internals/big-picture.page
+++ b/documentation/documentation/internals/big-picture.page
@@ -19,7 +19,7 @@ used to handling, like ``service`` and ``node``, and Puppet is responsible for
 either achieving the configuration or providing the user enough information to
 fix any encountered problems.
 
-This document is a supplement to the [Introduction](introduction.html) and it is assumed that
+This document is a supplement to the [Introduction](../about/introduction.html) and it is assumed that
 readers are familiar with the contents of that document.
 
 # Less Detail, More Information
diff --git a/documentation/documentation/programmers/creating-a-puppet-type.page b/documentation/documentation/programmers/creating-a-puppet-type.page
index 9ee6ae99f..fcf2ea011 100644
--- a/documentation/documentation/programmers/creating-a-puppet-type.page
+++ b/documentation/documentation/programmers/creating-a-puppet-type.page
@@ -47,7 +47,7 @@ block passed to ``newtype``, using the ``newparam`` method:
 
 The ``desc`` method provides documentation for your parameter.  This
 documentation is used by ``puppetdoc`` to create the
-[Type Reference](typedocs.html).
+[Type Reference](../reference/typedocs.html).
 
 The ``newvalues`` method is optional; if you use it, then only those values
 (in string or symbol form) will be considered valid values, and they will
@@ -308,7 +308,7 @@ process of applying one or more type instances.
 ## Dependency Sorting
 
 I'll ignore the process of turning Puppet manifests into types; that's handled
-in the [How It Works](howitworks.html) document.  The collection of objects
+in the [How It Works](../internals/howitworks.html) document.  The collection of objects
 are always contained in a top-level instance of the ``component`` type (this
 is an unfortunate hold-over from some flawed design ideas in the early
 development of Puppet -- expect it to change internally at some point).