From 81e6560dace47201ac80ef42ff8f85d253c6e195 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <maurizio.cimadamore@oracle.com>
Date: Fri, 13 Oct 2023 18:09:35 +0100
Subject: [PATCH] Address review comments

---
 src/java.base/share/classes/java/lang/foreign/Arena.java    | 2 +-
 .../share/classes/java/lang/foreign/MemoryLayout.java       | 6 +++---
 .../share/classes/java/lang/foreign/MemorySegment.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/Arena.java b/src/java.base/share/classes/java/lang/foreign/Arena.java
index 78828266923f1..45cb46d33d612 100644
--- a/src/java.base/share/classes/java/lang/foreign/Arena.java
+++ b/src/java.base/share/classes/java/lang/foreign/Arena.java
@@ -44,7 +44,7 @@
  * <p>
  * The simplest arena is the {@linkplain Arena#global() global arena}. The global arena
  * features an <em>unbounded lifetime</em>. The scope of the global arena is the global scope.
- * As such, native segments allocated with the global arena are associated are always accessible and their backing regions
+ * As such, native segments allocated with the global arena are always accessible and their backing regions
  * of memory are never deallocated.
  * Moreover, memory segments allocated with the global arena can be {@linkplain MemorySegment#isAccessibleBy(Thread) accessed} from any thread.
  * {@snippet lang = java:
diff --git a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
index a9c58428c7c2e..51eb33627b618 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemoryLayout.java
@@ -460,8 +460,8 @@ default MethodHandle byteOffsetHandle(PathElement... elements) {
      * </ul>
      * <p>
      * If the selected layout is an {@linkplain AddressLayout address layout}, calling {@link VarHandle#get(Object...)}
-     * on the returned var handle will return a new memory segment. The segment is associated with a scope that is
-     * always alive. Moreover, the size of the segment depends on whether the address layout has a
+     * on the returned var handle will return a new memory segment. The segment is associated with the global scope.
+     * Moreover, the size of the segment depends on whether the address layout has a
      * {@linkplain AddressLayout#targetLayout() target layout}. More specifically:
      * <ul>
      *     <li>If the address layout has a target layout {@code T}, then the size of the returned segment
@@ -481,7 +481,7 @@ default MethodHandle byteOffsetHandle(PathElement... elements) {
      * {@snippet lang = "java":
      * VarHandle baseHandle = this.varHandle(P);
      * MemoryLayout target = ((AddressLayout)this.select(P)).targetLayout().get();
-     * VarHandle targetHandle = target.varHandle(P');
+     * VarHandle targetHandle = target.varHandle(P);
      * targetHandle = MethodHandles.insertCoordinates(targetHandle, 1, 0L); // always access nested targets at offset 0
      * targetHandle = MethodHandles.collectCoordinates(targetHandle, 0,
      *         baseHandle.toMethodHandle(VarHandle.AccessMode.GET));
diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index e15fca0fcc65f..5f0b4e790e036 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -2364,7 +2364,7 @@ static long mismatch(MemorySegment srcSegment, long srcFromOffset, long srcToOff
     /**
      * A scope models the <em>lifetime</em> of all the memory segments associated with it. That is, a memory segment
      * cannot be accessed if its associated scope is not {@linkplain #isAlive() alive}. Scope instances can be compared
-     * for equality. That is, two scopes are considered {@linkplain #equals(Object)} if they denote the same lifetime.
+     * for equality. That is, two scopes are considered {@linkplain #equals(Object) equal} if they denote the same lifetime.
      * <p>
      * The lifetime of a memory segment can be either <em>unbounded</em> or <em>bounded</em>. An unbounded lifetime
      * is modelled with the <em>global scope</em>. The global scope is always {@link #isAlive() alive}. As such, a segment