Skip to content

Commit d26c34e

Browse files
MFredetteAndrew Roetker
authored and
Andrew Roetker
committed
(PDB-2592) Rebrand in doc mentions of Puppet Labs to Puppet.
1 parent 465f6bb commit d26c34e

10 files changed

+23
-20
lines changed

NOTICE.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
PuppetDB - Centralized Puppet Storage
2-
Copyright 2011-2013 Puppet Labs Inc
2+
Copyright 2011-2016 Puppet Inc
33

4-
This product includes software developed at
5-
Puppet Labs Inc (http://puppetlabs.com/).
4+
This product includes software developed at Puppet Inc (http://puppet.com/).
65

76
Licensed under the Apache License, Version 2.0 (the "License");
87
you may not use this software except in compliance with the License.

acceptance/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ EC2 build with packages on Debian 6:
3737
PUPPETDB_EXPECTED_DEB_VERSION="1.3.3.73-1puppetlabs1" \
3838
rake beaker:acceptance
3939

40-
Note that the tests currently depend on the Puppet Labs internal
40+
Note that the tests currently depend on the Puppet internal
4141
lein-ezbake project, so running them requires either access to the
42-
Puppet Labs VPN during the test run, or a local copy of lein-ezbake.
42+
Puppet VPN during the test run, or a local copy of lein-ezbake.
4343
For the latter, run these commands once, while connected to the VPN:
4444

4545
repo='http://nexus.delivery.puppetlabs.net/content/repositories/releases/'

documentation/acceptance_tests.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ EC2 setup
2020
:aws_secret_access_key: <your AWS secret key>
2121

2222
* The included configuration files in `acceptance/config` refer to resources
23-
(security groups, VPCs, etc) that exist in the Puppet Labs AWS account. If
23+
(security groups, VPCs, etc) that exist in the Puppet AWS account. If
2424
you're using your own AWS account, you'll have to create the appropriate
2525
resources and modify the appropriate configuration file to refer to them.
2626

documentation/connect_puppet_apply.markdown

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ You will have to sign a certificate for every new node you add to your site.
5151

5252
Currently, Puppet needs extra Ruby plugins in order to use PuppetDB. Unlike custom facts or functions, these cannot be loaded from a module and must be installed in Puppet's main source directory.
5353

54-
* First, ensure that the appropriate [Puppet Labs package repository][package_repos] is enabled. You can use a [package][] resource to do this or use the `apt::source` (from the [puppetlabs-apt][apt] module) and [`yumrepo`][] types.
54+
* First, ensure that the appropriate [Puppet package repository][package_repos]
55+
is enabled. You can use a [package][] resource to do this or use the
56+
`apt::source` (from the [puppetlabs-apt][apt] module) and [`yumrepo`][] types.
5557
* Next, use Puppet to ensure that the `puppetdb-termini` package is installed:
5658

5759
~~~ ruby

documentation/connect_puppet_master.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Currently, Puppet masters need additional Ruby plug-ins in order to use PuppetDB
3333

3434
### On platforms with packages
3535

36-
[Enable the Puppet Labs repo](/guides/puppetlabs_package_repositories.html#open-source-repositories) and then install the `puppetdb-termini` package:
36+
[Enable the Puppet repo](/guides/puppetlabs_package_repositories.html#open-source-repositories) and then install the `puppetdb-termini` package:
3737

3838
$ sudo puppet resource package puppetdb-termini ensure=latest
3939

documentation/index.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ System requirements
7070

7171
#### Standard install: RHEL, CentOS, Debian, and Ubuntu
7272

73-
Puppet Labs provides packages and a Puppet module for PuppetDB which simplify
74-
setup of its SSL certificates and init scripts. These packages are available for
75-
the following operating systems:
73+
Puppet provides packages and a Puppet module for PuppetDB which simplify setup
74+
of its SSL certificates and init scripts. These packages are available for the
75+
following operating systems:
7676

7777
* Red Hat Enterprise Linux 6.6+ and 7 (and any derived distro that includes Java
7878
1.8)

documentation/install_from_packages.markdown

+2-3
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ seconds`.
6464
> [manually configure PuppetDB's SSL credentials][keystore_instructions] before
6565
> the Puppet master will be able to connect to PuppetDB.
6666
67-
Step 2: Enable the Puppet Labs package repository
67+
Step 2: Enable the Puppet package repository
6868
-----
6969

7070
If you didn't already use it to install Puppet, you will need to
71-
[enable the Puppet Labs package repository](/guides/puppetlabs_package_repositories.html)
72-
for your system.
71+
[enable the Puppet package repository](/guides/puppetlabs_package_repositories.html)
7372

7473
Step 3: Install PuppetDB
7574
-----

documentation/install_via_module.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ and the PuppetDB-termini for your Puppet master) using
2121
follow our guide to
2222
[installing PuppetDB from packages](./install_from_packages.html).
2323

24-
Step 1: Enable the Puppet Labs package repository
24+
Step 1: Enable the Puppet package repository
2525
-----
2626

2727
If you haven't done so already, you will need to do **one** of the following:
2828

29-
* [Enable the Puppet Labs package repository](/guides/puppetlabs_package_repositories.html)
29+
* [Enable the Puppet package repository](/guides/puppetlabs_package_repositories.html)
3030
on your PuppetDB server and Puppet master server.
3131
* Grab the PuppetDB and PuppetDB-termini packages, and import them into your
3232
site's local package repos.

documentation/maintain_and_tune.markdown

+4-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,7 @@ If you are saturating your CPU, we recommend [lowering the number of threads][th
8282

8383
If you've recently changed the certificates in use by the PuppetDB server, you'll also need to update the SSL configuration for PuppetDB itself.
8484

85-
If you've installed PuppetDB from Puppet Labs packages, you can simply re-run the `puppetdb ssl-setup` command. Otherwise, you'll need to again perform the SSL configuration steps outlined in [the installation instructions](./install_from_source.html).
85+
If you've installed PuppetDB from Puppet packages, you can simply re-run the
86+
`puppetdb ssl-setup` command. Otherwise, you'll need to again perform the SSL
87+
configuration steps outlined in
88+
[the installation instructions](./install_from_source.html).

documentation/release_notes.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ performance.
581581
* Upgrade to clojure.java.jdbc 0.3.7.
582582
([PDB-1739](https://tickets.puppetlabs.com/browse/PDB-1739))
583583

584-
* Switched to the Puppet Labs version-checking library.
584+
* Switched to the Puppet version-checking library.
585585
([PDB-1823](https://tickets.puppetlabs.com/browse/PDB-1823))
586586

587587
* Cache database metadata on startup. Previously, code involving query
@@ -643,7 +643,7 @@ for RPM-based systems.
643643
### Bug fixes and maintenance
644644

645645
* As part of the PuppetDB 3.0.0 release, the puppetdb-terminus package was
646-
renamed puppetdb-termini for consistency with other Puppet Labs products. A
646+
renamed puppetdb-termini for consistency with other Puppet products. A
647647
flawed dependency in the puppetdb-termini package prevented installation of
648648
the older 2.3.x puppetdb-terminus package on RPM-based platforms. This release
649649
fixes that dependency, allowing the older version to be installed.
@@ -675,7 +675,7 @@ Wayne Warren, and Wyatt Alt.
675675
### Upgrading
676676

677677
* This version of PuppetDB adopts the AIO layout to be consistent with
678-
other Puppet Labs layouts, such as Puppet Server. We recommend the
678+
other Puppet layouts, such as Puppet Server. We recommend the
679679
using the [PuppetDB module][puppetdb-module] version 5, as
680680
it will automate much of this kind of management and has been
681681
modified specifically for PuppetDB 3 support by default.

0 commit comments

Comments
 (0)