path: root/src/Propellor/Types/Dns.hs
diff options
authorJoey Hess2020-07-31 11:32:37 -0400
committerJoey Hess2020-07-31 11:32:37 -0400
commitf26dcc88f26020625e2ee3201e29250f26b55261 (patch)
tree154fee3a8bcbd5b443894ff7d34b84895cbd38d5 /src/Propellor/Types/Dns.hs
parent886a3483f012a4cd18fff150ec2ed61f166e1e30 (diff)
parent145d6f78ab94a1ca9ac556b518417fe4b2124be3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Types/Dns.hs')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs
index 30302a7d..e9902513 100644
--- a/src/Propellor/Types/Dns.hs
+++ b/src/Propellor/Types/Dns.hs
@@ -181,7 +181,7 @@ newtype NamedConfMap = NamedConfMap (M.Map Domain NamedConf)
instance IsInfo NamedConfMap where
propagateInfo _ = PropagateInfo False
--- | Adding a Master NamedConf stanza for a particulr domain always
+-- | Adding a Master NamedConf stanza for a particular domain always
-- overrides an existing Secondary stanza for that domain, while a
-- Secondary stanza is only added when there is no existing Master stanza.
instance Sem.Semigroup NamedConfMap where