From ad17b552b8f7c3a435ad8de71cd7268f905a1b8d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 8 Sep 2015 13:23:22 -0400 Subject: Merge remote-tracking branch 'origin/2.11.x' into 2.12.x only trivial merge conflicts here. not dealing with PR #4333 in this merge because there is a substantial conflict there -- so that's why I stopped at 63daba33ae99471175e9d7b20792324615f5999b for now --- spec/05-classes-and-objects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/05-classes-and-objects.md') diff --git a/spec/05-classes-and-objects.md b/spec/05-classes-and-objects.md index 3a70f2a137..69828ec7fe 100644 --- a/spec/05-classes-and-objects.md +++ b/spec/05-classes-and-objects.md @@ -631,7 +631,7 @@ class Outer { ``` Here, accesses to the method `f` can appear anywhere within -`OuterClass`, but not outside it. Accesses to method +`Outer`, but not outside it. Accesses to method `g` can appear anywhere within the package `outerpkg.innerpkg`, as would be the case for package-private methods in Java. Finally, accesses to method -- cgit v1.2.3