Skip to content

Commit

Permalink
updating install links in versions of puppet docs <3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
jtappa committed Nov 25, 2015
1 parent ae749c1 commit 5ec900c
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 32 deletions.
2 changes: 1 addition & 1 deletion source/puppet/3.5/reference/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Welcome to the Puppet 3.5 Reference Manual! Use the navigation to the left to ge
- [Documentation for Puppet 3.0 through 3.4 can be found here.](/puppet/3/reference)
- [Documentation for Puppet 2.7 can be found here.](/puppet/2.7/reference)

To install Puppet 3.5, see [the Puppet installation guide](/guides/install_puppet/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/guides/install_puppet/upgrading.html).
To install Puppet 3.5, see [the Puppet installation guide](/puppet/3.8/reference/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/puppet/3.8/reference/upgrading.html).

This manual is split into several sections:

Expand Down
2 changes: 1 addition & 1 deletion source/puppet/3.5/reference/release_notes.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ canonical: "/puppet/latest/reference/release_notes.html"

[environments_simple]: ./environments.html
[dirs_modulepath_simple_envs]: ./dirs_modulepath.html
[upgrade]: /guides/install_puppet/upgrading.html
[upgrade]: /puppet/3.8/reference/upgrading.html
[vars_trusted_hash]: ./lang_facts_and_builtin_vars.html#trusted-facts
[v2_api_yard]: /references/3.5.latest/developer/file.http_api_index.html
[puppet_3]: /puppet/3/reference/release_notes.html
Expand Down
8 changes: 4 additions & 4 deletions source/puppet/3.5/reference/system_requirements.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Puppet 3.5 System Requirements"
canonical: "/puppet/latest/reference/system_requirements.html"
---

> To install Puppet 3.5, see [the Puppet installation guide](/guides/install_puppet/pre_install.html).
> To install Puppet 3.5, see [the Puppet installation guide](/puppet/3.8/reference/pre_install.html).
Platforms With Packages
-----
Expand Down Expand Up @@ -42,15 +42,15 @@ Puppet and its prerequisites are known to run on the following platforms, but we

- SUSE Linux Enterprise Server, version 11 and higher
- Gentoo Linux
- Mandriva Corporate Server 4
- Mandriva Corporate Server 4
- ArchLinux

### Other Unix

- Oracle Solaris, version 10 and higher (Puppet Labs performs limited automated testing on Solaris 11.)
- AIX, version 5.3 and higher
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- HP-UX

Basic Requirements
Expand Down
2 changes: 1 addition & 1 deletion source/puppet/3.6/reference/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ For an introduction to how Puppet manages systems, see the [Overview of Puppet's

## Getting Started

To install Puppet 3.6, see [the Puppet installation guide](/guides/install_puppet/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/guides/install_puppet/upgrading.html).
To install Puppet 3.6, see [the Puppet installation guide](/puppet/3.8/reference/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/puppet/3.8/reference/upgrading.html).

## Getting Around

Expand Down
2 changes: 1 addition & 1 deletion source/puppet/3.6/reference/release_notes.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: "Puppet release notes for version 3.6"
canonical: "/puppet/latest/reference/release_notes.html"
---

[upgrade]: /guides/install_puppet/upgrading.html
[upgrade]: /puppet/3.8/reference/upgrading.html
[puppet_3]: /puppet/3/reference/release_notes.html
[puppet_35]: /puppet/3.5/reference/release_notes.html
[directory environments]: ./environments.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ canonical: "/puppet/latest/reference/services_master_windows.html"
[runinterval]: /references/3.6.latest/configuration.html#runinterval
[short_settings]: ./config_important_settings.html#settings-for-agents-all-nodes
[page on triggering puppet runs]: /pe/latest/orchestration_puppet.html
[msiproperties]: /guides/install_puppet/install_windows.html#automated-installation
[msiproperties]: /puppet/3.8/reference/install_windows.html#automated-installation
[uac]: ./images/uac.png
[rightclick]: ./images/run_as_admin.png
[report]: /guides/reporting.html
Expand Down
8 changes: 4 additions & 4 deletions source/puppet/3.6/reference/system_requirements.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Puppet 3.6 System Requirements"
canonical: "/puppet/latest/reference/system_requirements.html"
---

> To install Puppet 3.6, see [the Puppet installation guide](/guides/install_puppet/pre_install.html).
> To install Puppet 3.6, see [the Puppet installation guide](/puppet/3.8/reference/pre_install.html).
Hardware
-----
Expand Down Expand Up @@ -54,15 +54,15 @@ Puppet and its prerequisites are known to run on the following platforms, but we

- SUSE Linux Enterprise Server, version 11 and higher
- Gentoo Linux
- Mandriva Corporate Server 4
- Mandriva Corporate Server 4
- ArchLinux

### Other Unix

- Oracle Solaris, version 10 and higher (Puppet Labs performs limited automated testing on Solaris 11.)
- AIX, version 5.3 and higher
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- HP-UX

Basic Requirements
Expand Down
2 changes: 1 addition & 1 deletion source/puppet/3.7/reference/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For an introduction to how Puppet manages systems, see the [Overview of Puppet's

## Getting Started

To install Puppet 3.7, see [the Puppet installation guide](/guides/install_puppet/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/guides/install_puppet/upgrading.html).
To install Puppet 3.7, see [the Puppet installation guide](puppet/3.8/reference/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/puppet/3.8/reference/upgrading.html).

## Getting Around

Expand Down
4 changes: 2 additions & 2 deletions source/puppet/3.7/reference/release_notes.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: "Puppet release notes for version 3.7"
canonical: "/puppet/latest/reference/release_notes.html"
---

[upgrade]: /guides/install_puppet/upgrading.html
[upgrade]: /puppet/3.8/reference/upgrading.html
[puppet_3]: /puppet/3/reference/release_notes.html
[puppet_35]: /puppet/3.5/reference/release_notes.html
[puppet_36]: /puppet/3.6/reference/release_notes.html
Expand Down Expand Up @@ -543,7 +543,7 @@ Since Puppet 3.7 includes the Puppet 4 version of the language, getting ready to

[inpage_win64]: #feature-64-bit-support-ruby-20-and-ffi-on-windows

We now ship both 32- and 64-bit Puppet installers for Windows! When installing Puppet, you should download the package that matches your systems' version of Windows. If you installed Puppet into a custom directory, or if you need to downgrade, be sure to see the new notes in [the Windows installation page.](/guides/install_puppet/install_windows.html)
We now ship both 32- and 64-bit Puppet installers for Windows! When installing Puppet, you should download the package that matches your systems' version of Windows. If you installed Puppet into a custom directory, or if you need to downgrade, be sure to see the new notes in [the Windows installation page.](/puppet/3.8/reference/install_windows.html)

> **Note:** Windows Server 2003 can't use our 64-bit installer, and must continue to use the 32-bit installer for all architectures. This is because 64-bit Ruby relies on OS features that weren't added until after Windows 2003.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ canonical: "/puppet/latest/reference/services_master_windows.html"
[runinterval]: /references/3.7.latest/configuration.html#runinterval
[short_settings]: ./config_important_settings.html#settings-for-agents-all-nodes
[page on triggering puppet runs]: /pe/latest/orchestration_puppet.html
[msiproperties]: /guides/install_puppet/install_windows.html#automated-installation
[msiproperties]: /puppet/3.8/reference/install_windows.html#automated-installation
[uac]: ./images/uac.png
[rightclick]: ./images/run_as_admin.png
[report]: /guides/reporting.html
Expand Down
8 changes: 4 additions & 4 deletions source/puppet/3.7/reference/system_requirements.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Puppet 3.7 System Requirements"
canonical: "/puppet/latest/reference/system_requirements.html"
---

> To install Puppet 3.7, see [the Puppet installation guide](/guides/install_puppet/pre_install.html).
> This is an old version of Puppet. If you'd like to install Puppet 3.7, see [the Puppet 3.8 installation guide](/puppet/3.8/reference/pre_install.html), as the processes are the same.
Hardware
-----
Expand Down Expand Up @@ -54,15 +54,15 @@ Puppet and its prerequisites are known to run on the following platforms, but we

- SUSE Linux Enterprise Server, version 11 and higher
- Gentoo Linux
- Mandriva Corporate Server 4
- Mandriva Corporate Server 4
- ArchLinux

### Other Unix

- Oracle Solaris, version 10 and higher (Puppet Labs performs limited automated testing on Solaris 11.)
- AIX, version 5.3 and higher
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- HP-UX

Basic Requirements
Expand Down
2 changes: 0 additions & 2 deletions source/puppet/3/reference/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Welcome to the Puppet 3 Reference Manual! Use the navigation to the left to get

This manual covers Puppet versions 3.0 through 3.4. For Puppet 3.5 and above, use [the Puppet 3.5 Reference Manual](/puppet/3.5/reference). [Documentation for Puppet 2.7 can be found here.](/puppet/2.7/reference)

To install Puppet 3, see [the Puppet installation guide](/guides/install_puppet/pre_install.html). For general advice on upgrading between major versions, see [Upgrading Puppet](/guides/install_puppet/upgrading.html).

This manual is split into several sections:

* ["Puppet 3.x Release Notes"](./release_notes.html) contains information about Puppet 3's new features, and tracks changes introduced in minor and patch releases in the Puppet 3 series.
Expand Down
9 changes: 4 additions & 5 deletions source/puppet/3/reference/release_notes.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ canonical: "/puppet/latest/reference/release_notes.html"
[lang_scope]: ./lang_scope.html
[qualified_vars]: ./lang_variables.html#accessing-out-of-scope-variables
[auth_conf]: /guides/rest_auth_conf.html
[upgrade]: /guides/install_puppet/upgrading.html
[upgrade_issues]: http://projects.puppetlabs.com/projects/puppet/wiki/Telly_Upgrade_Issues
[target_300]: http://projects.puppetlabs.com/projects/puppet/issues?set_filter=1&f[]=fixed_version_id&op[fixed_version_id]=%3D&v[fixed_version_id][]=271&f[]=&c[]=project&c[]=tracker&c[]=status&c[]=priority&c[]=subject&c[]=assigned_to&c[]=fixed_version&group_by=
[unless]: ./lang_conditional.html#unless-statements
Expand Down Expand Up @@ -69,7 +68,7 @@ Starting from version 3.0.0, Puppet is semantically versioned with a three-part
* Y may increase for backwards-compatible new functionality.
* Z may increase for bug fixes.

> **Note:** When preparing to upgrade, please read our [general recommendations for upgrading between two major versions of Puppet][upgrade], which include suggested roll-out plans and package management practices. In general, upgrade the puppet master servers before upgrading the agents they support.
> **Note:** In general, you should upgrade the puppet master servers before upgrading the agents they support.
>
> Also, before upgrading, look above at the _table of contents_ for this page. Identify the version you're upgrading TO and any versions you're upgrading THROUGH, and check them for a subheader labeled "Upgrade Warning," which will always be at the top of that version's notes. If there's anything special you need to know before upgrading, we will put it here.
Expand Down Expand Up @@ -289,7 +288,7 @@ Puppet's Windows support continues to get better, with improvements to resource

#### Packaging and Installer Improvements

- The Windows Puppet installer has several new MSI properties for automated installation, which can set the service user and startup mode. See [the docs on automated installation on Windows](/guides/install_puppet/install_windows.html#automated-installation) for details. ([Issue 21243](http://projects.puppetlabs.com/issues/21243), [Issue 18268](http://projects.puppetlabs.com/issues/18268), [PUP-386](https://tickets.puppetlabs.com/browse/PUP-386), [PUP-387](https://tickets.puppetlabs.com/browse/PUP-387))
- The Windows Puppet installer has several new MSI properties for automated installation, which can set the service user and startup mode. ([Issue 21243](http://projects.puppetlabs.com/issues/21243), [Issue 18268](http://projects.puppetlabs.com/issues/18268), [PUP-386](https://tickets.puppetlabs.com/browse/PUP-386), [PUP-387](https://tickets.puppetlabs.com/browse/PUP-387))
- The Windows installer now puts Puppet on the PATH, so a special command prompt is no longer necessary. ([Issue 22700](http://projects.puppetlabs.com/issues/22700), [PUP-415](https://tickets.puppetlabs.com/browse/PUP-415))
- Windows installer options can now override existing settings. ([Issue 20281](https://projects.puppetlabs.com/issues/20281), [PUP-388](https://tickets.puppetlabs.com/browse/PUP-388))

Expand Down Expand Up @@ -539,7 +538,7 @@ Released September 12, 2013.
Although 3.3.0 is backward-compatible, its default configuration will cause reporting failures when ≥ 3.3.0 agent nodes connect to a sub-3.3.0 master.

* This only affects newer agents + older masters; it is not a problem if you [upgrade the puppet master first.](/guides/install_puppet/upgrading.html#always-upgrade-the-puppet-master-first)
* This only affects newer agents + older masters; it is not a problem if you upgrade the puppet master first.
* To use ≥ 3.3.0 agents with an older puppet master, set `report_serialization_format` to `yaml` in their puppet.conf files; this restores full compatibility.

[See the note below on yaml deprecation for details.][yaml_deprecation]
Expand Down Expand Up @@ -597,7 +596,7 @@ As of this release:
Puppet 3.3 agents now default to sending reports as JSON, and masters running Puppet 3.2.4 and earlier cannot understand JSON reports. Using an out of the box 3.3 agent with a 3.2 puppet master will therefore fail.

* To avoid errors, [upgrade the puppet master first](/guides/install_puppet/upgrading.html#always-upgrade-the-puppet-master-first).
* To avoid errors, upgrade the puppet master first.
* If you must use ≥ 3.3.0 agents with older puppet masters, set the new `report_serialization_format` to `yaml` in the agents' puppet.conf; this restores full compatibility.

### Regex Capture Variables from Node Definitions ($1, etc.)
Expand Down
8 changes: 4 additions & 4 deletions source/puppet/3/reference/system_requirements.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Puppet 3 System Requirements"
canonical: "/puppet/latest/reference/system_requirements.html"
---

> To install Puppet 3, see [the Puppet installation guide](/guides/install_puppet/pre_install.html).
> To install Puppet 3, see [the Puppet installation guide](http://docs.puppet.com/puppet/3.8/reference/pre_install.html).
Basic Requirements
-----
Expand Down Expand Up @@ -60,16 +60,16 @@ On these platforms, Puppet Labs does not build official packages.

- SUSE Linux Enterprise Server, version 11 and higher
- Gentoo Linux
- Mandriva Corporate Server 4
- Mandriva Corporate Server 4
- ArchLinux

### Other Unix

- Mac OS X, version 10.5 (Leopard) and higher
- Oracle Solaris, version 10 and higher
- AIX, version 5.3 and higher
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- FreeBSD 4.7 and later
- OpenBSD 4.1 and later
- HP-UX

### Windows
Expand Down

0 comments on commit 5ec900c

Please sign in to comment.