Merge branch 'master' into attribute_helpers

Conflicts:
	Changes

diff --cc Changes
index 5584c04,848f560..b254acc
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -5,15 -5,13 +5,23 @@@ for, noteworthy changes
      * Moose::Meta::Method::Accessor
        - No longer uses inline_slot_access in accessors, to support
          non-lvalue-based meta instances.
 +
 +    * Moose::Meta::Attribute
 +      - Added the currying syntax for delegation from AttributeHelpers
 +        to the existing delegation API. (hdp)
 +
 +    * Moose::AttributeHelpers
 +      - Moved in from MooseX with API tweaks. See Moose::Manual::Delta for
 +        details. (hdp, jhannah, rbuels)
 +
+     * Moose::Manual::Contributing
+       - Re-write the Moose::Manual::Contributing document to reflect the new
+         layout and methods of work for the Git repository. All work now should
+         be done in topic branches and reviewed by a core committer before
+         being applied to master. All releases are done by a cabal member and
+         merged from master to stable. This plan was devised by Yuval, blame
+         him. (perigrin)
++
  0.87 Tue Jul 7, 2009
      * Moose::Meta::Method::Delegation
        - Once again allow class names as well as objects for

diff --cc lib/Moose.pm
Simple merge

diff --cc lib/Moose/Manual/Attributes.pod
Simple merge

diff --cc lib/Moose/Manual/Delta.pod
index 4cfe14a,43e8196..a3b5951
--- 1/lib/Moose/Manual/Delta.pod
--- 2/lib/Moose/Manual/Delta.pod
+++ b/lib/Moose/Manual/Delta.pod
@@@ -16,36 -16,27 +16,55 @@@ feature.  If you encounter a problem an
  it documented here, or think we missed an important feature, please
  send us a patch.
  
 +=head1 Version 0.85
 +
 +L<Moose::AttributeHelpers> has been moved into the Moose core from
 +L<MooseX::AttributeHelpers>.  Major changes include:
 +
 +=over
 +
 +=item C<traits>, not C<metaclass>
 +
 +Method providers are only available via traits.
 +
 +=item C<handles>, not C<provides> or C<curries>
 +
 +The C<provides> syntax was like core Moose C<< handles => HASHREF >>
 +syntax, but with the keys and values reversed.  This was confusing,
 +and AttributeHelpers now uses C<< handles => HASHREF >> in a way that
 +should be intuitive to anyone already familiar with how it is used for
 +other attributes.
 +
 +The C<curries> functionality provided by AttributeHelpers has been
 +generalized to apply to all cases of C<< handles => HASHREF >>, though
 +not every piece of functionality has been ported (currying with a
 +CODEREF is not supported).
 +
 +=back
 +
 +See L<Moose::AttributeHelpers> for the new documentation.
 +
  =head1 Version 0.84
  
+ When an attribute generates I<no> accessors, we now warn. This is to help
+ users who forget the C<is> option. If you really do not want any accessors,
+ you can use C<< is => 'bare' >>.
+ 
+ When an accessor overwrites an existing method, we now warn. To work around
+ this warning (if you really must have this behavior), you can explicitly
+ remove the method before creating it as an accessor:
+ 
+     sub foo {}
+ 
+     __PACKAGE__->meta->remove_method('foo');
+ 
+     has foo => (
+         is => 'ro',
+     );
+ 
+ When an unknown option is passed to C<has>, we now warn. You can silence
+ the warning by fixing your code. :)
+ 
  The C<Role> type has been deprecated. On its own, it was useless,
  since it just checked C<< $object->can('does') >>. If you were using
  it as a parent type, just call C<role_type('Role::Name')> to create an

diff --cc xt/author/pod_spell.t
index 385d90a,004a6aa..397dc64
--- 1/xt/author/pod_spell.t
--- 2/xt/author/pod_spell.t
+++ b/xt/author/pod_spell.t
@@@ -117,9 -111,11 +117,12 @@@ AP
  APIs
  Baz
  Changelog
+ codebase
+ committer
+ committers
  compat
  datetimes
 +dec
  definedness
  destructor
  destructors