groovy git commit: GROOVY-8269: Unclear definition of default behavior for trait multiple inheritance conflicts (closes #582)

[jw...@apache.org]

Repository: groovy
Updated Branches:
  refs/heads/master 96b7e57f7 -> 9dc46078d


GROOVY-8269: Unclear definition of default behavior for trait multiple inheritance conflicts (closes #582)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9dc46078
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9dc46078
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9dc46078

Branch: refs/heads/master
Commit: 9dc46078df141993f9c8ad26b40a47fae4e8cab7
Parents: 96b7e57
Author: John Wagenleitner <jw...@apache.org>
Authored: Sun Aug 13 12:07:33 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sun Aug 13 12:16:50 2017 -0700

----------------------------------------------------------------------
 src/spec/doc/core-traits.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/9dc46078/src/spec/doc/core-traits.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/core-traits.adoc b/src/spec/doc/core-traits.adoc
index 37d5382..5bd17ce 100644
--- a/src/spec/doc/core-traits.adoc
+++ b/src/spec/doc/core-traits.adoc
@@ -309,8 +309,8 @@ include::{projectdir}/src/spec/test/TraitsSpecificationTest.groovy[tags=multiple
 <2> trait `B` defines the very same method
 <3> class `C` implements both traits
 
-In this case, the default behavior is that methods from the *last declared trait* wins. Here, `B` is declared after `A`
-so the method from `B` will be picked up:
+In this case, the default behavior is that the method from the *last declared trait* in the `implements` clause wins.
+Here, `B` is declared after `A` so the method from `B` will be picked up:
 
 [source,groovy]
 ----