diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java index 6477eed825..8986eeaf2b 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java @@ -169,7 +169,7 @@ public class DBCachedObjectStoreFactory { * MyContext getContext(); * } * - * public static class MyDBFieldCodec<OT extends DBAnnotatedObject & ContextProvider> extends + * public static class MyDBFieldCodec<OT extends DBAnnotatedObject & ContextProvider> extends * AbstractDBFieldCodec<MyType, OT, BinaryField> { * * public MyDBFieldCodec(Class<OT> objectType, Field field, int column) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/structures/StructureMergeDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/structures/StructureMergeDialog.java index 77b7c69f6c..2d7324ff4d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/structures/StructureMergeDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/structures/StructureMergeDialog.java @@ -43,8 +43,8 @@ import utility.function.ExceptionalConsumer; *

* The dialog also provides the following actions as keyboard only actions: *

    - *
  1. Apply Item (<SPACE>): pressing the space bar key will apply the currently focussed and - * selected item from either the left side or right sided. (Assuming it is appliable).
    2. + *
  2. Apply Item (<SPACE>): pressing the space bar key will apply the currently focussed and + * selected item from either the left side or right sided. (Assuming it is applicable).
    3. *
  3. Focus Left Side (<LEFT ARROW>): pressing the left arrow will give focus to the left side * display.
    4. *
  4. Focus Right Side (<RIGHT ARROW>): pressing the right arrow will give focus to the right side