From ecc9f9902c28a67b880705b0fa93de86008468bb Mon Sep 17 00:00:00 2001
From: j-t-1 <120829237+j-t-1@users.noreply.github.com>
Date: Fri, 26 Jul 2024 07:58:49 +0000
Subject: [PATCH 1/2] STY: Reorder exported symbols

Plus tiny change of a comment.
---
 pypdf/annotations/__init__.py | 4 ++--
 pypdf/annotations/_base.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pypdf/annotations/__init__.py b/pypdf/annotations/__init__.py
index 3ddf98569..208972d62 100644
--- a/pypdf/annotations/__init__.py
+++ b/pypdf/annotations/__init__.py
@@ -30,16 +30,16 @@
     # Export abstract base classes so that they are shown in the docs
     "AnnotationDictionary",
     "MarkupAnnotation",
-    # markup annotations
+    # Markup annotations
     "Ellipse",
     "FreeText",
     "Highlight",
     "Line",
-    "Link",
     "Polygon",
     "PolyLine",
     "Rectangle",
     "Text",
     # Non-markup annotations
+    "Link",
     "Popup",
 ]
diff --git a/pypdf/annotations/_base.py b/pypdf/annotations/_base.py
index f235acf3a..0245c6127 100644
--- a/pypdf/annotations/_base.py
+++ b/pypdf/annotations/_base.py
@@ -12,8 +12,8 @@ def __init__(self) -> None:
         # "rect" should not be added here as PolyLine can automatically set it
         self[NameObject("/Type")] = NameObject("/Annot")
         # The flags was NOT added to the constructor on purpose: We expect that
-        #   most users don't want to change the default. If they want, they
-        #   can use the property. The default is 0.
+        # most users don't want to change the default. If they do, they
+        # can use the property. The default is 0.
 
     @property
     def flags(self) -> AnnotationFlag:

From 20cbd0443a7a40bb6bb58829dd791a48fc70edb1 Mon Sep 17 00:00:00 2001
From: Stefan <96178532+stefan6419846@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:58:06 +0200
Subject: [PATCH 2/2] Update pypdf/annotations/_base.py

---
 pypdf/annotations/_base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pypdf/annotations/_base.py b/pypdf/annotations/_base.py
index 0245c6127..2aff325aa 100644
--- a/pypdf/annotations/_base.py
+++ b/pypdf/annotations/_base.py
@@ -11,7 +11,7 @@ def __init__(self) -> None:
 
         # "rect" should not be added here as PolyLine can automatically set it
         self[NameObject("/Type")] = NameObject("/Annot")
-        # The flags was NOT added to the constructor on purpose: We expect that
+        # The flags were NOT added to the constructor on purpose: We expect that
         # most users don't want to change the default. If they do, they
         # can use the property. The default is 0.