Skip to content

Commit 25a86b1

Browse files
authored
Merge pull request #9010 from jcharaoui/fix-misspellings
(maint) fix multiple misspellings of "satisfied"
2 parents 1160c78 + 2a68ce7 commit 25a86b1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lib/puppet/defaults.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,7 @@ def self.initialize_default_settings!(settings)
20412041
:type => :boolean,
20422042
:desc => "Whether puppet should call deferred functions before applying
20432043
the catalog. If set to `true`, then all prerequisites needed for the
2044-
deferred function must be satified prior to puppet running. If set to
2044+
deferred function must be satisfied prior to puppet running. If set to
20452045
`false`, then deferred functions will follow puppet relationships and
20462046
ordering. This allows puppet to install prerequisites needed for a
20472047
deferred function and call the deferred function in the same run."

man/man5/puppet.conf.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ The preferred means of serializing ruby instances for passing over the wire\. Th
15031503
.IP "" 0
15041504
.
15051505
.SS "preprocess_deferred"
1506-
Whether puppet should call deferred functions before applying the catalog\. If set to \fBtrue\fR, then all prerequisites needed for the deferred function must be satified prior to puppet running\. If set to \fBfalse\fR, then deferred functions will follow puppet relationships and ordering\. This allows puppet to install prerequisites needed for a deferred function and call the deferred function in the same run\.
1506+
Whether puppet should call deferred functions before applying the catalog\. If set to \fBtrue\fR, then all prerequisites needed for the deferred function must be satisfied prior to puppet running\. If set to \fBfalse\fR, then deferred functions will follow puppet relationships and ordering\. This allows puppet to install prerequisites needed for a deferred function and call the deferred function in the same run\.
15071507
.
15081508
.IP "\(bu" 4
15091509
\fIDefault\fR: \fBfalse\fR

spec/integration/application/agent_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
end
155155
end
156156

157-
it "fails to apply a deferred function with an unsatified prerequisite" do
157+
it "fails to apply a deferred function with an unsatisfied prerequisite" do
158158
Puppet[:preprocess_deferred] = true
159159

160160
catalog_handler = -> (req, res) {

spec/integration/application/apply_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def bogus()
454454

455455
context 'and the file is not serialized with rich_data' do
456456
# do not want to stub out behavior in tests
457-
before :each do
457+
before :each do
458458
Puppet[:strict] = :warning
459459
end
460460

@@ -714,7 +714,7 @@ def bogus()
714714
.and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred4x\]/message: defined 'message' as 'I am deferred'}).to_stdout
715715
end
716716

717-
it "fails to apply a deferred function with an unsatified prerequisite" do
717+
it "fails to apply a deferred function with an unsatisfied prerequisite" do
718718
Puppet[:preprocess_deferred] = true
719719

720720
apply.command_line.args = ['-e', deferred_manifest]

0 commit comments

Comments
 (0)