spelling fixes

(cherry picked from commit 789c6c1fe8d08b7abe6f07967764dfe8ec5f3d4f)

Conflicts:

	lib/Moose/Manual/Contributing.pod

diff --git a/lib/Moose/Manual/Contributing.pod b/lib/Moose/Manual/Contributing.pod
index f164abf..ba61149 100644 (file)
--- a/lib/Moose/Manual/Contributing.pod
+++ b/lib/Moose/Manual/Contributing.pod
@@ -227,8 +227,9 @@ branch's approval.
 
 =item Backwards incompatible changes.
 
-Anything that breaks backwards compatibility must be discussed by the cabal
-and agreed to by a majority of the members.
+Anything that breaks backwards compatibility must be discussed by the
+cabal. Backwards incompatible changes should not be merged to master if there
+are strong objections for any cabal members.
 
 We have a policy for what we see as sane L</BACKWARDS COMPATIBILITY> for
 Moose. If your changes break back-compat, you must be ready to discuss and

diff --git a/xt/author/pod_spell.t b/xt/author/pod_spell.t
index 9de7cba..29a8bb5 100644 (file)
--- a/xt/author/pod_spell.t
+++ b/xt/author/pod_spell.t
@@ -20,6 +20,8 @@ __DATA__
 Aankhen
 Aran
 autarch
+backported
+backports
 Buels
 chansen
 chromatic's