diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/action/LocationTrackingSpecFactory.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/action/LocationTrackingSpecFactory.java index aa1b927f04..84ddb9331c 100644 --- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/action/LocationTrackingSpecFactory.java +++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/action/LocationTrackingSpecFactory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -68,7 +68,7 @@ public interface LocationTrackingSpecFactory extends ExtensionPoint { List getSuggested(PluginTool tool); /** - * Attempt to parse the given configuration name as as specification + * Attempt to parse the given configuration name as a specification * * @param name the configuration name, usually including a prefix unique to each factory * @return the specification, or null if this factory cannot parse it diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java index 0741aa0b7a..ac4ed76b7f 100644 --- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java +++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/breakpoint/LogicalBreakpoint.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -558,7 +558,7 @@ public interface LogicalBreakpoint { } /** - * Get the desired state were the the logical breakpoint to be toggled + * Get the desired state were the logical breakpoint to be toggled * *

* The expected "action" when toggling a breakpoint may vary depending on whether or not the diff --git a/Ghidra/Debug/Debugger-rmi-trace/DEVNOTES.txt b/Ghidra/Debug/Debugger-rmi-trace/DEVNOTES.txt index cd52400b29..f03c229e4e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/DEVNOTES.txt +++ b/Ghidra/Debug/Debugger-rmi-trace/DEVNOTES.txt @@ -134,7 +134,7 @@ I instead just use a fixed 32-bit int now. # How-To? -For now, I'd say just the the gdb implementation as a template / guide. +For now, I'd say just take the gdb implementation as a template / guide. Just beware, the whole thing is a bit unstable, so the code may change, but still, I don't expect it to change so drastically that integration work would be scrapped. If you're writing Python, create a Python package following the template for gdb's. diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py index 90787214d7..a94174888d 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py @@ -376,7 +376,7 @@ class Trace(Generic[E]): List[str], RemoteResult[Any, List[str]]]: """Set register values at the given time on. - values is a dictionary, where each key is a a register name, and + values is a dictionary, where each key is a register name, and the value is a byte array. No matter the target architecture, the value is given in big-endian byte order. """ diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java index 0c102676b1..7b6698d6c9 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java @@ -498,7 +498,7 @@ public enum VariableValueUtils { } /** - * Find the fuction's variable whose storage contains the given stack offset + * Find the function's variable whose storage contains the given stack offset * * @param function the function * @param stackAddress the stack offset diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/disassemble/DebuggerDisassemblyTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/disassemble/DebuggerDisassemblyTest.java index d00e26071c..39be632bfe 100644 --- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/disassemble/DebuggerDisassemblyTest.java +++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/disassemble/DebuggerDisassemblyTest.java @@ -289,7 +289,7 @@ public class DebuggerDisassemblyTest extends AbstractGhidraHeadedDebuggerTest { assertMnemonic("JMP", instructions.getAt(0, tb.addr(0x00400000))); /** * Depending on preference for branch or fall-through, the disassembler may or may not - * proceed to the following instructions. I don't really care, since the test is the the + * proceed to the following instructions. I don't really care, since the test is that the * JMP gets deleted after the update to PC. */ }); @@ -324,7 +324,7 @@ public class DebuggerDisassemblyTest extends AbstractGhidraHeadedDebuggerTest { assertMnemonic("JMP", instructions.getAt(0, tb.addr(0x00400000))); /** * Depending on preference for branch or fall-through, the disassembler may or may not - * proceed to the following instructions. I don't really care, since the test is the the + * proceed to the following instructions. I don't really care, since the test is that the * JMP gets deleted after the update to PC. */ }); @@ -374,7 +374,7 @@ public class DebuggerDisassemblyTest extends AbstractGhidraHeadedDebuggerTest { assertMnemonic("JMP", instructions.getAt(0, tb.addr(0x00400000))); /** * Depending on preference for branch or fall-through, the disassembler may or may not - * proceed to the following instructions. I don't really care, since the test is the the + * proceed to the following instructions. I don't really care, since the test is that the * JMP gets deleted after the update to PC. */ }); diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java index c0f869d4de..c5b4ee9dc6 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java @@ -1467,13 +1467,13 @@ public class DBTraceProgramView implements TraceProgramView { } public void updateMemoryAddSpaceBlock(AddressSpace space) { - // Spaces not not time-bound. No visibility check. + // Spaces are not time-bound. No visibility check. memory.updateAddSpaceBlock(space); allAddressesValid = false; } public void updateMemoryDeleteSpaceBlock(AddressSpace space) { - // Spaces not not time-bound. No visibility check. + // Spaces are not time-bound. No visibility check. memory.updateDeleteSpaceBlock(space); allAddressesValid = false; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java index 70c0140160..f4b598eb87 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java @@ -46,7 +46,7 @@ public class XmlTargetObjectSchemaTest { - """; // Cannot have final final new-line or serialize test will fail + """; // Cannot have a final new-line or serialize test will fail protected static final DefaultSchemaContext CTX = new DefaultSchemaContext(); protected static final SchemaName NAME_ROOT = new SchemaName("root"); diff --git a/Ghidra/Features/BSim/src/main/help/help/topics/BSim/IngestProcess.html b/Ghidra/Features/BSim/src/main/help/help/topics/BSim/IngestProcess.html index 8265d68ca1..9962a928a3 100644 --- a/Ghidra/Features/BSim/src/main/help/help/topics/BSim/IngestProcess.html +++ b/Ghidra/Features/BSim/src/main/help/help/topics/BSim/IngestProcess.html @@ -63,7 +63,7 @@ "filename">localhost is running both a Ghidra Server and a BSim PostgreSQL database server. On the Ghidra Server, a repository named repo has been created. On the BSim server, a database named repo has - also been created. See See Command-Line Utility Reference for more details on use of bsim command and other supported BSim databases.

diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/description/CategoryRecord.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/description/CategoryRecord.java index c18716a75c..f7132f02a8 100755 --- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/description/CategoryRecord.java +++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/description/CategoryRecord.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.Writer; /** - * A user-defined category associated associated with an executable + * A user-defined category associated with an executable * Specified by a -type- and then the particular -category- (within the type) that * the executable belongs to. * diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java index 5a2810c2c4..3fbcfe89ae 100755 --- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java +++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java @@ -3527,7 +3527,7 @@ public class ElasticDatabase implements FunctionDatabase { /** * Entry point for Elasticsearch version of the QueryChildren command: - * Query for the child functins of submitted functions + * Query for the child functions of submitted functions * @param query is command parameters * @throws LSHException for problems adding records to the response * @throws ElasticException for communication problems with the server diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm index 187bac9f21..041c3c66a1 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowser.htm @@ -113,7 +113,7 @@ -

In the XRef field, sometimes there are too many addresses to display so the the field will +

In the XRef field, sometimes there are too many addresses to display so the field will display "[more]" to indicate that one or more cross-reference addresses are not shown.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowserOptions.htm b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowserOptions.htm index d620ba7539..f08a3da4a8 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowserOptions.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/CodeBrowserOptions.htm @@ -897,7 +897,7 @@ contains the prefix to use for local labels.

Enable Word Wrapping - Option to wrap strings in operand lines that are too long - to fit in the operand field. Note that that word wrapping can only occur where spaces exist + to fit in the operand field. Note that word wrapping can only occur where spaces exist in the string.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm index 86aecc62ee..510a020979 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm @@ -421,7 +421,7 @@ must be used to precisely place a bitfield component. Adding a bitfield component via the structure table view via datatype text entry (e.g., char:1) provides only rough placement for non-packed structures since additional bytes will be introduced. - The BitField Editor may be displayed using the the Add Bitfield and + The BitField Editor may be displayed using the Add Bitfield and Edit Bitfield popup menu actions on a selected structure component. The datatype text entry approach must be used for all unions and packed structures. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm index 9f7b42d814..69b7c23815 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm @@ -1133,7 +1133,7 @@

On occasion there may be the need to add stipulate additional attributes on a pointer type to stipulate how the associated pointer should be interpreted or processed during analysis. - Such pointer attributes may only be specified when such a pointer in in the form of a Typedef + Such pointer attributes may only be specified when such a pointer in the form of a Typedef which enables the datatype to preserve these attributes during type resolution and propagation. This includes preservation of such Typedef Settings within a data type archive, and through merge processing, which normal Data Settings do not support.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html index f458d47028..0fd896502c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html @@ -142,7 +142,7 @@ - Indicates the archive has datatypes from a - source archive that has been been modified. An update is needed. + source archive that has been modified. An update is needed. @@ -519,7 +519,7 @@

Copy

-

The Copy action can be be used to +

The Copy action can be used to copy selected data types and/or copy selected categories. @@ -533,7 +533,7 @@

Cut

-

The Cut action can be be used to +

The Cut action can be used to move selected data types and/or move selected categories. The diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm index 5f0184f19a..200bbaf4b6 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm @@ -105,10 +105,10 @@

  • Format - This field is a drop-down list containing all the valid export file formats that could be used to to export the + "#Exporter_Formats">export file formats that could be used to export the program. By default, the last used format will be auto-selected.
    • -
  • Output File - This field specifies the the output file for the export. By +
  • Output File - This field specifies the output file for the export. By default, the output file's name will be the name of the program and the output folder will be the user's home folder or the last folder used for an export if an export has been performed in the current session. Use the "..." button to bring up a file chooser diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm b/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm index b7b035a1e8..129aca4150 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm @@ -40,7 +40,7 @@ Address field is disabled. If an instruction has no default fallthrough (e.g., "jump"), the Fallthrough Address field is empty. Choose the User button to enter a new fallthrough address. When the User button is selected, the Fallthrough - Address field is updated as you move the cursor in the the Code Browser.

    + Address field is updated as you move the cursor in the Code Browser.

    Select the Home button to navigate the Code Browser back to this address. The home panel shows the address and the instruction when you selected the Set option.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm index 189c9db0ea..639328e787 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm @@ -108,7 +108,7 @@
    1. Connect the tools in one direction as described above.
      2. -
    2. Select Tool B as the event producer and and Tool A as the event consumer.
      3. +
    3. Select Tool B as the event producer and Tool A as the event consumer.
    4. Select the check box for the event of interest in the Event Names list.
    @@ -174,7 +174,7 @@
    1. Disconnect the tools in one direction as described above.
      2. -
    2. Select Tool B as the event producer and and Tool A as the event consumer.
      3. +
    3. Select Tool B as the event producer and Tool A as the event consumer.
    4. Turn off the check box for the event of interest in the Event Names list.
    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm index c5766675c9..8d80474130 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm @@ -530,7 +530,7 @@ The private file "Example" exists on your computer, but another user added "Example" to version control, which caused the private file to appear as hijacked, (i.e., the file can be saved "as - is" using "Save As" since you do not have the the file checked out that is on + is" using "Save As" since you do not have the file checked out that is on the Ghidra Server.) Hijacked files may also result from a checkout that was terminated. The shared version of "Example" will not be visible in your project until you diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm index 0bb070d0bf..b705861890 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm @@ -256,7 +256,7 @@
    • Format - This field is a drop-down list containing all the valid file formats that could be used to to import the file. + "#Supported_Formats">file formats that could be used to import the file. Typically, there are two options available. One for the actual format of the file (if Ghidra could detect it) and other is the Raw Binary format, which is always an option regardless of the actual file format and it will simply import the bytes in the @@ -276,7 +276,7 @@
    • Program Name - This field specifies the name for the newly imported program. By default, it will be the name of the imported file with any format specific extenstion - removed (e.g., .xml, .gzf). Path information at the beginning of the this field + removed (e.g., .xml, .gzf). Path information at the beginning of this field will be used to create a destination folder in the current project under the root folder specified by the Destination Folder field.

      • @@ -714,7 +714,7 @@

      The Library Search Path dialog is used to specify the directories, container files, and/or FSRLs that Ghidra should use to resolve external libraries (e.g.; *.dll, *.so) while - importing. A "." can be added to specify the the program's import location. FSRLs can be + importing. A "." can be added to specify the program's import location. FSRLs can be added via the File System Browser context menu.

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm b/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm index d7bd2eaa54..c5d5df96e7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm @@ -56,7 +56,7 @@ data tree, and setlect Set Language... from the popup menu.  Since setting the language is such a major change, the following warning will appear.

      -

      Alternatively, if your file is versioned, you you +

      Alternatively, if your file is versioned, you should check-in any recent changes prior to performing this operation.  If you press the "OK" button, the Select Language dialog will be displayed:

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm b/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm index 05d890d3bb..6a83576484 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm @@ -953,7 +953,7 @@

    Start Symbols - A comma separated list of symbol - names to be be used as the starting location for the program if the "Preferred Symbol Name" + names to be used as the starting location for the program if the "Preferred Symbol Name" option is selected above. The first matching symbol found will be used as the starting location for newly opened programs.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm index 2016ff571e..b35fb70be3 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm @@ -844,7 +844,7 @@ c

    When adding a Stack or Register reference, a corresponding parameter or variable may be created.  If a local variable is created, the first-use-offset of the variable will correspond to the source instruction location.  For this reason, it is - recommended that the first reference to a variable be created on the the first "assignment" + recommended that the first reference to a variable be created on the first "assignment" instruction.  If a newly created variable is unwanted, it may be deleted by clicking on it within the Listing and hitting the "Delete" key.  Keep in mind that when a variable is deleted, any explicit bindings to that variable will be cleared.
    @@ -1085,7 +1085,7 @@ c

    When adding a Stack or Register reference, a corresponding parameter or variable may be created.  If a local variable is created, the first-use-offset of the variable will correspond to the source instruction location.  For this reason, it is - recommended that the first reference to a variable be created on the the first "assignment" + recommended that the first reference to a variable be created on the first "assignment" instruction.  If a newly created variable is unwanted, it may be deleted by clicking on it within the Listing and hitting the "Delete" key.  Keep in mind that when a variable is deleted, any explicit bindings to that variable will be cleared.
    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/SearchAndReplace.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/SearchAndReplace.htm index 3b261ce011..b460a95adb 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/SearchAndReplace.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/SearchAndReplace.htm @@ -275,7 +275,7 @@

    Press the toolbar button or use the popup action Execute Selected Action(s) to apply just the selected entries in - the table. If only one item is selected when this this is done, the selected item will + the table. If only one item is selected when this is done, the selected item will move to the next item in the table to facilitate a one at a time workflow.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm index 2eb50b2409..25da03977b 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm @@ -338,7 +338,7 @@

    This action searches forward in memory, starting at the address just after the current cursor location. It will continue until a match is found or the highest address in the - search space is reached. It does not "wrap". If a match is found, it it is added to the + search space is reached. It does not "wrap". If a match is found, it is added to the current table of results.

    @@ -347,7 +347,7 @@

    This action searches backwards in memory, starting at the address just before the current cursor location. It will continue until a match is found or the lowest address in - the search space is reached. It does not "wrap". If a match is found, it it is added to + the search space is reached. It does not "wrap". If a match is found, it is added to the current table of results.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm index f56a1213b7..aebd6eb850 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm @@ -117,7 +117,7 @@
  • Select the Make Table button.
  • An address table gets created at the location you chose, containing defined addresses - which now point to to the address created. These addresses now contain XREFs to the table + which now point to the address created. These addresses now contain XREFs to the table entries. If an index to the table exists immediately after the table, it will get created as an array of bytes, as well.
    • diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm index 7fab4820ca..a578da2b89 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm @@ -20,7 +20,7 @@ various parts of the listing such as comments, labels, mnemonics, and operands.  The Search and Replace features allows for globally searching and replacing names or comments on many different types of program elements such as - Labels, Functions, Datatypes, Enum Values, and and many others. The + Labels, Functions, Datatypes, Enum Values, and many others. The Search For Strings feature automatically finds potential ascii strings within the program memory.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/SymbolTreePlugin/SymbolTree.htm b/Ghidra/Features/Base/src/main/help/help/topics/SymbolTreePlugin/SymbolTree.htm index 29b45691e3..4eefa0ee61 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/SymbolTreePlugin/SymbolTree.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/SymbolTreePlugin/SymbolTree.htm @@ -331,7 +331,7 @@

    Navigating to External Locations

    -

    If you select an external symbol (under the Externals folder in the the symbol +

    If you select an external symbol (under the Externals folder in the symbol tree), you will navigate to an external reference source which has a destination corresponding to the external symbol (i.e., where it is being called from). To actually go to the external location, right mouse click on the external diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Configure_Tool.htm b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Configure_Tool.htm index 94eeb547f4..f602772646 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Configure_Tool.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Configure_Tool.htm @@ -77,7 +77,7 @@

    Configure Plugins Dialog

    -

    Selecting the Configure link for a package will bring up the the Configure +

    Selecting the Configure link for a package will bring up the Configure Plugins Dialog.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm b/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm index 4cb185cee3..3108a89912 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm @@ -135,7 +135,7 @@

    A normal checkout is indicated by a checkmark with a green background, while an - exclusive checkout is is indicated by checkmark with a blue background. A checkmark with a red background indicates that a newer version has been checked-in by another user.

    @@ -150,7 +150,7 @@ "0"> 
    -

    To check out a file, select the file in the Ghidra Project Window. You can either either +

    To check out a file, select the file in the Ghidra Project Window. You can either click on the check out icon on the tool bar, or right mouse click on the file and choose the Check Out... option.   

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm b/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm index 2dc4812a89..3d1f645d4d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm @@ -44,7 +44,7 @@
  • Has Encoding Error - boolean flag that indicates the string had byte(s) that could not be converted by the character set. This is usually caused by having the wrong character set or if the string isn't really a string.
  • Charset - name of the character set that this string is encoded in.
    • -
  • Unicode Script - a list of the the scripts (alphabets) used in the string.
    • +
  • Unicode Script - a list of the scripts (alphabets) used in the string.

The Is Ascii, Has Encoding Error, Unicode Script, and Charset columns are not visible by default. To display them in the table, right click on the column header row and select diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/AbstractCreateStructureCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/AbstractCreateStructureCmd.java index 7c3e53a3f8..b08a72db6f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/AbstractCreateStructureCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/AbstractCreateStructureCmd.java @@ -35,7 +35,7 @@ public abstract class AbstractCreateStructureCmd implements Command { private Address structureAddress; /** - * Initializes the this class to create a structure with the given name + * Initializes this class to create a structure with the given name * and address when the {@link #applyTo(Program)} is called. * * @param name The name of the structure to create. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java index add72eff55..22c3bf734c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java @@ -693,7 +693,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { } // NOTE: Parameter level merging gets really complex when the presence of auto-params are inconsistent - // between between two functions treat as a signature difference when this occurs + // between two functions. Treat this as a signature difference when this occurs. for (int i = 0; i < f1Parms.length; i++) { if (f1Parms[i].isAutoParameter() != f2Parms[i].isAutoParameter() || diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VariousChoicesPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VariousChoicesPanel.java index 1349d0c742..d8f5b48944 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VariousChoicesPanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VariousChoicesPanel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -140,7 +140,7 @@ public class VariousChoicesPanel extends ConflictPanel { * Adds a row to the table that doesn't provide any choices. * Instead this row just provides information. * - * @param title title the is placed at the beginning of the row + * @param title title that is placed at the beginning of the row * @param info the text for each table column in the row * @param underline true indicates each info string should be underlined * when it appears. (Underlining is done on the header row (row 0) of the table. @@ -170,7 +170,7 @@ public class VariousChoicesPanel extends ConflictPanel { * Adds radiobutton choices as a row of the table. * Radiobuttons allow you to select only one choice in the row. * - * @param title title the is placed at the beginning of the row + * @param title title that is placed at the beginning of the row * @param choices the text for each choice in the row * @param listener listener that gets notified whenever the state of * one of the radiobuttons in this row changes. @@ -222,7 +222,7 @@ public class VariousChoicesPanel extends ConflictPanel { * Adds checkbox choices as a row of the table. * Check boxes allow you to select one or more choices in the row. * - * @param title title the is placed at the beginning of the row + * @param title title that is placed at the beginning of the row * @param choices the text for each choice in the row * @param listener listener that gets notified whenever the state of * one of the checkboxes in this row changes. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java index f874237217..00b0ef06c3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -79,7 +79,7 @@ public class ProgramTreeMergeManager implements MergeResolver { * @param myProgram source of changes to apply to the destination * program * @param originalProgram program that was originally checked out - * @param latestProgram program that that is the latest version; the + * @param latestProgram program that is the latest version; the * resultProgram and latestProgram start out as being identical * @param latestChangeSet change set of the destination program * @param myChangeSet change set for the source program diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java index 3bbebfbc22..039ebe8cda 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -126,7 +126,7 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer { } /** - * Called to to register a more specific analyzer. + * Called to register a more specific analyzer. * * @param processorName */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java index 8bc268083f..ccf67b1cd7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -1107,7 +1107,7 @@ public class OperandReferenceAnalyzer extends AbstractAnalyzer { /** * Returns the length of the Unicode string found at address. * - * @return length of string in in words (two byte unicode characters). + * @return length of string in words (two byte unicode characters). */ private int checkUnicodeString(Memory mem, Address adref) { int len = getWStrLen(mem, adref); // returns -1 for bad diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/RegisterContextBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/RegisterContextBuilder.java index 2f0e023709..a0460941ca 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/RegisterContextBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/RegisterContextBuilder.java @@ -1,13 +1,12 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -109,8 +108,8 @@ class RegisterContextBuilder { * @param instr first instruction of range * @param valueFrom point from which existing register value should * be read from program context. - * @param overwrite this method will take not action and return false if - * this parameter is false and and a context value has previously been set, + * @param overwrite this method will take no action and return false if + * this parameter is false and a context value has previously been set, * otherwise an attempt will be made to overwrite the current value state. * @return true if value was set, otherwise false. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemanglerV0.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemanglerV0.java index 81d5d59bf1..47a20d0fd4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemanglerV0.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/demangler/RustDemanglerV0.java @@ -891,7 +891,7 @@ class RustType implements SymbolNode { } /** - * Parses and represents a a rust symbol const node + * Parses and represents a rust symbol const node */ class RustConst implements SymbolNode { String name; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java index ba7c685f70..860cb92462 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallNode.java @@ -119,7 +119,7 @@ public abstract class CallNode extends GTreeSlowLoadingNode { Function function = nodeToAdd.getRemoteFunction(); List nodes = nodesByFunction.get(function); if (nodes.isEmpty()) { - nodes.add(nodeToAdd); // can can always add new nodes when the list is empty + nodes.add(nodeToAdd); // we can always add new nodes when the list is empty return; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java index 7bf4f44851..e859843685 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java @@ -721,7 +721,7 @@ public class CallTreeProvider extends ComponentProviderAdapter { //@formatter:off showNamespaceAction = new ToggleActionBuilder("Show Namespace", plugin.getName()) .selected(false) - .description("Function nodes will include the funtion namespace when selected") + .description("Function nodes will include the function namespace when selected") .helpLocation(new HelpLocation(plugin.getName(), "Call_Tree_Action_Show_Namespaces")) .menuPath("Show Namespace") .onAction(c -> { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/LayeredColorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/LayeredColorModel.java index c9735ee369..585d227322 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/LayeredColorModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/LayeredColorModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import ghidra.util.ColorUtils; /** * Class for blending two {@link ListingBackgroundColorModel}s. If neither model has a color * different from its default, then the primary's color is returned. If only one model - * has a color different from its default, that that color is returned. If they both have + * has a color different from its default, then that color is returned. If they both have * colors different, the color returned is a blend of the two colors. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramLocator.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramLocator.java index 330f749823..077f7dbf16 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramLocator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramLocator.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -56,7 +56,7 @@ public class ProgramLocator { } /** - * Creates a {@link DomainFile} based based ProgramLocator for the current version of a Program. + * Creates a {@link DomainFile}-based ProgramLocator for the current version of a Program. * @param domainFile the DomainFile for a program */ public ProgramLocator(DomainFile domainFile) { @@ -64,7 +64,7 @@ public class ProgramLocator { } /** - * Creates a {@link DomainFile} based based ProgramLocator for a specific Program version. + * Creates a {@link DomainFile}-based ProgramLocator for a specific Program version. * @param domainFile the DomainFile for a program * @param version the specific version of the program */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/ListingDisplaySearcher.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/ListingDisplaySearcher.java index a0dfce9b27..880d0c1fbc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/ListingDisplaySearcher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/ListingDisplaySearcher.java @@ -39,14 +39,14 @@ import ghidra.util.UserSearchUtils; import ghidra.util.task.TaskMonitor; /** - * This class attempts to search for text as it is rendered on the screen. This in in + * This class attempts to search for text as it is rendered on the screen. This is in * contrast to the Program Database Searcher which searches the database. This is * needed because some information on the screen is rendered "on the fly" and not * stored in the database. This searcher is much slower, but delivers * results that are in-line with what the user sees. *

* The search is performed in two steps. First it uses Instruction and Data iterators to - * find possible addresses where where information would be rendered. Then for each of those + * find possible addresses where information would be rendered. Then for each of those * addresses, it uses the code browsers rendering engine to produce a textual representation * for that address. The textual representation also maintains information about the field * that generated it so that the search can be constrained to specific fields such as the diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java index cd78bd8058..c02a69dc16 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/ClassCategoryNode.java @@ -171,7 +171,7 @@ public class ClassCategoryNode extends SymbolCategoryNode { return; } - // start with the the top-level class node and walk the namespace path to find the + // start with the top-level class node and walk the namespace path to find the // parent for the given symbol GTreeNode classNode = entry.getKey(); List parentPath = entry.getValue(); @@ -205,7 +205,7 @@ public class ClassCategoryNode extends SymbolCategoryNode { Set>> entries = classNodes.entrySet(); for (Entry> entry : entries) { - // start with the the top-level class node and walk the namespace path to find the + // start with the top-level class node and walk the namespace path to find the // parent for the given symbol GTreeNode classNode = entry.getKey(); List parentPath = entry.getValue(); @@ -237,7 +237,7 @@ public class ClassCategoryNode extends SymbolCategoryNode { In this tree, the Label2 symbol is in the tree twice. The mapping created by this method - will have have as keys both Class1 and Class2. Class1 will be mapped to Class1/BarNs/Class2 + will have as keys both Class1 and Class2. Class1 will be mapped to Class1/BarNs/Class2 and Class2 will be mapped to Class2 (since it only has one namespace element). This code is needed because this Classes category node will duplicate class nodes. It puts diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoProvider.java index 73ddcdd22e..ee7bd0a04f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoProvider.java @@ -119,7 +119,7 @@ class RuntimeInfoProvider extends ReusableDialogComponentProvider { /** * Adds an "application layout" panel to the tabbed pane. *

- * The goal of this panel is to display information information about the application such as + * The goal of this panel is to display information about the application such as * what directories it is using on disk, what its PID is, etc. */ private void addApplicationLayout() { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java index 53687cfcbd..95ae00aa3e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java @@ -800,7 +800,7 @@ public abstract class GhidraScript extends FlatProgramAPI { *

* The script being run uses the given {@link GhidraState} (e.g., script variables) * Any changes to the state by the script being run will be reflected in the given state - * object. If the given object is the current state, the this scripts state may be changed + * object. If the given object is the current state, this scripts state may be changed * by the called script. * * @param scriptName the name of the script to run @@ -822,7 +822,7 @@ public abstract class GhidraScript extends FlatProgramAPI { *

* The script being run uses the given {@link GhidraState} (e.g., script variables) * Any changes to the state by the script being run will be reflected in the given state - * object. If the given object is the current state, the this scripts state may be changed + * object. If the given object is the current state, this scripts state may be changed * by the called script. * * @param scriptName the name of the script to run diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerSet.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerSet.java index 7fa114066c..50c61ac9bf 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerSet.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerSet.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,7 +45,7 @@ public interface MarkerSet extends Comparable { public void add(AddressRange range); /** - * Sets the AddressSetCollection to be used for this this marker set. + * Sets the AddressSetCollection to be used for this marker set. * *

Warning! * Using this method will cause this MarkerSet to directly use the given AddressSetCollection. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/VSCodeIntegrationService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/VSCodeIntegrationService.java index 4fb1db310d..96dd6ef274 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/VSCodeIntegrationService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/VSCodeIntegrationService.java @@ -62,7 +62,7 @@ public interface VSCodeIntegrationService { public void createVSCodeModuleProject(File projectDir) throws IOException; /** - * Adds the given project directory to the the given Visual Studio Code workspace file + * Adds the given project directory to the given Visual Studio Code workspace file * A new workspace will be created if it doesn't already exist * * @param workspaceFile The location of the workspace file diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java index 0228fc05d0..1c86fa5d09 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java @@ -451,7 +451,7 @@ public class AddressInput extends JPanel implements FocusableEditor { } private String removeLeadingZeros(String addressString) { - // if it has a colon, then is is a segmented address, don't mess with it. + // if it has a colon, then it is a segmented address, don't mess with it. if (addressString.indexOf(":") >= 0) { return addressString; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java index 8406eab486..9f708b361c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java @@ -53,7 +53,7 @@ public class CoffArchiveMemberHeader implements StructConverter { /** * Reads a COFF archive member header from the specified {@link BinaryReader reader}, - * leaving the file position at the start of the this member's payload. + * leaving the file position at the start of this member's payload. *

* The archive member's name is fixed up using the specified {@link LongNamesMember longNames} * object. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFLocationListHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFLocationListHeader.java index b14969d9d5..92e4b80542 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFLocationListHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFLocationListHeader.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,7 +33,7 @@ public class DWARFLocationListHeader extends DWARFIndirectTableHeader { // address_size : 1 byte // segment_selector_size : 1 byte // offset entry count: 4 bytes - // offsets : array of elements are are dwarf_format_int sized + // offsets : array of elements that are dwarf_format_int sized long startOffset = reader.getPointerIndex(); DWARFLengthValue lengthInfo = DWARFLengthValue.read(reader, defaultIntSize); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRangeListHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRangeListHeader.java index e7a6b7c971..74969570a2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRangeListHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRangeListHeader.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,7 +33,7 @@ public class DWARFRangeListHeader extends DWARFIndirectTableHeader { // address_size : 1 byte // segment_selector_size : 1 byte // offset entry count: 4 bytes - // offsets : array of elements are are dwarf_format_int sized + // offsets : array of elements that are dwarf_format_int sized long startOffset = reader.getPointerIndex(); DWARFLengthValue lengthInfo = DWARFLengthValue.read(reader, defaultIntSize); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFStringOffsetTableHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFStringOffsetTableHeader.java index 427019aee8..96b67d7efe 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFStringOffsetTableHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFStringOffsetTableHeader.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,7 +45,7 @@ public class DWARFStringOffsetTableHeader extends DWARFIndirectTableHeader { // length : dwarf_length // version : 2 bytes // padding : 2 bytes - // offsets : array of elements are are dwarf_format_int sized + // offsets : array of elements that are dwarf_format_int sized long startOffset = reader.getPointerIndex(); DWARFLengthValue lengthInfo = DWARFLengthValue.read(reader, defaultIntSize); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFUtil.java index 21811ccbe9..4de673100f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFUtil.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFUtil.java @@ -57,7 +57,7 @@ public class DWARFUtil { * Returns the field name of a final static variable in class clazz * which holds a specific value. *

- * Can be thought of as an enum numeric value to to name lookup. + * Can be thought of as an enum numeric value to do a name lookup. * * @param clazz * @param value diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java index aaef83bf54..e6c3cde522 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -224,8 +224,8 @@ public interface ElfLoadHelper { * performed during the ELF import processing. A relocation type of 0 and a status of * {@link Status#APPLIED_OTHER} will be applied to the relocation entry. * NOTE: The number of recorded original FileBytes currently ignores the specified length. - * However, the length is still used to verify that that the intended modification region - * dose not intersect another relocation. + * However, the length is still used to verify that the intended modification region + * does not intersect another relocation. * @param address relocation address * @param length number of bytes affected * @return true if recorded successfully, or false if conflict with existing relocation diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfRelocation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfRelocation.java index 9dcddf8ee6..1d758042e1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfRelocation.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfRelocation.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -96,7 +96,7 @@ public class ElfRelocation implements StructConverter { * @param reader binary reader positioned at start of relocation entry. * @param elfHeader ELF header * @param relocationIndex index of entry in relocation table - * @param withAddend true if if RELA entry with addend, else false + * @param withAddend true if it's a RELA entry with addend, else false * @return ELF relocation object * @throws IOException if an IO or parse error occurs */ @@ -113,7 +113,7 @@ public class ElfRelocation implements StructConverter { * relocation entry * @param elfHeader ELF header * @param relocationIndex index of entry in relocation table - * @param withAddend true if if RELA entry with addend, else false + * @param withAddend true if it's a RELA entry with addend, else false * @param r_offset The offset for the entry * @param r_info The info value for the entry * @param r_addend The signed-addend for the entry (32-bit addends should be signed-extended to 64-bits) @@ -172,7 +172,7 @@ public class ElfRelocation implements StructConverter { * a representative instance will be generated with all fields set to 0. * @param elfHeader ELF header * @param relocationTableIndex index of relocation within relocation table - * @param withAddend true if if RELA entry with addend, else false + * @param withAddend true if it's a RELA entry with addend, else false * @throws IOException if an IO or parse error occurs */ protected void initElfRelocation(BinaryReader reader, ElfHeader elfHeader, @@ -189,7 +189,7 @@ public class ElfRelocation implements StructConverter { * Initialize ELF relocation entry using data provided via the parameters. * @param elfHeader ELF header * @param relocationTableIndex index of relocation within relocation table - * @param withAddend true if if RELA entry with addend, else false + * @param withAddend true if it's a RELA entry with addend, else false * @param offset The offset for the entry (r_offset) * @param info The info value for the entry (r_info) * @param addend The signed-addend (r_addend) for the entry (32-bit addends should diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/LoadCommandTypes.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/LoadCommandTypes.java index f17e59f677..ca646c6f2d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/LoadCommandTypes.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/LoadCommandTypes.java @@ -5,9 +5,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,7 @@ public final class LoadCommandTypes { * After MacOS X 10.1 when a new load command is added that is required to be * understood by the dynamic linker for the image to execute properly the * LC_REQ_DYLD bit will be or'ed into the load command constant. If the dynamic - * linker sees such a load command it it does not understand will issue a + * linker sees such a load command that it does not understand, it will issue a * "unknown load command required for execution" error and refuse to use the * image. Other load commands without this bit that are not understood will * simply be ignored. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java index a3575aaf05..d077242719 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java @@ -1096,7 +1096,7 @@ public class DyldCacheHeader implements StructConverter { /** * Gets the {@link DyldCacheLocalSymbolsInfo}. * - * @return The {@link DyldCacheLocalSymbolsInfo}. Could be be null if it didn't parse. + * @return The {@link DyldCacheLocalSymbolsInfo}. Could be null if it didn't parse. */ public DyldCacheLocalSymbolsInfo getLocalSymbolsInfo() { return localSymbolsInfo; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java index 6d02f639a1..9f777655e9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/LibObjcOptimization.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -114,7 +114,7 @@ public class LibObjcOptimization implements StructConverter { } /** - * Marks up up this structure in memory + * Marks up this structure in memory * * @param program The {@link Program} * @param space The {@link AddressSpace} diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ReferenceLineDispenser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ReferenceLineDispenser.java index c44f3fe5fd..63585b8193 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ReferenceLineDispenser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ReferenceLineDispenser.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -190,8 +190,8 @@ class ReferenceLineDispenser extends AbstractLineDispenser { buf.append(prefix); } } - //if we already appended a ref the line - //and we are are about to append one more, + //if we already appended a ref to the line + //and we are about to append one more, //then we need the delim if (refsInCurrLine > 0) { buf.append(XREFS_DELIM); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java index 7c47f4d065..6f306a292f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java @@ -114,7 +114,7 @@ public class LibrarySearchPathManager { } /** - * Adds the specified library search path path to the end of the path search list + * Adds the specified library search path {@code path} to the end of the path search list * * @param path the library search path to add * @return true if the path was appended, false if the path was a duplicate diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java index dec5ca036b..a83bf03c3f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java @@ -376,7 +376,7 @@ public abstract class AbstractProgramLoader implements Loader { return fsrl.getName(); } - // If the ByteProvider dosn't have have an FSRL, use the given domainFileName + // If the ByteProvider doesn't have an FSRL, use the given domainFileName return domainFileName; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoadResults.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoadResults.java index ff8b851829..d9b10ec0e6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoadResults.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoadResults.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -53,7 +53,7 @@ public class LoadResults implements Iterable> } /** - * Creates a a new {@link LoadResults} that contains a new {@link Loaded} + * Creates a new {@link LoadResults} that contains a new {@link Loaded} * {@link DomainObject} created from the given parameters. This new {@link Loaded} * {@link DomainObject} is assumed to be the {@link #getPrimary() primary} {@link Loaded} * {@link DomainObject}. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java index 658f845b3d..93b9d01f75 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java @@ -832,7 +832,7 @@ public class PeLoader extends AbstractPeDebugLoader { private Address getILEntryPoint(OptionalHeader optionalHeader) { // Check to see if this binary has a COMDescriptorDataDirectory in it. If so, // it might be a .NET binary, and if it is and only has a managed code entry point - // the value at entry is actually a table index and and row index that we parse in + // the value at entry is actually a table index and a row index that we parse in // the ImageCor20Header class. Use that to create the entry label instead later. DataDirectory[] dataDirectories = optionalHeader.getDataDirectories(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/BrowserCodeUnitFormat.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/BrowserCodeUnitFormat.java index 351308668c..c44f69ae71 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/BrowserCodeUnitFormat.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/BrowserCodeUnitFormat.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -69,7 +69,7 @@ public class BrowserCodeUnitFormat extends CodeUnitFormat { /** * Add a change listener to the underlying format options. When a format change - * occurs the listener may wish to trigger a refresh of of any formatted code units. + * occurs the listener may wish to trigger a refresh of any formatted code units. * @param listener change listener */ public void addChangeListener(ChangeListener listener) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionTagFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionTagFieldFactory.java index 6e3b3066d7..7b52cec879 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionTagFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionTagFieldFactory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,7 +38,7 @@ import ghidra.program.util.ProgramLocation; /** * Generates a text label that lists the function tags for each {@link Function}. The - * label will will appear as part of the FUNCTION group in the field map. + * label will appear as part of the FUNCTION group in the field map. */ public class FunctionTagFieldFactory extends FieldFactory { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MemoryBlockStartFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MemoryBlockStartFieldFactory.java index 457a6082be..e7a261352b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MemoryBlockStartFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MemoryBlockStartFieldFactory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,7 @@ import ghidra.program.util.ProgramLocation; /** * Generates a text label on each {@link CodeUnit} that marks the start of a memory block. The - * label will will appear as part of the PLATE group in the field map. + * label will appear as part of the PLATE group in the field map. */ public class MemoryBlockStartFieldFactory extends FieldFactory { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/multilisting/MultiListingLayoutModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/multilisting/MultiListingLayoutModel.java index feb23ad798..b255717841 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/multilisting/MultiListingLayoutModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/multilisting/MultiListingLayoutModel.java @@ -80,7 +80,7 @@ public class MultiListingLayoutModel implements ListingModelListener, FormatMode /** * Returns the ListingLayoutModel for the i'th program. * @param index the index of program for which to return a listing model - * @return the the ListingLayoutModel for the i'th program. + * @return the ListingLayoutModel for the i'th program. */ public ListingModel getAlignedModel(int index) { return alignedModels[index]; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/features/base/quickfix/TableDataLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/features/base/quickfix/TableDataLoader.java index 03c9510c14..d8ee5d1b6a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/features/base/quickfix/TableDataLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/features/base/quickfix/TableDataLoader.java @@ -34,7 +34,7 @@ public interface TableDataLoader { /** * Loads data into the given accumulator - * @param accumulator the the accumulator for storing table data + * @param accumulator the accumulator for storing table data * @param monitor the {@link TaskMonitor} * @throws CancelledException if the operation is cancelled */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PopupGUIPasswordProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PopupGUIPasswordProvider.java index cbcd5dd180..394bdd418f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PopupGUIPasswordProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PopupGUIPasswordProvider.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import ghidra.formats.gfilesystem.crypto.PasswordDialog.RESULT_STATE; import ghidra.framework.generic.auth.Password; /** - * Pops up up a GUI dialog prompting the user to enter a password for the specified file. + * Pops up a GUI dialog prompting the user to enter a password for the specified file. *

* The dialog is presented to the user when the iterator's hasNext() is called. *

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/GhidraProgramUtilities.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/GhidraProgramUtilities.java index 844cd46bd0..d270000dfc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/GhidraProgramUtilities.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/GhidraProgramUtilities.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,7 @@ public class GhidraProgramUtilities { /** * Returns the current program for the given tool or null if no program is open. - * @param tool the tool get get the current program for + * @param tool the tool get the current program for * @return the current program for the given tool or null if no program is open */ public static Program getCurrentProgram(PluginTool tool) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java index 7dd60b7b7b..8f3c30c140 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java @@ -410,7 +410,7 @@ public class ProgramDiff { * program1 and program2. * @return the initialized memory addresses in common between * program1 and program2. - * The addresses in the this set are derived from program1. + * The addresses in this set are derived from program1. */ public AddressSet getInitializedInCommon() { return pgmMemComp.getInitializedAddressesInCommon(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java index 4f501cc3cd..955c997a49 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -424,7 +424,7 @@ public class ProgramMemoryUtil { * Direct references are only found at addresses that match the indicated alignment. * @param program the program whose memory is to be checked. * @param alignment direct references are to only be found at the indicated alignment in memory. - * @param codeUnit the code unit to to search for references to. + * @param codeUnit the code unit to search for references. * @param monitor a task monitor for progress or to allow canceling. * @return list of addresses referring directly to the toAddress. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java index 606d709550..42745e73e4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java @@ -124,7 +124,7 @@ public abstract class AbstractSelectionNavigationAction extends ToggleDockingAct private void initialize() { // We want to load our state after we have been associated with a DockingWindowManager. - // If the table is displayable, then we are are properly setup... + // If the table is displayable, then we are properly setup... if (table.isDisplayable()) { restoreState(); return; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/ProgramLocationTableRowMapper.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/ProgramLocationTableRowMapper.java index 8f35046a43..f67a3a90fd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/ProgramLocationTableRowMapper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/ProgramLocationTableRowMapper.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,7 +32,7 @@ import docking.widgets.table.*; * and Addresses. *

* This interface is an ExtensionPoint so that once created, they will be ingested automatically - * by Ghidra. Once discovered, these mappers will be used to provide dynamic columns to to + * by Ghidra. Once discovered, these mappers will be used to provide dynamic columns to * tables with row types that match ROW_TYPE. *

* This column is an extension of {@link TableRowMapper} that has knowledge of diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/LocationReferencesPlugin1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/LocationReferencesPlugin1Test.java index 8ca842aa2f..bed134b40e 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/LocationReferencesPlugin1Test.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/navigation/locationreferences/LocationReferencesPlugin1Test.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -71,7 +71,7 @@ public class LocationReferencesPlugin1Test extends AbstractLocationReferencesTes Address otherAddress = addr(0x01008014); // 0x1 ONE; this also has references assertTrue(applyCmd(program, new CreateDataCmd(otherAddress, enoom))); - // this is the address will will use to search + // this is the address we will use to search Address address = addr(0x01008019); // 0x0 ZERO assertTrue(applyCmd(program, new CreateDataCmd(address, enoom))); diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin1Test.java index c1b9925423..396cec4467 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin1Test.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin1Test.java @@ -242,7 +242,7 @@ public class SearchTextPlugin1Test extends AbstractGhidraHeadedIntegrationTest { @Test public void testSearchStringEntry() throws Exception { - // verify that a string string must be entered + // verify that a string must be entered SearchTextDialog dialog = getDialog(); diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symboltree/SymbolTreePlugin1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symboltree/SymbolTreePlugin1Test.java index bae04558c2..461e9a66db 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symboltree/SymbolTreePlugin1Test.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symboltree/SymbolTreePlugin1Test.java @@ -759,7 +759,7 @@ public class SymbolTreePlugin1Test extends AbstractGhidraHeadedIntegrationTest { // // This tests a particular edge case where adding a function inside of a class would cause - // the tree to throw an exception to to an improper child node lookup. This test was + // the tree to throw an exception due to an improper child node lookup. This test was // triggering the exception before the fix. // showSymbolTree(); diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/datatype/DataTypeSelectionDialogTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/datatype/DataTypeSelectionDialogTest.java index 97f7c10314..6508cf43c1 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/datatype/DataTypeSelectionDialogTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/util/datatype/DataTypeSelectionDialogTest.java @@ -595,7 +595,7 @@ public class DataTypeSelectionDialogTest extends AbstractGhidraHeadedIntegration // We are trying to test that the user can type the name of a type (not pick it from the // list) that exists in an open archive *that is not set on the dialog*. The intent is // that if we have to parse the text provided by the user, that we don't automatically - // pick one when it is an an archive that we didn't specify (like the program archive). + // pick one when it is an archive that we didn't specify (like the program archive). // // To test this, start with 3 types in a file archive: foo and a typedef to foo // (foo_typedef) and a pointer to the typedef. diff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java index ccd8e93f47..08578aaa3d 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -55,7 +55,7 @@ public class CParserUtilsTest extends AbstractGenericTest { catch (Throwable t) { return t; } - Assert.fail("Funcion text did not trigger a parse problem: " + function); + Assert.fail("Function text did not trigger a parse problem: " + function); return null;// can't get here } } diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java b/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java index 45cc02fa11..72c27c77c0 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -388,7 +388,7 @@ public class MergeProgram { } catch (Exception e) { - throw new RuntimeException("Exception updating function function", e); + throw new RuntimeException("Exception updating function", e); } } } diff --git a/Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h b/Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h index 7e9d27fad4..0b536ee0e7 100644 --- a/Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h +++ b/Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h @@ -182,7 +182,7 @@ int (__stdcall * GetSectionBlock) ( #pragma region Input compatibility macros -// nothing will parse after this line if the this fails +// nothing will parse after this line if this fails #pragma test for, pragma, with, commas outside parens #pragma region System Family (kernel drivers) with Desktop Family for compat diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm b/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm index 4611186cd2..a48c88689a 100644 --- a/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm +++ b/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm @@ -318,7 +318,7 @@

This will merge the selected sequences into one sequence. For a given bit position in the merged sequence, if all selected sequences agree on that position - the the merge will contain that value, otherwise it will contain a dit in that + the merge will contain that value, otherwise it will contain a dit in that position.

diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartFuncAnalyzer.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartFuncAnalyzer.java index 36ed32067e..9eff360632 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartFuncAnalyzer.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartFuncAnalyzer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,7 +39,7 @@ public class FunctionStartFuncAnalyzer extends FunctionStartAnalyzer { throws CancelledException { // check that the check function later property has been set at the functions start - // before passing the cut down address set to the real search algorithm to to the correct action + // before passing the cut down address set to the real search algorithm to take the correct action AddressSet potentialPreMatches = getOrCreatePotentialMatchPropertyMap(program).getAddressSet(); set = set.intersect(potentialPreMatches); diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/MemoryByteBlock.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/MemoryByteBlock.java index 3a94186076..55cd32c00b 100644 --- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/MemoryByteBlock.java +++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/MemoryByteBlock.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -286,7 +286,7 @@ public class MemoryByteBlock implements ByteBlock { * it should return 0. A natural alignment only exists if there is some underlying indexing * structure that isn't based at 0. For example, if the underlying structure is address based * and the starting address is not 0, then the natural alignment is the address offset mod the - * radix (if the starting address is 10 and the radix is 4, then then the alignment is 2)). + * radix (if the starting address is 10 and the radix is 4, then the alignment is 2)). */ @Override public int getAlignment(int radix) { diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/ByteBlock.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/ByteBlock.java index 9f3f3e7cbb..12cb8656d1 100644 --- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/ByteBlock.java +++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/format/ByteBlock.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -151,7 +151,7 @@ public interface ByteBlock { * there is some underlying indexing structure that isn't based at 0. For example, * if the underlying structure is address based and the starting address is not 0, * then the natural alignment is the address offset mod the radix (if the starting - * address is 10 and the radix is 4, then then the alignment is 2)). + * address is 10 and the radix is 4, then the alignment is 2)). */ public int getAlignment(int radix); } diff --git a/Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/Pinning.java b/Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/Pinning.java index 205db313ad..b6e255e13b 100755 --- a/Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/Pinning.java +++ b/Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/graphanalysis/Pinning.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -692,7 +692,7 @@ public class Pinning { } /** - * Determine if a token should be be filtered from match display. + * Determine if a token should be filtered from match display. * Some tokens like "," and " " may be attached to matchable operations but can * clutter the display if they are highlighted for a match. * @param token is the specific token to check diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java index 2a3da5b4fa..1a05567e36 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java @@ -198,7 +198,7 @@ public class ExtendedFlatProgramAPI extends FlatProgramAPI { * valid but not created, create it * @param address the given address * @param allowNullFunctionPointer if true, allow null pointers as a valid function pointer - * @return true if it is a functin pointer, else returns false + * @return true if it is a function pointer, else returns false * @throws CancelledException if cancelled */ public boolean isFunctionPointer(Address address, boolean allowNullFunctionPointer) diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java index 4d6ea41d53..e97a74ad33 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java @@ -1256,7 +1256,7 @@ public class RecoveredClassHelper { /** * temporarily change the function signature of the given constructor or destructor to replace - * any empty structure with same size undefined datatype and to also remove the functin from + * any empty structure with same size undefined datatype and to also remove the function from * its namespace to remove the empty structure from the this param. This is so that the * class member data calculations are made without bad info * @param function the given function @@ -7863,7 +7863,7 @@ public class RecoveredClassHelper { // to the purecall function and we don't want to rename that function to the new name // since anyone calling purecall will call it if (!componentFunctionDefinition.getName().contains("purecall")) { - // otherwise update data type with new new signature + // otherwise update data type with the new signature FunctionDefinition changedFunctionDefinition = updateFunctionDefinition(componentFunctionDefinition, newFunctionDefinition); diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/action.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/action.hh index 6cd69a3026..e929dbb98e 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/action.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/action.hh @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -136,7 +136,7 @@ public: /// \brief A group of actions (generally) applied in sequence /// -/// This is a a list of Action objects, which are usually applied in sequence. +/// This is a list of Action objects, which are usually applied in sequence. /// But the behavior properties of each individual Action may affect this. /// Properties (like rule_repeatapply) may be put directly to this group /// that also affect how the Actions are applied. diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/address.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/address.hh index 6474e8bf32..5c42208b89 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/address.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/address.hh @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,7 +16,7 @@ /// \file address.hh /// \brief Classes for specifying addresses and other low-level constants /// -/// All addresses are absolute and there are are no registers in CPUI. However, +/// All addresses are absolute and there are no registers in CPUI. However, /// all addresses are prefixed with an "immutable" pointer, which can /// specify a separate RAM space, a register space, an i/o space etc. Thus /// a translation from a real machine language will typically simulate registers diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc index 494d160db8..e71bf7ad44 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc @@ -1166,7 +1166,7 @@ ProtoModel *Architecture::createUnknownModel(const string &modelName) return model; } -/// This looks for the \ tag and and sets configuration +/// This looks for the \ tag and sets configuration /// parameters based on it. /// \param store is the document store holding the tag void Architecture::parseProcessorConfig(DocumentStorage &store) diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/block.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/block.cc index f536f78e12..a4b2029d3c 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/block.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/block.cc @@ -398,7 +398,7 @@ bool FlowBlock::dominates(const FlowBlock *subBlock) const /// We assume the given block has 2 out-edges and that \b this block is immediately reached by /// one of these two edges. Some condition holds when traversing the out-edge to \b this, and the complement /// of the condition holds for traversing the other out-edge. We verify that the condition holds for -/// this entire block. More specifically, we check that that there is no path to \b this through the +/// this entire block. More specifically, we check that there is no path to \b this through the /// sibling edge, where the complement of the condition holds (unless we loop back through the conditional block). /// \param cond is the conditional block with 2 out-edges /// \return \b true if the condition holds for this block @@ -3479,7 +3479,7 @@ void BlockSwitch::addCase(FlowBlock *switchbl,FlowBlock *bl,uint4 gt) void BlockSwitch::grabCaseBasic(FlowBlock *switchbl,const vector &cs) { - vector casemap(switchbl->sizeOut(),-1); // Map from from switchtarget's outindex to position in caseblocks + vector casemap(switchbl->sizeOut(),-1); // Map from switchtarget's outindex to position in caseblocks caseblocks.clear(); for(int4 i=1;i::iterator start,list::iterator end); - BlockTrace *selectBadEdge(void); ///< Select the the most likely unstructured edge from active BlockTraces + BlockTrace *selectBadEdge(void); ///< Select the most likely unstructured edge from active BlockTraces void insertActive(BlockTrace *trace); ///< Move a BlockTrace into the \e active category void removeActive(BlockTrace *trace); ///< Remove a BlockTrace from the \e active category bool checkOpen(BlockTrace *trace); ///< Check if we can push the given BlockTrace into its next node diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/constseq.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/constseq.cc index d9a4f03216..d81f38d851 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/constseq.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/constseq.cc @@ -177,8 +177,8 @@ uint4 ArraySequence::selectStringCopyFunction(int4 &index) /// \brief Set-up for recovering COPY ops into a memory range, given a Symbol and an Address being COPYed into /// /// The SymbolEntry and Address are passed in, with an expected data-type. Check if there is an array -/// of the data-type within the Symbol, and if so, initialize the memory range for the the sequence. -/// Follow on with gathering PcodeOps and testing if the sequence is viable. If not, the the size the memory +/// of the data-type within the Symbol, and if so, initialize the memory range for the sequence. +/// Follow on with gathering PcodeOps and testing if the sequence is viable. If not, the size of the memory /// range will be set to zero. /// \param fdata is the function containing the root COPY /// \param ct is the specific data-type for which there should be an array diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc index 6a07f66f12..c6529baea5 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/database.cc @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -61,7 +61,7 @@ SymbolEntry::SymbolEntry(Symbol *sym) /// is set to \e invalid, and the \b hash becomes the primary location information. /// \param sym is the underlying Symbol /// \param exfl are the Varnode flags associated with the storage location -/// \param h is the the hash +/// \param h is the hash /// \param off if the offset into the Symbol for this (piece of) storage /// \param sz is the size in bytes of this (piece of) storage /// \param rnglist is the set of code addresses where \b this SymbolEntry represents the Symbol diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/database.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/database.hh index 541dabbc9c..ab13b02522 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/database.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/database.hh @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -713,7 +713,7 @@ public: /// \brief Restore attributes for \b this from a parent element that is not a Scope /// - /// Attributes are read from the (already opened) element, prior to reading reading the + /// Attributes are read from the (already opened) element, prior to reading the /// \ element specific to \b this Scope /// \param decoder is the stream decoder virtual void decodeWrappingAttributes(Decoder &decoder) {} diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc index db64004620..cafce3f7ba 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc @@ -206,7 +206,7 @@ bool ParamEntry::containedBy(const Address &addr,int4 sz) const return (entryoff <= rangeoff); } -/// If \b this a a \e join, each piece is tested for intersection. +/// If \b this is a \e join, each piece is tested for intersection. /// Otherwise, \b this, considered as a single memory, is tested for intersection. /// \param addr is the starting address of the given memory range to test against /// \param sz is the number of bytes in the given memory range diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh index eb4c4f4ce8..b5c6750965 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh @@ -1642,7 +1642,7 @@ class FuncCallSpecs : public FuncProto { PcodeOp *op; ///< Pointer to CALL or CALLIND instruction string name; ///< Name of function if present Address entryaddress; ///< First executing address of function - Funcdata *fd; ///< The Funcdata object for the called functon (if known) + Funcdata *fd; ///< The Funcdata object for the called function (if known) int4 effective_extrapop; ///< Working extrapop for the CALL uintb stackoffset; ///< Relative offset of stack-pointer at time of this call int4 stackPlaceholderSlot; ///< Slot containing temporary stack tracing placeholder (-1 means unused) diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc index 08b4037e08..65116b18f0 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/funcdata_varnode.cc @@ -1724,7 +1724,7 @@ void Funcdata::prepareThisPointer(void) return; // Data-type will be obtained directly from symbol } - // Its possible that a recommendation for the "this" pointer has already been been collected. + // It's possible that a recommendation for the "this" pointer has already been collected. // Currently the only type recommendations are for the "this" pointer. If there any, it is for "this" if (localmap->hasTypeRecommendations()) return; diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc index 73ce97c0c2..6861f4851e 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc @@ -1083,7 +1083,7 @@ bool Heritage::discoverIndexedStackPointers(AddrSpace *spc,vector &fr // If there were no traversals (of non-constant ADD or MULTIEQUAL) then the // pointer is equal to the stackpointer plus a constant (through an indirect is possible) // This will likely get resolved in the next heritage pass, but we leave the - // spacebaseptr mark on, so that that the indirects don't get removed + // spacebaseptr mark on, so the indirects don't get removed fd->opMarkSpacebasePtr(op); } } diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc index 4629d38155..c416820055 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/merge.cc @@ -801,7 +801,7 @@ void Merge::collectInputs(HighVariable *high,vector &oplist,PcodeOp } } -/// \brief Snip instances of the output of an INDIRECT that are also inputs to to the underlying PcodeOp +/// \brief Snip instances of the output of an INDIRECT that are also inputs to the underlying PcodeOp /// /// Examine the output HighVariable for the given INDIRECT op. Varnode instances (or pieces) that are also /// inputs to the underlying PcodeOp causing the INDIRECT are snipped by creating a new COPY op from the diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/prettyprint.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/prettyprint.hh index da60367503..9f6ac1b999 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/prettyprint.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/prettyprint.hh @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -440,7 +440,7 @@ public: /// \brief Set a pending print callback /// - /// The callback will be issued prior to the the next call to tagLine() unless + /// The callback will be issued prior to the next call to tagLine() unless /// a the method cancelPendingPrint() is called first. /// \param pend is the callback to be issued void setPendingPrint(PendPrint *pend) { pendPrint = pend; } diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh index d6ed9931b0..e1fa73c224 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/printc.hh @@ -361,7 +361,7 @@ public: /// /// When a variable has TypePointerRel as its data-type, PTRSUB acts relative to the \e parent /// data-type. We print a specific token to indicate this relative shift is happening. -/// \param op is is the PTRSUB op +/// \param op is the PTRSUB op inline void PrintC::pushTypePointerRel(const PcodeOp *op) { diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc index 893e81b001..4613c6002e 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -200,7 +200,7 @@ CircleRange::CircleRange(bool val) /// A size specifies the number of bytes (*8 to get number of bits) in the mask. /// The stride is assumed to be 1. -/// \param val is is the single value +/// \param val is the single value /// \param size is the size of the mask in bytes CircleRange::CircleRange(uintb val,int4 size) @@ -228,7 +228,7 @@ void CircleRange::setRange(uintb lft,uintb rgt,int4 size,int4 stp) /// A size specifies the number of bytes (*8 to get number of bits) in the mask. /// The stride is assumed to be 1. -/// \param val is is the single value +/// \param val is the single value /// \param size is the size of the mask in bytes void CircleRange::setRange(uintb val,int4 size) diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc index 4720ed6344..2b4a9474e5 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc @@ -6176,7 +6176,7 @@ bool AddTreeState::checkTerm(Varnode *vn,uint8 treeCoeff) /// Recursively walk the sub-tree from the given root. /// Terms that are a \e multiple of the base data-type size are accumulated either in -/// the the sum of constant multiples or the container of non-constant multiples. +/// the sum of constant multiples or the container of non-constant multiples. /// Terms that are a \e non-multiple are accumulated either in the sum of constant /// non-multiples or the container of non-constant non-multiples. The constant /// non-multiples are counted twice, once in the sum, and once in the container. diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.hh index a1ecb1531f..e4c1c4e32e 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.hh @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,7 +42,7 @@ protected: /// \brief String data (a sequence of bytes) stored by StringManager class StringData { public: - bool isTruncated; ///< \b true if the the string is truncated + bool isTruncated; ///< \b true if the string is truncated vector byteData; ///< UTF8 encoded string data }; map stringMap; ///< Map from address to string data diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc index c0deb4ca80..42d185d7c8 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc @@ -2582,7 +2582,7 @@ void SplitDatatype::buildOutConcats(Varnode *rootVn,PcodeOp *previousOp,vector - Many of the actions have have a key binding, which, if it exists, will be listed in the pop-up menu. + Many of the actions have a key binding, which, if it exists, will be listed in the pop-up menu. If the key binding is used to activate the action, local context is determined by the current cursor position. Key bindings can be reassigned from the Key Bindings diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html index c9ebf1d1ab..0d22fa6583 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html @@ -553,7 +553,7 @@ variable or operation affected.

- Many of the actions have have a key binding, which, if it exists, will be listed in the pop-up menu. + Many of the actions have a key binding, which, if it exists, will be listed in the pop-up menu. If the key binding is used to activate the action, local context is determined by the current cursor position. Key bindings can be reassigned from the Key Bindings diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java index a2d586f358..25a3d543b1 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java @@ -267,7 +267,7 @@ public class DecompileOptions { private final static String MAXWIDTH_OPTIONSTRING = "Display.Maximum characters in a code line"; private final static String MAXWIDTH_OPTIONDESCRIPTION = - "Maximum number of characters allowed per line before before line breaks are forced."; + "Maximum number of characters allowed per line before line breaks are forced."; private final static int MAXWIDTH_OPTIONDEFAULT = 100; // Must match EmitPrettyPrint::resetDefaultsPrettyPrint private int maxwidth; diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/TaintSliceTreeProvider.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/TaintSliceTreeProvider.java index 69baf015ba..1a9688fb7e 100644 --- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/TaintSliceTreeProvider.java +++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/TaintSliceTreeProvider.java @@ -717,7 +717,7 @@ public class TaintSliceTreeProvider extends ComponentProviderAdapter /** * NB: This is key as well. * - * this is called in the doSetFunctio nmethod + * this is called in the doSetFunction method */ private void doUpdate() { updateIncomingReferences(currentFunction); diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java index 5f4d4c7ab9..04ab3ff9d9 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -399,7 +399,6 @@ public class MachoPrelinkFileSystem extends GFileSystemBase implements GFileSyst // // if we failed to parse the PRELINK XML file, // then look for the kmod_info structure in each KEXT file - // and use use the // for (long machoHeaderOffset : machoHeaderOffsets) { if (monitor.isCancelled()) { diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sparseimage/SparseImageDecompressor.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sparseimage/SparseImageDecompressor.java index 93a2f2f6dc..5bfd734ec5 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sparseimage/SparseImageDecompressor.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/sparseimage/SparseImageDecompressor.java @@ -127,7 +127,7 @@ public class SparseImageDecompressor { } /** - * Writes a chunk of blocks are are zero filled. + * Writes a chunk of blocks that are zero filled. * * @param blocks number of blocks to write * @param monitor {@link TaskMonitor} to watch @@ -199,7 +199,7 @@ public class SparseImageDecompressor { } /** - * Writes a chunk of blocks are are read from the source file. + * Writes a chunk of blocks that are read from the source file. * * @param blocks number of blocks to copy * @param monitor {@link TaskMonitor} to monitor diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html index c990795825..c4d919975b 100644 --- a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html +++ b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html @@ -906,7 +906,7 @@ the scroll wheel was used to zoom. Now there is an option to restore that behavior, the Scroll Wheel Pans option. When this option is on, you can zoom by holding the Control key (Command key on the Mac) while using the scroll - wheel. Alternatively, you can move the graph left to right using the mouse while while + wheel. Alternatively, you can move the graph left to right using the mouse while holding Control-Alt.

The satellite viewer may also be used to move the primary graphs view by dragging and diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColSegmentList.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColSegmentList.java index 15eaec964c..5e8b192835 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColSegmentList.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColSegmentList.java @@ -63,7 +63,7 @@ public class ColSegmentList { } /** - * Checks if the the range of y values in a given column segment list intersects the + * Checks if the range of y values in a given column segment list intersects the * range of y values in this column segment. * @param other the column segment list to compare * @return true if they intersect ranges. diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColumnSegment.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColumnSegment.java index f839a19f47..601e7c8a33 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColumnSegment.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/ColumnSegment.java @@ -101,7 +101,7 @@ public class ColumnSegment extends EdgeSegment { // // NOTE: Segments are compared by following the next or previous segments until one of the // segments definitively determines the order. When comparing segments in a particular - // direction, is is important not to directly call the compareTo methods as that could result + // direction, it is important not to directly call the compareTo methods as that could result // in an infinite loop. Instead, when comparing in a particular direction, just directly // use the appropriate direction comparison so that it will follow that direction until // it finds a difference or it simply returns 0, in which case the original to @@ -127,7 +127,7 @@ public class ColumnSegment extends EdgeSegment { // NOTE: Segments are compared by following the next or previous segments until one of the // segments definitively determines the order. When comparing segments in a particular - // direction, is is important not to directly call the compareTo methods as that could result + // direction, it is important not to directly call the compareTo methods as that could result // in an infinite loop. Instead, when comparing in a particular direction, just directly // use the appropriate direction comparison so that it will follow that direction until // it finds a difference or it simply returns 0, in which case the original diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/OrthogonalEdgeRouter.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/OrthogonalEdgeRouter.java index 2b070fc086..20a1b904aa 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/OrthogonalEdgeRouter.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/OrthogonalEdgeRouter.java @@ -115,7 +115,7 @@ public class OrthogonalEdgeRouter - * Column sizing is more complicated. The width of any column is going to be the the max of either + * Column sizing is more complicated. The width of any column is going to be the max of either * 1) vertices that half extend from the left + the thickness of edges that extend the right, OR * 2) vertices that half extend from the right + the thickness of edges the extend from the left. * Also, column padding is applied differently. For columns, padding is not just added to the * column width like in rows. Instead, it acts as a minimum "edge thickness". In other words if the * edge thickness is less than the padding, the edge thickness doesn't make the gaps bigger. Only if - * the edge thickness is greater the the column padding, then it determines the gap and the + * the edge thickness is greater than the column padding, then it determines the gap and the * column padding contributes nothing. * * @param the vertex type diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/RowSegment.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/RowSegment.java index edbf7e40a8..5bd9468bbf 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/RowSegment.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/layout/flowchart/RowSegment.java @@ -97,7 +97,7 @@ public class RowSegment extends EdgeSegment { // // NOTE: Segments are compared by following the next or previous segments until one of the // segments definitively determines the order. When comparing segments in a particular - // direction, is is important not to directly call the compareTo methods as that could result + // direction, it is important not to directly call the compareTo methods as that could result // in an infinite loop. Instead, when comparing in a particular direction, just directly // use the appropriate direction comparison so that it will follow that direction until // it finds a difference or it simply returns 0, in which case the original to @@ -123,7 +123,7 @@ public class RowSegment extends EdgeSegment { // NOTE: Segments are compared by following the next or previous segments until one of the // segments definitively determines the order. When comparing segments in a particular - // direction, is is important not to directly call the compareTo methods as that could result + // direction, it is important not to directly call the compareTo methods as that could result // in an infinite loop. Instead, when comparing in a particular direction, just directly // use the appropriate direction comparison so that it will follow that direction until // it finds a difference or it simply returns 0, in which case the original to diff --git a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java index 422e6744de..997db3fa94 100644 --- a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java +++ b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -1405,7 +1405,7 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte assertVerticesRemoved(graph, ungroupedVertices); assertEdgesRemoved(graph, ungroupedEdges); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices(functionGraph, ungroupedVertices, diff --git a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices1Test.java b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices1Test.java index 793f4d9906..70141e5569 100644 --- a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices1Test.java +++ b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices1Test.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -84,7 +84,7 @@ public class FunctionGraphGroupVertices1Test extends AbstractFunctionGraphTest { group(ungroupedVertices); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); @@ -202,7 +202,7 @@ public class FunctionGraphGroupVertices1Test extends AbstractFunctionGraphTest { group(ungroupedVertices); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); @@ -264,7 +264,7 @@ public class FunctionGraphGroupVertices1Test extends AbstractFunctionGraphTest { //printEdges(ungroupedEdges); group(ungroupedVertices); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex innerGroupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); @@ -408,7 +408,7 @@ public class FunctionGraphGroupVertices1Test extends AbstractFunctionGraphTest { assertVerticesRemoved(graph, ungroupedVertices); assertEdgesRemoved(graph, ungroupedEdges); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); @@ -861,7 +861,7 @@ public class FunctionGraphGroupVertices1Test extends AbstractFunctionGraphTest { assertVerticesRemoved(graph, ungroupedVertices); assertEdgesRemoved(graph, ungroupedEdges); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices(functionGraph, ungroupedVertices, diff --git a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices2Test.java b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices2Test.java index 532b906ad2..deb3586b5e 100644 --- a/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices2Test.java +++ b/Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/FunctionGraphGroupVertices2Test.java @@ -60,7 +60,7 @@ public class FunctionGraphGroupVertices2Test extends AbstractFunctionGraphTest { assertVerticesRemoved(graph, ungroupedVertices); assertEdgesRemoved(graph, ungroupedEdges); - // -1 because one one of the edges was between two of the vertices being grouped + // -1 because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); @@ -89,7 +89,7 @@ public class FunctionGraphGroupVertices2Test extends AbstractFunctionGraphTest { group(ungroupedVertices); - // (size - 1) because one one of the edges was between two of the vertices being grouped + // (size - 1) because one of the edges was between two of the vertices being grouped int expectedGroupedEdgeCount = ungroupedEdges.size() - 1; GroupedFunctionGraphVertex groupedVertex = validateNewGroupedVertexFromVertices( functionGraph, ungroupedVertices, expectedGroupedEdgeCount); diff --git a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/hash/MessageDigestFidHasher.java b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/hash/MessageDigestFidHasher.java index 3bb31fce3f..4571306018 100644 --- a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/hash/MessageDigestFidHasher.java +++ b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/hash/MessageDigestFidHasher.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -164,7 +164,7 @@ public class MessageDigestFidHasher implements FidHasher { specificCount += 1; // Count the fact that value is used in hash } } - // Mix scalar value to get more bit diversity, add in in a commutative way + // Mix scalar value to get more bit diversity, add in a commutative way specificUpdate = specificUpdate + ((int) val + 1234567) * 67999; fullUpdate += 0xfeeddead; // Scalar value is never used in full hash, indicate scalar was present } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangUtils.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangUtils.java index f5b6a9b740..5f0bb5391d 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangUtils.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMangUtils.java @@ -174,7 +174,7 @@ public class MDMangUtils { /** * Given a number in string format as input, creates the standardized local namespace - * node string of the format {@code __l2} where {@code 2} is an an example number. + * node string of the format {@code __l2} where {@code 2} is an example number. * @param localNumber the input string * @return the standardized local namespace component */ diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMang_README.txt b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMang_README.txt index 63908d4b70..315ea03a2f 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMang_README.txt +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDMang_README.txt @@ -47,13 +47,13 @@ MicrosoftDmang Development and Testing Overview: that requires 13 other changes with numerous tests moving back and forth between pass and fail states until I finally settle at the state where all previously passing tests pass again and I've gotten one additional failing test to now pass. This is not an unrealistic description, - and we have come a very long way, which has allowed to to focus more now on cleaning up the + and we have come a very long way, which has allowed us to focus more now on cleaning up the code, but there are some areas where the code looks like spaghetti. This is primarily in the section of "modified" types. Tests have also been continually added to either provide the data from a new fuzzing experience or to create additional bounds on a new test case. Individual tests are found in MDMangBaseTest. There are also tests in the MDMangListTest, which has various mechanisms for pulling test data from a file. One of these has - mangled/demangled pairs, others might might just have mangled symbols only, but we are looking + mangled/demangled pairs, others might just have mangled symbols only, but we are looking for cases where the demangler could "blow up." These file tests often provide a data record for creating a new individual test. There is also MDMangBaseTest, which uses MDMangBaseTestSuite as the junit-4 testSuite, but @@ -100,7 +100,7 @@ MicrosoftDmang Architecture: representation. All parsable items derive from MDParsableItem. MDObject: This class represents a fully presentable symbol as would be expected to be found in - a list of symbols for a binary. It contains a name and and MDTypeinfo. An MDObject could + a list of symbols for a binary. It contains a name and MDTypeinfo. An MDObject could probably be an abstract class (not one at the moment). The MDObjectCPP (below) is the primary derived object of interest for us. Other than MDObjectC, the others (MDObjectBracket and MDObjectCodeView) may or may not be true representations of the MSFT architecture. (The diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDParsableItem.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDParsableItem.java index ba13dbd1e3..0d04608aec 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDParsableItem.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/MDParsableItem.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -99,7 +99,7 @@ public abstract class MDParsableItem { public final String toString() { StringBuilder builder = new StringBuilder(); insert(builder); - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); return builder.toString(); } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDArrayBasicType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDArrayBasicType.java index 5aa8350813..23031bde9a 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDArrayBasicType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDArrayBasicType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -65,7 +65,7 @@ public class MDArrayBasicType extends MDModifierType { ((MDFunctionType) refType).setFromModifier(); } dt.insert(builder); - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); dmang.appendString(builder, arrayBuilder.toString()); } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDBasedAttribute.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDBasedAttribute.java index 9f615f9e0a..d91a32eead 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDBasedAttribute.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDBasedAttribute.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import mdemangler.naming.MDQualifiedName; // ***********NOTE: For "based5 bug" or "basedptr"************** // // Any modifier type that has a case '5' (representing that the -// Modifier location is based on a a pointer location ("basedptr") +// Modifier location is based on a pointer location ("basedptr") // is currently invalid in the Microsoft model. There is a bug // (my words for it) where it seem that in this case, the notation // of an invalid option here is noted with a null character ('\0') diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDDataRightReferenceType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDDataRightReferenceType.java index c5249032dd..1a0c63a505 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDDataRightReferenceType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDDataRightReferenceType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -53,7 +53,7 @@ public class MDDataRightReferenceType extends MDModifierType { else { cvMod.insert(builder); } - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); } } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDModifierType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDModifierType.java index e9702f14b5..5d0d1d3b54 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDModifierType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDModifierType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -200,7 +200,7 @@ public abstract class MDModifierType extends MDDataType { protected void insertCVMod(StringBuilder builder) { cvMod.insert(builder); - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); // 20170714 } @@ -266,7 +266,7 @@ public abstract class MDModifierType extends MDDataType { // if (!isArray()) { //20170523 insertCVMod(builder); // } - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. // 20170714 dmang.cleanOutput(builder); // 20170605 insertArrayString(builder); //only available for "data" // refType diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDPointerType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDPointerType.java index 5d8001cf09..82e3cf93eb 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDPointerType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDPointerType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,7 +51,7 @@ public class MDPointerType extends MDModifierType { else { cvMod.insert(builder); } - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); } } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDReferenceType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDReferenceType.java index 2cac310d7a..2bf8022539 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDReferenceType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/datatype/modifier/MDReferenceType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -56,7 +56,7 @@ public class MDReferenceType extends MDModifierType { else { cvMod.insert(builder); } - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(builder); } } diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/functiontype/MDFunctionType.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/functiontype/MDFunctionType.java index 7124e00585..82ff3f93bd 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/functiontype/MDFunctionType.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/functiontype/MDFunctionType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -143,7 +143,7 @@ public class MDFunctionType extends MDType { if (based != null) { based.append(conventionBuilder); } - // Following to to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. + // Following is to clean the Based5 "bug" if seen. See comments in MDBasedAttribute. dmang.cleanOutput(conventionBuilder); dmang.insertString(builder, conventionBuilder.toString()); //This logic moved to MdSpecialName, so that we can get a qualified name with the diff --git a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/object/MDObjectCPP.java b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/object/MDObjectCPP.java index fc8584bc6c..423065c7fd 100644 --- a/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/object/MDObjectCPP.java +++ b/Ghidra/Features/MicrosoftDmang/src/main/java/mdemangler/object/MDObjectCPP.java @@ -211,7 +211,7 @@ public class MDObjectCPP extends MDObject { /** * Constructor for {@link MDHashedObject} - * @param dmang The {@link MDMang} for which the work is performed and from from which + * @param dmang The {@link MDMang} for which the work is performed and from which * the information is parsed. */ public MDHashedObject(MDMang dmang) { diff --git a/Ghidra/Features/PDB/src/global/docs/README_PDB.html b/Ghidra/Features/PDB/src/global/docs/README_PDB.html index 878659e821..8fa572b43e 100644 --- a/Ghidra/Features/PDB/src/global/docs/README_PDB.html +++ b/Ghidra/Features/PDB/src/global/docs/README_PDB.html @@ -74,7 +74,7 @@ of Visual Studio and DIA SDK.

Ensure you have msdia140.dll on your computer

First, check to see if you already have the msdia140.dll library installed on your system. -It is generally installed installed with Microsoft Visual Studio 2017 when C/C++ development support +It is generally installed with Microsoft Visual Studio 2017 when C/C++ development support is included ( may be Community, Professional, or other VS 2017 distribution package name). 

         C:\Program Files (x86)\Microsoft Visual Studio\2017\\DIA SDK\bin\amd64\msdia140.dll
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/ApplyStackVariables.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/ApplyStackVariables.java
index 89d2f2dcd0..7ac43c96cf 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/ApplyStackVariables.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/ApplyStackVariables.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -222,7 +222,7 @@ class ApplyStackVariables {
 			return null;
 		}
 		if (wrappedDataType.isZeroLengthArray()) {
-			log.appendMsg("PDB", "Zero length array not supported for for " + member.kind + ": " +
+			log.appendMsg("PDB", "Zero length array not supported for " + member.kind + ": " +
 				member.memberDataTypeName);
 			return null;
 		}
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
index f52f50a374..b355be7c8d 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbLog.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -181,7 +181,7 @@ public class PdbLog {
 
 	/**
 	 * Returns the {@link Writer} for logging
-	 * @return a {@link Writer} for for logging
+	 * @return a {@link Writer} for logging
 	 */
 	private static Writer getWriter() throws IOException {
 		return enabled ? getFileWriter() : getNullWriter();
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/SymbolHashRecord.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/SymbolHashRecord.java
index 43b44cc1ee..32ef2ce3bd 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/SymbolHashRecord.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/SymbolHashRecord.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@ public class SymbolHashRecord implements Comparable {
 	public static int RECORD_SIZE = 8;
 
 	/**
-	 * Parses the contents of of this record.
+	 * Parses the contents of this record.
 	 * @param reader {@link PdbByteReader} from which to deserialize the data.
 	 * @throws PdbException Upon not enough data left to parse.
 	 */
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterface.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterface.java
index f0e6741cd7..9e06aa7d77 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterface.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterface.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -222,7 +222,7 @@ public abstract class TypeProgramInterface implements TPI {
 	 * {@link TypeProgramInterface}.
 	 * 

 	 * Note: not all values of this class get initialized by this method.
-	 * @param pdb {@link AbstractPdb} that owns this this class
+	 * @param pdb {@link AbstractPdb} that owns this class
 	 * @param typeIndexMin the IndexMin to set/use
 	 * @param typeIndexMaxExclusive one greater than the MaxIndex to set/use
 	 */
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterfaceParser.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterfaceParser.java
index aff19fd565..c4630e0a53 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterfaceParser.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/TypeProgramInterfaceParser.java
@@ -33,7 +33,7 @@ public class TypeProgramInterfaceParser {
 
 	public static final int TI40_ID = 19950410;    // 0x01306b4a
 	public static final int TI41_ID = 19951122;    // 0x01306e12
-	public static final int TI42_ID = 19951204;    // 0x01360e64 not in MSFT doc: in in MFCS42.PDB
+	public static final int TI42_ID = 19951204;    // 0x01360e64 not in MSFT doc: in MFCS42.PDB
 	public static final int TI50DEP_ID = 19960307; // 0x013091f3
 	public static final int TI50_ID = 19961031;    // 0x013094c7
 	public static final int TI70_ID = 19990903;    // 0x01310977
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
index 3342568686..866bbba492 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
@@ -77,7 +77,7 @@ import ghidra.util.task.TaskMonitor;
  * The file directory is stored in stream 0, which has its information persisted in
  *  the header as described above.  However, for the newest format, the page (pointed
  *  to in the header) for the directory stream has an extra level of indirection.  The
- *  page contains page numbers, whose pages contain contain page numbers for the
+ *  page contains page numbers, whose pages contain page numbers for the
  *  directory stream.  Note that the page numbers listed on any of these pages have
  *  the following format on disk:
  * 
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf.java
index 69ddff93ea..274173c0dd 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf.java
@@ -76,7 +76,7 @@ import ghidra.util.task.TaskMonitor;
  * The file directory is stored in stream 0, which has its information persisted in
  *  the header as described above.  However, for the newest format, the page (pointed
  *  to in the header) for the directory stream has an extra level of indirection.  The
- *  page contains page numbers, whose pages contain contain page numbers for the
+ *  page contains page numbers, whose pages contain page numbers for the
  *  directory stream.  Note that the page numbers listed on any of these pages have
  *  the following format on disk:
  * 
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractIndirectVirtualBaseClassMsType.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractIndirectVirtualBaseClassMsType.java
index 0e14d3447d..af0fc12f33 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractIndirectVirtualBaseClassMsType.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractIndirectVirtualBaseClassMsType.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@ public abstract class AbstractIndirectVirtualBaseClassMsType extends AbstractMsT
 	}
 
 	/**
-	 * Returns the offset of the base base pointer within the class.
+	 * Returns the offset of the base pointer within the class.
 	 * @return the offset;
 	 */
 	public BigInteger getBasePointerOffset() {
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractVirtualBaseClassMsType.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractVirtualBaseClassMsType.java
index f11f4ffceb..0da91992cb 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractVirtualBaseClassMsType.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/type/AbstractVirtualBaseClassMsType.java
@@ -62,7 +62,7 @@ public abstract class AbstractVirtualBaseClassMsType extends AbstractMsType impl
 	}
 
 	/**
-	 * Returns the offset of the base base pointer within the class.
+	 * Returns the offset of the base pointer within the class.
 	 * @return the offset
 	 */
 	public BigInteger getBasePointerOffset() {
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractBlockContextApplier.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractBlockContextApplier.java
index 855662e679..cb79aaea20 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractBlockContextApplier.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/AbstractBlockContextApplier.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -139,7 +139,7 @@ public abstract class AbstractBlockContextApplier extends MsSymbolApplier
 			}
 		}
 //		if (foundUnsupported) {
-//			pdbLogAndInfoMessage(this, "One or or more non-nestable symbols skipped for: " + name);
+//			pdbLogAndInfoMessage(this, "One or more non-nestable symbols skipped for: " + name);
 //		}
 
 		// comments
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java
index c921cc85ae..cab6e95b5a 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CompositeTypeApplier.java
@@ -186,9 +186,9 @@ public class CompositeTypeApplier extends AbstractComplexTypeApplier {
 		// Situation is where a parent has a vftptr with a vtshape with one entry.  The child
 		// class defines an additional virtual method, and there is an actual table in memory with
 		// with the appropriate mangled label for this class that has two entries, but the list
-		// here does not have the vftptr, and I believe it was due to the fact that new new method
+		// here does not have the vftptr, and I believe it was due to the fact that the new method
 		// was never called in the code.  Thus... do not count on getting a vtshape in this
-		// situation.  Note that a record of a an appropriate two-entry vtshape was found right
+		// situation.  Note that a record of an appropriate two-entry vtshape was found right
 		// before the class definition, but no pointer to it was created or referred to in the
 		// field list.
 		addVftPtrs(composite, classType, lists.vftPtrs(), type, myMembers);
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
index 7b20795e06..8e27fd2075 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
@@ -1858,7 +1858,7 @@ public class CppCompositeType {
 		//  hierarchy direct virtual bases can intermingled with the indirect virtual bases.
 		// We essentially walk the hierarchy of direct non-virtual bases and direct virtual bases
 		//  to craft our own list of indirect virtual bases to try to help with this, and it seems
-		//  to help a little.  We only use use the PDB-provided indirect virtual bases for when
+		//  to help a little.  We only use the PDB-provided indirect virtual bases for when
 		//  finding the offset of the base using the vbt (when we have a real vbt in program
 		//  memory).
 		// This algorithm is meant to try its best to help when we don't have a vbt in program
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
index 4e2f76589e..c75fe7fb80 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
@@ -900,7 +900,7 @@ public class DefaultPdbApplicator implements PdbApplicator {
 	}
 
 	/**
-	 * Returns the {@link CategoryPath} for a typedef with with the give {@link SymbolPath} and
+	 * Returns the {@link CategoryPath} for a typedef with the given {@link SymbolPath} and
 	 * module number; 1 <= moduleNumber <= {@link PdbDebugInfo#getNumModules()}
 	 * except that modeleNumber of 0 represents publics/globals
 	 * @param moduleNumber module number
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/ModifierTypeApplier.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/ModifierTypeApplier.java
index 8c26c90079..4305f0a48d 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/ModifierTypeApplier.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/ModifierTypeApplier.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,7 +57,7 @@ public class ModifierTypeApplier extends MsDataTypeApplier {
 
 		// If ghidra has modified types in the future, we will likely not perform a pass-through
 		//  of the underlying type.  We might actually need to do a fixup or be able to pass the
-		//  cycle-break information to a pointer or handle cycle-break information information
+		//  cycle-break information to a pointer or handle cycle-break information
 		//  in this modifier type.  Lots of things to consider.  Would we want to create a typedef
 		//  for modifier type as a short-gap solution??? Not sure.
 
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MultiphaseDataTypeResolver.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MultiphaseDataTypeResolver.java
index d0b5b7eb92..f8ab8f78e6 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MultiphaseDataTypeResolver.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MultiphaseDataTypeResolver.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,7 +94,7 @@ public class MultiphaseDataTypeResolver {
 			monitor.checkCancelled();
 			DataType dataType = applicator.getDataType(recordToProcess);
 			// Resolve and re-store most types.  Normally we wouldn't want to resolve
-			// pointer types, but here it is preferred while we have the types in hand the the
+			// pointer types, but here it is preferred while we have the types in hand.  The
 			// PDB would have a type record if it wasn't used somewhere here or as the referred-to
 			// type of a typedef.
 			if (!(dataType instanceof BitFieldDataType)) {
@@ -120,7 +120,7 @@ public class MultiphaseDataTypeResolver {
 	void scheduleTodo(RecordNumber recordNumber) {
 		MsTypeApplier applier = applicator.getTypeApplier(recordNumber);
 		if (!(applier instanceof MsDataTypeApplier dataTypeApplier)) {
-			// Return without scheduling... only want to schedule that that have a legitimate
+			// Return without scheduling... only want to schedule records that have a legitimate
 			//  data type to store
 			return;
 		}
@@ -188,7 +188,7 @@ public class MultiphaseDataTypeResolver {
 		}
 
 		/**
-		 * Indicates if number number exists on stack
+		 * Indicates if a record number exists on the stack
 		 * @param recordNumber the record number to check
 		 * @return {@code true} if exists
 		 */
@@ -227,7 +227,7 @@ public class MultiphaseDataTypeResolver {
 
 		/**
 		 * Peek at top node
-		 * @return the node's record number or {@code null} if if no nodes left
+		 * @return the node's record number or {@code null} if there are no nodes left
 		 */
 		RecordNumber peek() {
 			RecordNode node = getTop();
@@ -239,7 +239,7 @@ public class MultiphaseDataTypeResolver {
 
 		/**
 		 * Pop top node
-		 * @return the popped node's record number or {@code null} if if no nodes left
+		 * @return the popped node's record number or {@code null} if there are no nodes left
 		 */
 		RecordNumber pop() {
 			RecordNode node = getTop();
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbAddressManager.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbAddressManager.java
index 6595225881..ec6383c9a3 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbAddressManager.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbAddressManager.java
@@ -439,7 +439,7 @@ public class PdbAddressManager {
 	}
 
 	/**
-	 * Write the mapped address for a query address, where where the mapping is
+	 * Write the mapped address for a query address, where the mapping is
 	 *  derived by using a the address of a PDB symbol as the key and finding the address of
 	 *  a symbol in the program of the same "unique" name. This is accomplished using public
 	 *  mangled symbols.  If the program symbol came from the PDB, then it maps to itself.
diff --git a/Ghidra/Features/PDB/src/pdb/README.txt b/Ghidra/Features/PDB/src/pdb/README.txt
index 36b68a3269..ce7aa6dc70 100644
--- a/Ghidra/Features/PDB/src/pdb/README.txt
+++ b/Ghidra/Features/PDB/src/pdb/README.txt
@@ -3,7 +3,7 @@ PDB.EXE
 The PDB.EXE executable delivered with Ghidra has been built with Visual Studio 2017 and has a
 dependency on the msdia140.dll in order to execute and process PDB files.  
 
-If it is necessary to rebuild the PDB.exe using a newer version of of the SDK, this can be done by 
+If it is necessary to rebuild the PDB.exe using a newer version of the SDK, this can be done by 
 using the included Visual Studio project to rebuild the executable.  After opening the project
 solution file within Visual Studio simply re-target the solution to a new version of the SDK. 
 This can be accomplished by opening the solution file within Visual Studio, right-clicking on 
diff --git a/Ghidra/Features/PDB/src/pdb/cpp/print.cpp b/Ghidra/Features/PDB/src/pdb/cpp/print.cpp
index f8ab305e0f..cc1f366bc6 100644
--- a/Ghidra/Features/PDB/src/pdb/cpp/print.cpp
+++ b/Ghidra/Features/PDB/src/pdb/cpp/print.cpp
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@ std::wstring printVariant( VARIANT & v ) {
 			return v.bstrVal;
 		case VT_EMPTY://Indicates that a value was not specified. 
 			return L"empty";
-		case VT_NULL://Indicates a a null reference (Nothing in Visual Basic) value, similar to a null value in SQL. 
+		case VT_NULL://Indicates a null reference (Nothing in Visual Basic) value, similar to a null value in SQL. 
 			return L"null";
 	}
 
diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm b/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm
index 274f22e813..688bbd2211 100644
--- a/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm
+++ b/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm
@@ -1156,7 +1156,7 @@
                 
                   (Only available for Labels.) Merges labels from the second 
                   program into the tool's program for the selected code units 
-                  in the the Diff and set the primary labels as in the second 
+                  in the Diff and set the primary labels as in the second 
                   program, if possible.

                 
               
diff --git a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffController.java b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffController.java
index f3e2194f0b..dbad49564c 100644
--- a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffController.java
+++ b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffController.java
@@ -217,7 +217,7 @@ public class DiffController {
 
 	/**
 	 * Ignore any differences in the specified address set.
-	 * @param p1AddressSet address set set of differences
+	 * @param p1AddressSet address set of differences
 	 * The addresses in this set should be derived from the p1 program.
 	 */
 	void ignore(AddressSetView p1AddressSet, TaskMonitor monitor) {
diff --git a/Ghidra/Features/ProgramGraph/src/main/help/help/topics/ProgramGraphPlugin/ProgramGraph.htm b/Ghidra/Features/ProgramGraph/src/main/help/help/topics/ProgramGraphPlugin/ProgramGraph.htm
index ed5570b7f1..4ef873ae0a 100644
--- a/Ghidra/Features/ProgramGraph/src/main/help/help/topics/ProgramGraphPlugin/ProgramGraph.htm
+++ b/Ghidra/Features/ProgramGraph/src/main/help/help/topics/ProgramGraphPlugin/ProgramGraph.htm
@@ -99,7 +99,7 @@
 
 	

       
 See the documentation for the specific graph display for
-      descriptions of how to to make selections and navigate the graph.

+      descriptions of how to make selections and navigate the graph.

     

 
     

diff --git a/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/BlockModelGraphDisplayListener.java b/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/BlockModelGraphDisplayListener.java
index 2acd7567ca..b2e9e6c3d6 100644
--- a/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/BlockModelGraphDisplayListener.java
+++ b/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/BlockModelGraphDisplayListener.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@ import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 
 /**
- * {@link GraphDisplayListener} that handle events back and from from program graphs.
+ * {@link GraphDisplayListener} that handles events back and from program graphs.
  */
 public class BlockModelGraphDisplayListener extends AddressBasedGraphDisplayListener {
 
diff --git a/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/ProgramGraphPlugin.java b/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/ProgramGraphPlugin.java
index 34b4dd4db7..f1b99a81cf 100644
--- a/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/ProgramGraphPlugin.java
+++ b/Ghidra/Features/ProgramGraph/src/main/java/ghidra/graph/program/ProgramGraphPlugin.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,7 +48,7 @@ import ghidra.util.task.TaskLauncher;
  * the graphs that it generates. This plugin generates several different types of program graphs.
  * Both the "block flow" and "code flow" actions will generate a graph of basic block flows. The only
  * difference is that the "code flow" action generates a graph that
- * displays the assembly for for each basic block, whereas the "block flow" action generates a graph
+ * displays the assembly for each basic block, whereas the "block flow" action generates a graph
  * that displays the symbol or address at the start of the basic block.  This plugin also
  * generates call graphs, using either the default subroutine model or one that the user chooses.
  */
diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/SarifGraphDisplayListener.java b/Ghidra/Features/Sarif/src/main/java/sarif/SarifGraphDisplayListener.java
index d20395d9d8..11c3e91ad5 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/SarifGraphDisplayListener.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/SarifGraphDisplayListener.java
@@ -37,7 +37,7 @@ import ghidra.service.graph.GraphDisplay;
 import ghidra.service.graph.GraphDisplayListener;
 
 /**
- * {@link GraphDisplayListener} that handle events back and from from program
+ * {@link GraphDisplayListener} that handle events back and from program
  * graphs.
  */
 public class SarifGraphDisplayListener extends AddressBasedGraphDisplayListener {
diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/SarifProgramOptions.java b/Ghidra/Features/Sarif/src/main/java/sarif/SarifProgramOptions.java
index a90621d71f..7ecf5c0323 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/SarifProgramOptions.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/SarifProgramOptions.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -630,14 +630,14 @@ public class SarifProgramOptions {
 	}
 
 	/**
-	 * @param b trueif the processor-defined labels should be anchored
+	 * @param b true if the processor-defined labels should be anchored
 	 */
 	public void setAnchorProcDefinedLabels(boolean b) {
 		anchorProcDefinedLabels = b;
 	}
 
 	/**
-	 * @return true true if the processor-defined labels should be anchored
+	 * @return true if the processor-defined labels should be anchored
 	 */
 	public boolean anchorProcDefinedLabels() {
 		return anchorProcDefinedLabels;
diff --git a/Ghidra/Features/VersionTracking/ghidra_scripts/AddVTSessionToVersionControl.java b/Ghidra/Features/VersionTracking/ghidra_scripts/AddVTSessionToVersionControl.java
index 7b1f1dc021..35cff96b01 100644
--- a/Ghidra/Features/VersionTracking/ghidra_scripts/AddVTSessionToVersionControl.java
+++ b/Ghidra/Features/VersionTracking/ghidra_scripts/AddVTSessionToVersionControl.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 //Script that enables user to add an existing Version Tracking Session to version control. This
-//is meant to to be used when project is a shared project and when running in headless mode 
+//is meant to be used when project is a shared project and when running in headless mode 
 //since it is simple add a VTSession to version control from the project manager when running in
 //GUI mode.
 //@category Version Tracking
diff --git a/Ghidra/Features/VersionTracking/ghidra_scripts/CreateAppliedExactMatchingSessionScript.java b/Ghidra/Features/VersionTracking/ghidra_scripts/CreateAppliedExactMatchingSessionScript.java
index 0d449685c8..7001c5db04 100644
--- a/Ghidra/Features/VersionTracking/ghidra_scripts/CreateAppliedExactMatchingSessionScript.java
+++ b/Ghidra/Features/VersionTracking/ghidra_scripts/CreateAppliedExactMatchingSessionScript.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // An example of how to create Version Tracking session, run some correlators to find matching
-// data and and then save the session.
+// data and then save the session.
 //@category Examples.Version Tracking
 
 import java.util.Collection;
diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html
index cc83b2b43f..3df39d7848 100644
--- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html
+++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html
@@ -20,7 +20,7 @@
         Version Tracking refers to the process used by reverse engineers to identify matching code or data 
         between different software binaries.  One common use case is to version track two 
         different versions of the same binary.  Alternatively, version tracking techniques 
-        can be used to check for the presence of of a particular piece of code within a given 
+        can be used to check for the presence of a particular piece of code within a given 
         binary of interest.       
         

         
diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html
index edc87488d8..8bf7a1c0f4 100644
--- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html
+++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html
@@ -208,7 +208,7 @@
 	        
 	        
 	          Votes
-	          The number of references from from previously accepted matches that would suggest
+	          The number of references from previously accepted matches that would suggest
 	          that this is a correct match.
 	                
 	        
diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/AbstractVTMatchTableModel.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/AbstractVTMatchTableModel.java
index a8e6659c36..5df8ed033d 100644
--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/AbstractVTMatchTableModel.java
+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/util/AbstractVTMatchTableModel.java
@@ -1132,7 +1132,7 @@ public abstract class AbstractVTMatchTableModel extends AddressBasedTableModel
  * 
  * 

- * Can be expressed using an an {@link Transaction} instead:
+ * Can be expressed using a {@link Transaction} instead:
  * 
  * 
  * try (Transaction tx = dbHandle.openTransaction(dbErrorHandler)) {
diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html
index 2d0f135e5c..2782a88500 100644
--- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html
+++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html
@@ -23,7 +23,7 @@
     the application is using resource values as specified by the active theme. The theme specifies
     the Java Look and Feel, whether or not the overall theme is "dark" (which determines which default
     values to use) and any resource values which have been overridden specifically by that theme.
-    There are two types of of themes; built-in themes and file-based themes. Built-in
+    There are two types of themes; built-in themes and file-based themes. Built-in
     themes are implemented directly as sub-classes of GTheme and simply specify a 
     Java Look and Feel
     and whether or not the theme is "dark". There is one "built-in" theme for each supported
diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html
index b4f3aa7fce..35a5dbcca0 100644
--- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html
+++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html
@@ -15,7 +15,7 @@
     
The Theming feature allows users to customize the colors, fonts, and icons used throughout
     the application. The active theme determines the Java Look and Feel, whether the theme should
     use light or dark defaults, and any custom colors, fonts, and icons that override the default
-    values. Users can can easily switch between any of the built-in themes or any saved themes found
+    values. Users can easily switch between any of the built-in themes or any saved themes found
     in their home application directory

 
     
Users can also edit and create their own themes using the Theme Editor. Custom themes are
diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Trees/GhidraTreeFilter.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Trees/GhidraTreeFilter.html
index 9e84cf16ab..791b3a21dd 100644
--- a/Ghidra/Framework/Docking/src/main/help/help/topics/Trees/GhidraTreeFilter.html
+++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Trees/GhidraTreeFilter.html
@@ -528,7 +528,7 @@
       
Filter Results

 
       

-        
After applying the the filter show above, the table would appear as follows:

+        
After applying the filter shown above, the table would appear as follows:

         

          
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java
index bb51a87b7a..0b516b8d39 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java
@@ -209,7 +209,7 @@ class ComponentNode extends Node {
 	 * Removes the component from this node (and the manager), but possibly keeps an empty object as
 	 * a placeholder.
 	 * @param placeholder the placeholder object to be removed.
-	 * @param keepEmptyPlaceholder flag indicating to keep a placeholder placeholder object.
+	 * @param keepEmptyPlaceholder flag indicating to keep a placeholder object.
 	 */
 	void remove(ComponentPlaceholder placeholder, boolean keepEmptyPlaceholder) {
 		if (placeholder.isActive()) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
index 947c03ff8d..eef75b8646 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
@@ -775,7 +775,7 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
 	}
 
 	/**
-	 * Returns the name of a cascading sub-menu name to use when when showing this provider in the
+	 * Returns the name of a cascading sub-menu name to use when showing this provider in the
 	 * "Window" menu. If the group name is null, the item will appear in the top-level menu.
 	 * @return the menu group for this provider or null if this provider should appear in the
 	 * top-level menu.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/help/DockingHelpBroker.java b/Ghidra/Framework/Docking/src/main/java/docking/help/DockingHelpBroker.java
index 3e865b9f7e..0ac74b4ddd 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/help/DockingHelpBroker.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/help/DockingHelpBroker.java
@@ -233,7 +233,7 @@ public class DockingHelpBroker extends GHelpBroker {
 	 *       then just give up.
 	 *
 	 * @param area the area to call out
-	 * @param callCount the number number of times this method has already been called
+	 * @param callCount the number of times this method has already been called
 	 */
 	private void doCalloutReference(final Rectangle area, int callCount) {
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
index 6871382f50..d4c7d15e52 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
@@ -1392,7 +1392,7 @@ public abstract class AbstractDockingTest extends AbstractGuiTest {
 	 *
 	 * @param toggleAction the action
 	 * @param context the context for the action
-	 * @param selected true if the action is be be selected; false for not selected
+	 * @param selected true if the action is to be selected; false for not selected
 	 */
 	public static void setToggleActionSelected(ToggleDockingActionIf toggleAction,
 			ActionContext context, boolean selected) {
@@ -1405,7 +1405,7 @@ public abstract class AbstractDockingTest extends AbstractGuiTest {
 	 *
 	 * @param toggleAction the action
 	 * @param context the context for the action
-	 * @param selected true if the action is be be selected; false for not selected
+	 * @param selected true if the action is to be selected; false for not selected
 	 * @param wait true to wait for the action to finish; false to invoke later
 	 */
 	public static void setToggleActionSelected(ToggleDockingActionIf toggleAction,
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/util/AnimationPainter.java b/Ghidra/Framework/Docking/src/main/java/docking/util/AnimationPainter.java
index 24043506e4..274a90e163 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/util/AnimationPainter.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/util/AnimationPainter.java
@@ -30,7 +30,7 @@ public interface AnimationPainter {
 	 * 
 	 * @param glassPane the glass pane upon which painting takes place
 	 * @param graphics the graphics used to paint
-	 * @param value a value from from the range supplied to the animator when it was created
+	 * @param value a value from the range supplied to the animator when it was created
 	 */
 	public void paint(GGlassPane glassPane, Graphics graphics, double value);
 }
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
index 9f1a6ba369..6c06f0bcab 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
@@ -213,7 +213,7 @@ public class FindDialog extends ReusableDialogComponentProvider {
 		//
 		// At this point, we wrapped our search and did *not* find a match.  This can only
 		// happen if there is no matching text anywhere in the document, as after wrapping
-		// will will again find the previous match, if it exists.
+		// we will again find the previous match, if it exists.
 		//
 		notifyUser("Not found");
 	}
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialogSearcher.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialogSearcher.java
index 9b6971975c..8e544e8cbe 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialogSearcher.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialogSearcher.java
@@ -71,7 +71,7 @@ public interface FindDialogSearcher {
 	 * @param text the search text.
 	 * @param cursorPosition the current cursor position.
 	 * @param searchForward true if searching forward.
-	 * @param useRegex useRegex true if the search text is a regular expression; false if the texts is
+	 * @param useRegex true if the search text is a regular expression; false if the texts is
 	 * literal text.
 	 * @return the search result or null if no match was found.
 	 */
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/GHyperlinkComponent.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/GHyperlinkComponent.java
index beab7374a9..154ae62e5b 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/GHyperlinkComponent.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/GHyperlinkComponent.java
@@ -35,7 +35,7 @@ import utility.function.Callback;
 
 /**
  * A component that acts like a label, but adds the ability to render HTML links with a client
- * callback for when the link is activated.  Links can be activated by mouse clicking or or by 
+ * callback for when the link is activated.  Links can be activated by mouse clicking or by
  * focusing the link and then pressing Enter or Space.
  * 

  * Users can make one simple text link by calling {@link #addLink(String, Callback)}.  
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/ListSelectionTableDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/ListSelectionTableDialog.java
index 51feaccad1..4dfc818f6b 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/ListSelectionTableDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/ListSelectionTableDialog.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -135,7 +135,7 @@ public class ListSelectionTableDialog extends DialogComponentProvider {
 	}
 
 	/**
-	 * Calling this method does does not work correctly when used with 
+	 * Calling this method does not work correctly when used with 
 	 * {@link #show(Component)} or {@link #showSelectMultiple(Component)}.   To use this method, you
 	 * must show the dialog by calling: 
 	 * 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/PasswordDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/PasswordDialog.java
index 996303c707..1c50246b91 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/PasswordDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/PasswordDialog.java
@@ -136,7 +136,7 @@ public class PasswordDialog extends DialogComponentProvider {
 	/**
 	 * Construct a new PasswordDialog which may include user ID specification/prompt if either
 	 * {@code allowUserIdEntry} is true or a non-null {@code defaultUserId} has been specified.
-	 * The dialog optionally includes a message text area area which supports the use of 
+	 * The dialog optionally includes a message text area which supports the use of 
 	 * {@link #setErrorText(String)}.
 	 * 
 	 * @param title title of the dialog
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldHighlightFactory.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldHighlightFactory.java
index 49667a881f..cf20314f9b 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldHighlightFactory.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldHighlightFactory.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@ package docking.widgets.fieldpanel.support;
 import docking.widgets.fieldpanel.field.Field;
 
 /**
- * A highlighter for for {@link Field}s.
+ * A highlighter for {@link Field}s.
  */
 public interface FieldHighlightFactory {
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
index 9753b44555..ac306cfb1a 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterTextField.java
@@ -310,7 +310,7 @@ public class FilterTextField extends JPanel {
 	}
 
 	/**
-	 * Sets the accessible name prefix for for the focusable components in the filter panel.
+	 * Sets the accessible name prefix for the focusable components in the filter panel.
 	 * @param prefix the base name for these components. A suffix will be added to further
 	 * describe the sub component.
 	 */
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathnameTablePanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathnameTablePanel.java
index a1e62e3d6f..f875fafb7a 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathnameTablePanel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathnameTablePanel.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,7 +70,7 @@ public class PathnameTablePanel extends JPanel {
 	 * @param enableEdits true to allow editing of entries directly in the table, i.e., via
 	 *            the cell editor. The add and remove buttons still allow modification of the list.
 	 * @param addToTop true if the add button should add entries to the top of the list. False to
-	 *            add entries to the bottom. This behavior is overridden if if {@code ordered} is
+	 *            add entries to the bottom. This behavior is overridden if {@code ordered} is
 	 *            false.
 	 * @param ordered true if the order of entries matters. If so, up and down buttons are provided
 	 *            so the user may arrange the entries. If not, entries are sorted alphabetically.
@@ -92,7 +92,7 @@ public class PathnameTablePanel extends JPanel {
 	 * @param enableEdits true to allow editing of entries directly in the table, i.e., via
 	 *            the cell editor. The add and remove buttons still allow modification of the list.
 	 * @param addToTop true if the add button should add entries to the top of the list. False to
-	 *            add entries to the bottom. This behavior is overridden if if {@code ordered} is
+	 *            add entries to the bottom. This behavior is overridden if {@code ordered} is
 	 *            false.
 	 * @param ordered true if the order of entries matters. If so, up and down buttons are provided
 	 *            so the user may arrange the entries. If not, entries are sorted alphabetically.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java
index 760d196b2d..3edfa560df 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@ package docking.widgets.table;
 import ghidra.docking.settings.Settings;
 
 /**
- * An interface that is meant to take the column type of of a {@link DynamicTableColumn}
+ * An interface that is meant to take the column type of a {@link DynamicTableColumn}
  * and convert it to the specified type.   This class is meant to be used when the dynamic 
  * filtering mechanism is not correctly filtering a column, usually because the default filter
  * for the column type does not match what the renderer is displaying in the table.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableRowMapper.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableRowMapper.java
index 56a08b6810..06ea63cfe8 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableRowMapper.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableRowMapper.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import utilities.util.reflection.ReflectionUtilities;
  * for table models that have row types that are easily converted to other more generic types.
  * 

  * This interface is an ExtensionPoint so that once created, they will be ingested automatically
- * by Ghidra.  Once discovered, these mappers will be used to provide dynamic columns to to 
+ * by Ghidra.  Once discovered, these mappers will be used to provide dynamic columns to 
  * tables with row types that match ROW_TYPE.
  *
  * @param  The row type of a given table model
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java
index 1d8c899464..76c7b5ba62 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@ public class MappedColumnConstraint implements ColumnConstraint {
 
 	/**
 	 * Constructs a new Mapped ColumnConstraint
-	 * @param mapper a mapper from from the column type to a mapped type.
+	 * @param mapper a mapper from the column type to a mapped type.
 	 * @param delegate the column constraint of the mapped type.
 	 */
 	public MappedColumnConstraint(ColumnTypeMapper mapper, ColumnConstraint delegate) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java
index e85baaf74f..c4f0bc3a6a 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java
@@ -327,7 +327,7 @@ abstract class CoreGTreeNode implements Cloneable {
 	/**
 	 * Returns true if the node is in the process of loading its children.  For nodes
 	 * that directly extend GTreeNode, this is always false.  See {@link GTreeSlowLoadingNode}
-	 * for information on nodes that that can be in the progress of loading.
+	 * for information on nodes that can be in the progress of loading.
 	 * @param childList the list to test.
 	 * @return true if the node is in the progress of loading its children.
 	 */
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
index ab05d8a86c..befd1ceae7 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
@@ -71,7 +71,7 @@ public class GTree extends JPanel implements BusyListener {
 
 	/**
 	 * This is the root node of the tree's data model. It may or may not be the root node that is
-	 * currently being displayed by the tree. If there is currently a filter applied, then then the
+	 * currently being displayed by the tree. If there is currently a filter applied, then the
 	 * displayed root node will be a clone whose children have been trimmed to only those that match
 	 * the filter. By keeping this variable around, we can give this node to clients, regardless of
 	 * the root node visible in the tree.
@@ -1756,7 +1756,7 @@ public class GTree extends JPanel implements BusyListener {
 
 		/**
 		 * Calling setSelectedPaths on GTree queues the selection for after any currently scheduled
-		 * tasks. This method sets the selected path immediately and does not wait for for scheduled
+		 * tasks. This method sets the selected path immediately and does not wait for any scheduled
 		 * tasks.
 		 *
 		 * @param path the path to select.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/values/GValuesMap.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/values/GValuesMap.java
index 4d24a70cd9..10ee5596e7 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/values/GValuesMap.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/values/GValuesMap.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -128,7 +128,7 @@ public class GValuesMap {
 	 * AbstractValue types as this map.
 	 * @param otherMap The GValuesMap to copy values from
 	 * @throws IllegalArgumentException if the given map does not have exactly the same set of
-	 * names and types as this this map
+	 * names and types as this map
 	 */
 	@SuppressWarnings("unchecked")
 	public void copyValues(GValuesMap otherMap) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardModel.java b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardModel.java
index fd359554b7..e3733e6856 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardModel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardModel.java
@@ -180,7 +180,7 @@ public abstract class WizardModel {
 	}
 
 	/**
-	 * Calls dispose() on all the wizard steps. Subclasses can override this do do additional
+	 * Calls dispose() on all the wizard steps. Subclasses can override this to do additional
 	 * cleanup if needed.
 	 */
 	public void dispose() {
diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/table/threaded/DefaultThreadedTableFilterTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/table/threaded/DefaultThreadedTableFilterTest.java
index 12927362f1..dc84935048 100644
--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/table/threaded/DefaultThreadedTableFilterTest.java
+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/table/threaded/DefaultThreadedTableFilterTest.java
@@ -269,9 +269,9 @@ public class DefaultThreadedTableFilterTest extends AbstractDockingTest {
 
 		startsWithFilter_AllowGlobbing("t\\?");
 		// sub-filter again
-		// The previous filer was not used due to our the the code we have that checks for globbing
+		// The previous filter was not used due to the code that checks for globbing
 		// escape characters.  But, the filter before that using just 't' is a valid parent of the
-		// current filter, so that get used.
+		// current filter, so that gets used.
 		assertNumberOfItemsPassedThroughFilter(5);
 		assertRowCount(1); // matching values: t?n
 
diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/app/emulator/state/RegisterState.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/app/emulator/state/RegisterState.java
index dce41b3ca5..1e56e0b9f8 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/app/emulator/state/RegisterState.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/app/emulator/state/RegisterState.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@ public interface RegisterState {
 	 * Check if the register is initialized
 	 * 
 	 * @param key the register name
-	 * @return a list (used an an optional) containing at most the one initialization state. True if
+	 * @return a list (used as an optional) containing at most the one initialization state. True if
 	 *         initialized, false if not. Empty if unspecified.
 	 */
 	public List isInitialized(String key);
diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java
index 2f7b6f9a4f..08eadd8167 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/emu/jit/analysis/JitDataFlowModel.java
@@ -60,7 +60,7 @@ import ghidra.program.model.pcode.Varnode;
  * Ignoring RAM, there are two varnodes at play, named for the registers they represent: {@code RAX}
  * and {@code RDX}. However, there are three variables. The first is an instance of {@code RAX},
  * defined by the first {@code MOV} instruction. The second is an instance of {@code RDX}, which is
- * implicitly defined as an input to the passage. The third is another instance of of {@code RAX},
+ * implicitly defined as an input to the passage. The third is another instance of {@code RAX},
  * defined by the {@code ADD} instruction. These could be given unique names
  * {@code RAX}1, {@code RDX}in, and {@code RAX}2, respectively.
  * Thus, the {@code ADD} instruction uses {@code RAX}1 and {@code RDX}in, to
diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java
index 309797e1e2..aef85fbfaa 100644
--- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java
+++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java
@@ -154,7 +154,7 @@ public class ConcurrentQBuilder {
 	 * In this case, a total count of work jobs is maintained by the queue.  As items are
 	 * completed, the queue will update the monitor provided to it at construction time to reflect
 	 * the number of jobs completed as work is done.  On the other hand, some clients have
-	 * known known number of jobs to complete, but simply add work to the queue as it arrives.
+	 * no known number of jobs to complete, but simply add work to the queue as it arrives.
 	 * In that case, the client should update its monitor for progress, as the queue cannot
 	 * do so in a meaningful way.
 	 *
diff --git a/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionEvaluator.java b/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionEvaluator.java
index 34f538f71c..9691a4fdf2 100644
--- a/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionEvaluator.java
+++ b/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionEvaluator.java
@@ -301,7 +301,7 @@ public class ExpressionEvaluator {
 					continue;
 				}
 
-				// make sure the next element is a value so the the caller can cast without fear
+				// make sure the next element is a value so the caller can cast without fear
 				if (list.get(i + 1) instanceof ExpressionValue) {
 					return i;
 				}
diff --git a/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionValue.java b/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionValue.java
index 3cf72bab57..d828291da8 100644
--- a/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionValue.java
+++ b/Ghidra/Framework/Generic/src/main/java/generic/expressions/ExpressionValue.java
@@ -33,7 +33,7 @@ public interface ExpressionValue extends ExpressionElement {
 	 * @param operator the binary operator being applied.
 	 * @param value the other value to combine with this value by the operator
 	 * @return the new value after the operator is applied to this value
-	 * @throws ExpressionException if the operator is not applicable for this value or the the other
+	 * @throws ExpressionException if the operator is not applicable for this value or the other
 	 * value is not applicable for this operand and operator
 	 */
 	public ExpressionValue applyBinaryOperator(ExpressionOperator operator, ExpressionValue value)
diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/IteratorSTL.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/IteratorSTL.java
index 4017691b0d..e41c5ab50e 100644
--- a/Ghidra/Framework/Generic/src/main/java/generic/stl/IteratorSTL.java
+++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/IteratorSTL.java
@@ -64,7 +64,7 @@ public interface IteratorSTL {
 	IteratorSTL decrement(int n);
 
 	/**
-	 * Returns true if the iterator is positioned on the first first element of the collection.  If the
+	 * Returns true if the iterator is positioned on the first element of the collection.  If the
 	 * collection is empty, this will always return false.
 	 * @return true if the iterator is positioned on the first element of the collection.
 	 */
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
index 997a4fd906..97ba7d4379 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
@@ -255,7 +255,7 @@ public class DateUtils {
 	 * Returns the current local time zone time-of-day as simple time string.
 	 * See {@value #TIME_FORMAT_STRING}.
 	 *
-	 * @return current time-of-day a a string
+	 * @return current time-of-day as a string
 	 */
 	public static String formatCurrentTime() {
 		return TIME_FORMATTER.format(toLocalDate(new Date()));
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/StringUtilities.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/StringUtilities.java
index 514a4d15d6..940e86a1c5 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/StringUtilities.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/StringUtilities.java
@@ -989,7 +989,7 @@ public class StringUtilities {
 	/**
 	 * Replaces escaped characters in a string to corresponding control characters. For example a
 	 * string containing a backslash character followed by a 'n' character would be replaced with a
-	 * single line feed (0x0a) character. One use for this is to to allow users to type strings in a
+	 * single line feed (0x0a) character. One use for this is to allow users to type strings in a
 	 * text field and include control characters such as line feeds and tabs.
 	 *
 	 * The string that contains 'a','b','c', '\', 'n', 'd', '\', 'u', '0', '0', '0', '1', 'e' would
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/timer/GTimerCache.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/timer/GTimerCache.java
index 46621b07bd..37b2e3b069 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/timer/GTimerCache.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/timer/GTimerCache.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -237,7 +237,7 @@ public class GTimerCache {
 
 	/**
 	 * Called when an item's cache time has expired to determine if the item should be removed from
-	 * the cache. The default to to remove an item when its time has expired. Subclasses can 
+	 * the cache. The default behavior is to remove an item when its time has expired. Subclasses can
 	 * override this method to have more control over expiring value removal.
 	 * 

 	 * Note: this method will always be called from within a synchronized block. Subclasses should
diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GraphToTreeAlgorithm.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GraphToTreeAlgorithm.java
index 17eb8090b6..a43b072425 100644
--- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GraphToTreeAlgorithm.java
+++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GraphToTreeAlgorithm.java
@@ -33,7 +33,7 @@ import ghidra.graph.jung.JungDirectedGraph;
  * thereby affecting the final ordering or tree structure. Higher priority edges will be processed
  * first, making those edges least likely to be removed as "back" edges.
  * 

- * To convert a general graph to a tree, some subset of the the graphs original edges are used to
+ * To convert a general graph to a tree, some subset of the graphs original edges are used to
  * form the tree. There are many possible different trees that can be created in this way. This
  * algorimth's goal is to create a tree such that if all the original "forward" edges are added 
  * back to the tree, they only flow down the tree. This is useful for creating a nicely organized
diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/popup/PopupRegulator.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/popup/PopupRegulator.java
index 1a004061c8..7e6ebe2fe8 100644
--- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/popup/PopupRegulator.java
+++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/popup/PopupRegulator.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -132,7 +132,7 @@ public class PopupRegulator {
 
 		Component c = event.getComponent();
 		if (!c.isShowing()) {
-			// This method is called from a a timer.  It is possible that the graph has been 
+			// This method is called from a timer.  It is possible that the graph has been 
 			// closed by the time this method is called.
 			return;
 		}
diff --git a/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java b/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java
index f6652fca7f..6b7b987f6d 100644
--- a/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java
+++ b/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java
@@ -883,7 +883,7 @@ public class AbstractGuiTest extends AbstractGenericTest {
 
 		//
 		// When running in batch mode, the report generated by Gradle will not correctly show
-		// the stack trace if we throw the exception, so will will trigger a failure instead,
+		// the stack trace if we throw the exception, so we will trigger a failure instead,
 		// which looks good in the test report.
 		//
 		String string = TestReportingException.getSwingThreadTraceString(throwable);
diff --git a/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java b/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
index c608bceb9d..e78c5d5138 100644
--- a/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
+++ b/Ghidra/Framework/Gui/src/main/java/resources/MultiIcon.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import generic.theme.GIcon;
 import ghidra.util.ColorUtils;
 
 /**
- * Icon class for for displaying overlapping icons.  Icons are drawn in the order they
+ * Icon class for displaying overlapping icons.  Icons are drawn in the order they
  * are added.
  */
 public class MultiIcon implements Icon {
diff --git a/Ghidra/Framework/Help/src/main/java/help/GHelpSet.java b/Ghidra/Framework/Help/src/main/java/help/GHelpSet.java
index fb59065e0b..3a0c4c8282 100644
--- a/Ghidra/Framework/Help/src/main/java/help/GHelpSet.java
+++ b/Ghidra/Framework/Help/src/main/java/help/GHelpSet.java
@@ -46,7 +46,7 @@ import help.validator.JavaHelpValidator;
  * Further, it does not properly locate the shared HTML file reference.  This class allows lookups
  * across modules by overridden the lookup functionality done by the map object.  More specifically,
  * we override {@link #getCombinedMap()} and {@link #getLocalMap()} to use a custom delegate map
- * object that knows how do do this "cross-module" help lookup.
+ * object that knows how to do this "cross-module" help lookup.
  * 
  *
  *@see GHelpHTMLEditorKit
diff --git a/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java b/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java
index 4dd3441313..8bb51c1cea 100644
--- a/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java
+++ b/Ghidra/Framework/Help/src/main/java/help/OverlayHelpTree.java
@@ -172,7 +172,7 @@ public class OverlayHelpTree {
 		//
 		// The parent to children map is cleared as nodes are created.   The map is populated by
 		// adding any references to the 'parent' key as they are loaded from the help files.
-		// As we build nodes, starting at the root, will will create child nodes for those that
+		// As we build nodes, starting at the root, we will create child nodes for those that
 		// reference the 'parent' key.   If the map is empty, then it means we never built a
 		// node for the 'parent' key, which means we never found a help file containing the
 		// definition for that key.
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java
index f7fa053b65..8dbf28a051 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java
@@ -651,7 +651,7 @@ public class FrontEndPlugin extends Plugin
 			}
 		}
 		catch (Exception e) {
-			Msg.showError(this, null, "Error Exporting Tool", "Error exporting tool tool", e);
+			Msg.showError(this, null, "Error Exporting Tool", "Error exporting tool", e);
 		}
 	}
 
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectActionManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectActionManager.java
index 05d1362656..770d0e93d7 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectActionManager.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectActionManager.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -563,7 +563,7 @@ class ProjectActionManager {
 		}
 
 		try {
-			activeProject.addProjectView(view, true); // listener will trigger data panel panel display
+			activeProject.addProjectView(view, true); // listener will trigger data panel display
 		}
 		catch (IOException e) {
 			ProjectManager projectManager = tool.getProjectManager();
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java
index 554198aa82..fceacc7439 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolButton.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -469,7 +469,7 @@ class ToolButton extends EmptyBorderButton implements Draggable, Droppable {
 
 		// Create our animation code: a zooming effect and an effect to move where the image is
 		// painted.  These effects are independent code-wise, but work together in that the
-		// mover will set the location and size, and the zoomer will will paint the image with
+		// mover will set the location and size, and the zoomer will paint the image with
 		// a transparency and a zoom level, which is affected by the movers bounds changing.
 		Image image = ZoomedImagePainter.createIconImage(icon);
 		final ZoomedImagePainter painter = new ZoomedImagePainter(startBounds, image);
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java
index 3cea690067..6ba0485c09 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -141,7 +141,7 @@ public interface ProjectData {
 
 	/**
 	 * Sync the Domain folder/file structure with the underlying file structure.
-	 * @param force if true all folders will be be visited and refreshed, if false
+	 * @param force if true all folders will be visited and refreshed, if false
 	 * only those folders previously visited will be refreshed.
 	 */
 	public void refresh(boolean force);
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectManager.java
index d31f0c092e..26befcb7c6 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectManager.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectManager.java
@@ -134,7 +134,7 @@ public interface ProjectManager {
 	 * Establish a connection to the given host and port number. 
 	 * @param host server name or IP address
 	 * @param portNumber server port or 0 for default
-	 * @param forceConnect if true and currently not connected, an attempt will be be to connect
+	 * @param forceConnect if true and currently not connected, an attempt will be made to connect
 	 * @return a handle to the remote server containing shared repositories
 	 */
 	public RepositoryServerAdapter getRepositoryServerAdapter(String host, int portNumber,
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java
index 5b7fe3a877..2ffb66fab3 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -166,7 +166,7 @@ public abstract class PluginsConfiguration {
 	 * packages and then adding all plugins in that package.  This has the effect of pulling
 	 * in more plugin classes than were originally specified in the tool xml.
 	 *
-	 * @param classNames the list of classNames from from the old XML file
+	 * @param classNames the list of classNames from the old XML file
 	 * @return the adjusted set of plugin class names
 	 */
 	public Set getPluginNamesByCurrentPackage(List classNames) {
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/DialogManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/DialogManager.java
index ebbaeeeea4..5b94dd8ca6 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/DialogManager.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/DialogManager.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -72,7 +72,7 @@ public class DialogManager {
 			}
 		}
 		catch (Exception e) {
-			Msg.showError(this, null, "Error", "Error exporting tool tool", e);
+			Msg.showError(this, null, "Error", "Error exporting tool", e);
 		}
 	}
 }
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/EventManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/EventManager.java
index 00e5769685..aff5889afa 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/EventManager.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/EventManager.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -114,7 +114,7 @@ public class EventManager {
 	}
 
 	/**
-	 * Add the given tool listener to be notified notified when tool events are generated
+	 * Add the given tool listener to be notified when tool events are generated
 	 * 
 	 * @param listener listener to add
 	 */
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
index 218991b68a..f057a10a47 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/DefaultLocalGhidraProtocolConnector.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -86,7 +86,7 @@ public class DefaultLocalGhidraProtocolConnector extends GhidraProtocolConnector
 
 	/**
 	 * Get the ProjectLocator associated with a local project URL.
-	 * @return project locator object or null if URL supplies a a RepositoryAdapter and/or 
+	 * @return project locator object or null if URL supplies a RepositoryAdapter and/or 
 	 * RepositoryServerAdapter.
 	 */
 	public ProjectLocator getLocalProjectLocator() {
@@ -119,7 +119,7 @@ public class DefaultLocalGhidraProtocolConnector extends GhidraProtocolConnector
 	}
 
 	/**
-	 * Connect and establish loca project project data instance.  Opening a project for
+	 * Connect and establish a local project data instance.  Opening a project for
 	 * write access is subject to in-use lock restriction.
 	 * See {@link #getStatusCode()} if null is returned.
 	 * @param readOnlyAccess true if project data should be read-only
diff --git a/Ghidra/Framework/Project/src/test.slow/java/ghidra/framework/task/gui/GTaskGUITest.java b/Ghidra/Framework/Project/src/test.slow/java/ghidra/framework/task/gui/GTaskGUITest.java
index b6a7c91ed1..adb08a32a0 100644
--- a/Ghidra/Framework/Project/src/test.slow/java/ghidra/framework/task/gui/GTaskGUITest.java
+++ b/Ghidra/Framework/Project/src/test.slow/java/ghidra/framework/task/gui/GTaskGUITest.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -587,10 +587,10 @@ public class GTaskGUITest extends AbstractDockingTest {
 			//
 			// Unusual Code: We can't call taskMgr.waitForHigherPriorityTasks() without first
 			// releasing the 'work finished' latch, as that will cause a deadlock.  So, we have
-			// to release that lock, be still be able to block the advance() method so that the
+			// to release that lock, to still be able to block the advance() method so that the
 			// test does not keep going until we let our 'higher priority task' get
 			// scheduled.   So, signal that our work is done, but then wait for the sub-work
-			// to be be scheduled.
+			// to be scheduled.
 			//
 			debug(getName() + ": release workFinished latch early");
 			workFinishedLatch.countDown();
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java
index f9ea0d67e3..97ec91858e 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java
@@ -80,7 +80,7 @@ public class Operand implements Serializable {
 
 	/**
 	 * Returns previously computed handle for this operand.  Should not
-	 * be called before the full version of getHandle, where Position and and
+	 * be called before the full version of getHandle, where Position and an
 	 * offset are specified.
 	 * @return Handle
 	 */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/address/Address.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/address/Address.java
index 94963f27eb..4524c1939b 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/address/Address.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/address/Address.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@ import ghidra.pcodeCPort.utils.AddrSpaceToIdSymmetryMap;
 //cpui_mach_addr is expected to print itself and read itself. It can take
 //a size as a "suggestion" for how it should print itself
 
-//All addresses are absolute and there are are no registers in CPUI. However,
+//All addresses are absolute and there are no registers in CPUI. However,
 //all addresses are prefixed with an "immutable" pointer, which can
 //specify a separate RAM space, a register space, an i/o space etc. Thus
 //a translation from a real machine language will typically simulate registers
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
index 9477fd520c..dc1a46cfe9 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/utils/WeakHashMap2.java
@@ -213,7 +213,7 @@ public class WeakHashMap2 extends AbstractMap {
 	 *                mapped
 	 *
 	 * @return  The previous value to which this key was mapped, or
-	 *          null if if there was no mapping for the key
+	 *          null if there was no mapping for the key
 	 */
 	@Override
 	public V put(K key, V value) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java
index a5641289cc..daaec38a4d 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java
@@ -3161,7 +3161,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
 // TODO: for now we will assume that all keys within defined memory blocks are known.
 // When a memory block is created, only its start address key is generated, if the
 // block spans a 32-bit boundary, null may be returned for all addresses beyond that
-// boundary.  A recent fix was added to the memory map to ensure ensure that we can
+// boundary.  A recent fix was added to the memory map to ensure that we can
 // handle blocks which are at least 32-bits in size by ensuring that the end address
 // key is also generated.
 			return null;
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataDBAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataDBAdapter.java
index da7ea63641..9b4efa96c6 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataDBAdapter.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataDBAdapter.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -137,13 +137,13 @@ abstract class DataDBAdapter {
 	abstract DBRecord getRecord(long key) throws IOException;
 
 	/**
-	 * Get the record before the given address address.
+	 * Get the record before the given address {@code addr}.
 	 * @throws IOException if there was a problem accessing the database
 	 */
 	abstract DBRecord getRecordBefore(Address addr) throws IOException;
 
 	/**
-	 * Get a record iterator starting at the given address address.
+	 * Get a record iterator starting at the given address {@code addr}.
 	 * @throws IOException if there was a problem accessing the database
 	 */
 	abstract RecordIterator getRecords(Address addr, boolean forward) throws IOException;
@@ -176,7 +176,7 @@ abstract class DataDBAdapter {
 	abstract int getRecordCount() throws IOException;
 
 	/**
-	 * Get the record at or before the given address address.
+	 * Get the record at or before the given address {@code addr}.
 	 * @param addr
 	 * @throws IOException if there was a problem accessing the database
 	 * @return
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDB.java
index e1aac4e4d1..3b40e07df3 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDB.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -917,7 +917,7 @@ class EnumDB extends DataTypeDB implements Enum {
 			boolean hasNegativeValues = minValue < 0;
 
 			// check the min and max values in this enum to see if they fit in 1 byte enum, then 
-			// 2 byte enum, then 4 byte enum. If the min min and max values fit, then all other values
+			// 2 byte enum, then 4 byte enum. If the min and max values fit, then all other values
 			// will fit as well
 			for (int size = 1; size < 8; size *= 2) {
 				long minPossible = getMinPossibleValue(size, hasNegativeValues);
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java
index 8b663e2892..9bcf0a3dd1 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java
@@ -494,7 +494,7 @@ public class AddressRangeMapDB implements DBListener {
 	}
 
 	/**
-	 * Notification that that something may have changed (undo/redo/image base change) and we need
+	 * Notification that something may have changed (undo/redo/image base change) and we need
 	 * to invalidate our cache and possibly have a wrapping record again.
 	 */
 	public void invalidate() {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapIterator.java
index 1ae57bed66..c33982f770 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapIterator.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapIterator.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -253,7 +253,7 @@ class AddressRangeMapIterator implements AddressRangeIterator {
 	/**
 	 * Make sure the range is within the iterator's given start and end range. This really only
 	 * matters for the first and last range returned by the iterator, but it hard to know when
-	 * the given range is the first or last, just just trim all returned ranges.
+	 * the given range is the first or last, just trim all returned ranges.
 	 * @param range the range to be trimmed
 	 * @return the trimmed address range
 	 */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
index b6c80be916..876bf6978f 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
@@ -963,7 +963,7 @@ public class Disassembler implements DisassemblerConflictHandler {
 				}
 
 				// if fall-through already exists in another block - check for conflict 
-				// and terminate terminate block
+				// and terminate block
 				if (!block.isEmpty() && instructionSet != null &&
 					instructionSet.containsBlockAt(addr)) {
 					existingBlockStartInstr = instructionSet.getInstructionAt(addr);
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java
index cd2381a1b8..fa790743f6 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java
@@ -1308,7 +1308,7 @@ public class AddressSet implements AddressSetView {
 			Address end = addressRange.getMaxAddress();
 			AddressIterator it = getAddresses(start, true);
 			if (!it.hasNext()) {
-				break; // end of this this set reached, so not possible match.
+				break; // end of this set has been reached, so not possible match.
 			}
 			Address addr = it.next();
 			if (addr.compareTo(end) <= 0) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSetMapping.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSetMapping.java
index 81ab090707..556a49fad8 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSetMapping.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSetMapping.java
@@ -101,7 +101,7 @@ public class AddressSetMapping {
 	}
 
 	/**
-	 * Check if the given index in in the "current range".
+	 * Check if the given index in the "current range".
 	 * @param index the index to check
 	 */
 	private boolean indexInCurrentRange(int index) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSpace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSpace.java
index f79bbc9cec..7ed225e37d 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSpace.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSpace.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -438,13 +438,13 @@ public interface AddressSpace extends Comparable {
 	public boolean isMemorySpace();
 
 	/**
-	 * Returns true if this space represents represents a Loaded Memory
+	 * Returns true if this space represents a Loaded Memory
 	 * region (e.g., processor RAM).
 	 */
 	public boolean isLoadedMemorySpace();
 
 	/**
-	 * Returns true if this space represents represents a Non-Loaded storage region
+	 * Returns true if this space represents a Non-Loaded storage region
 	 * for retaining non-loaded file data (e.g., OTHER)
 	 */
 	public boolean isNonLoadedMemorySpace();
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayDataType.java
index 9bed952ae6..0a9bee0de0 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayDataType.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@ public class ArrayDataType extends DataTypeImpl implements Array {
 	 * Constructs a new Array dataType.  The specified datatype's {@link DataTypeManager} will 
 	 * be used for its data organization.
 	 * @param dataType the dataType of the elements in the array. {@link FactoryDataType} and
-	 * {@link Dynamic}, where {@link Dynamic#canSpecifyLength()} is false, are not not permitted.
+	 * {@link Dynamic}, where {@link Dynamic#canSpecifyLength()} is false, are not permitted.
 	 * @param numElements the number of elements in the array (0 is permitted).
 	 * @param elementLength the length of an individual element in the array.  This value
 	 * is only used for {@link Dynamic} dataType where {@link Dynamic#canSpecifyLength()} 
@@ -67,7 +67,7 @@ public class ArrayDataType extends DataTypeImpl implements Array {
 	/**
 	 * Constructs a new Array dataType.
 	 * @param dataType the dataType of the elements in the array. {@link FactoryDataType} and
-	 * {@link Dynamic}, where {@link Dynamic#canSpecifyLength()} is false, are not not permitted.
+	 * {@link Dynamic}, where {@link Dynamic#canSpecifyLength()} is false, are not permitted.
 	 * @param numElements the number of elements in the array (0 is permitted).
 	 * @param elementLength the length of an individual element in the array.  This value
 	 * is only used for {@link Dynamic} dataType where {@link Dynamic#canSpecifyLength()} 
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Composite.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Composite.java
index 7b95fdf200..50bdc84356 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Composite.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Composite.java
@@ -119,7 +119,7 @@ public interface Composite extends DataType {
 	/**
 	 * Adds a new bitfield to the end of this composite.  This method is intended
 	 * to be used with packed structures/unions only where the bitfield will be
-	 * appropriately packed.  The minimum storage storage byte size will be applied.
+	 * appropriately packed.  The minimum storage byte size will be applied.
 	 * It will not provide useful results for composites with packing disabled.
 	 * @param baseDataType the bitfield base datatype (certain restrictions apply).
 	 * @param bitSize the bitfield size in bits
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeComponent.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeComponent.java
index 77dc9442cb..a724e332f2 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeComponent.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeComponent.java
@@ -176,8 +176,8 @@ public interface DataTypeComponent {
 	}
 
 	/**
-	 * Returns true if this this component is not defined. It is just a placeholder.
-	 * @return true if this this component is not defined. It is just a placeholder.
+	 * Returns true if this component is not defined. It is just a placeholder.
+	 * @return true if this component is not defined. It is just a placeholder.
 	 */
 	public boolean isUndefined();
 
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Enum.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Enum.java
index 239737e92e..0e571c3603 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Enum.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Enum.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -154,7 +154,7 @@ public interface Enum extends DataType {
 
 	/**
 	 * Returns the smallest length (size in bytes) this enum can be and still represent all of
-	 * it's current values. Note that that this will only return powers of 2 (1,2,4, or 8)
+	 * it's current values. Note that this will only return powers of 2 (1,2,4, or 8)
 	 * @return the smallest length (size in bytes) this enum can be and still represent all of
 	 * it's current values
 	 */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java
index 102e19d3f1..9aac8912b8 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/EnumDataType.java
@@ -311,7 +311,7 @@ public class EnumDataType extends GenericDataType implements Enum {
 		boolean hasNegativeValues = minValue < 0;
 
 		// check the min and max values in this enum to see if they fit in 1 byte enum, then 
-		// 2 byte enum, then 4 byte enum. If the min min and max values fit, then all other values
+		// 2 byte enum, then 4 byte enum. If the min and max values fit, then all other values
 		// will fit as well
 		for (int size = 1; size < 8; size *= 2) {
 			long minPossible = getMinPossibleValue(size, hasNegativeValues);
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/CodeUnitIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/CodeUnitIterator.java
index 686f0b00a6..8f1f8efd07 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/CodeUnitIterator.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/CodeUnitIterator.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@ import java.util.Iterator;
 import util.CollectionUtils;
 
 /**
- * Interface to define an iterator over over some set of  code units.
+ * Interface to define an iterator over some set of code units.
  * 
  * @see CollectionUtils#asIterable
  */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Data.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Data.java
index 44e6faf9d7..dd438a82a9 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Data.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Data.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -138,7 +138,7 @@ public interface Data extends CodeUnit, Settings {
 	public String getComponentPathName();
 
 	/**
-	 * Returns true if this is a pointer, implies getValue() will will return an Object that is an
+	 * Returns true if this is a pointer, which implies getValue() will return an Object that is an
 	 * Address.
 	 * @return true if a pointer
 	 */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataIterator.java
index 6a7176d577..64adedf2b6 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataIterator.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataIterator.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import util.CollectionUtils;
 
 /**
- * Interface to define an iterator over over some set of Data.
+ * Interface to define an iterator over some set of Data.
  *
  * @see CollectionUtils#asIterable
  */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java
index fcc5163dda..f8636c5d3d 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@ public interface FunctionTagChangeSet extends ChangeSet {
 	/**
 	 * Indicates that a tag has been created.
 	 * 
-	 * @param id id the id of the tag (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter})
+	 * @param id the id of the tag (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter})
 	 */
 	void tagCreated(long id);
 
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionIterator.java
index 275f14c072..adcf70863a 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionIterator.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionIterator.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@ import java.util.Iterator;
 import util.CollectionUtils;
 
 /**
- * Interface to define an iterator over over some set of instructions.
+ * Interface to define an iterator over some set of instructions.
  * 
  * @see CollectionUtils#asIterable
  */
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Listing.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Listing.java
index 3a383175e6..d27f51785f 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Listing.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Listing.java
@@ -62,7 +62,7 @@ public interface Listing {
 	public CodeUnit getCodeUnitContaining(Address addr);
 
 	/**
-	 * get the next code unit that starts an an address that is greater than the
+	 * get the next code unit that starts at an address that is greater than the
 	 * given address. The search will include instructions, defined data, and
 	 * undefined data.
 	 *
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramUserData.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramUserData.java
index 920296ef29..0b079c8591 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramUserData.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramUserData.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -131,7 +131,7 @@ public interface ProgramUserData extends UserData {
 
 	/**
 	 * Get the Options for the given optionsName
-	 * @param optionsName the name of the options options to retrieve
+	 * @param optionsName the name of the options to retrieve
 	 * @return The options for the given name
 	 */
 	public Options getOptions(String optionsName);
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java
index ef35f67a5b..74762bbcd9 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@ public interface GraphDisplayListener {
 	 * instance of this GraphDisplayListener
 	 *
 	 * @param graphDisplay the new {@link GraphDisplay} the new listener will support
-	 * @return A new instance of a GraphDisplayListener that is the same type as as the instance
+	 * @return A new instance of a GraphDisplayListener that is the same type as the instance
 	 * on which it is called
 	 */
 	public GraphDisplayListener cloneWith(GraphDisplay graphDisplay);
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
index 5633f89b86..d3032871dc 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
@@ -162,7 +162,7 @@ public class GhidraLauncher {
 			boolean gradleDevMode = classpathList.isEmpty();
 			if (gradleDevMode) {
 				// Add the module jars Gradle built.
-				// Note: this finds Extensions' jar files so there is no need to to call
+				// Note: this finds Extensions' jar files so there is no need to call
 				// addExtensionJarPaths()
 				addModuleJarPaths(classpathList, modules);
 			}
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/Location.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/Location.java
index 52dcd78673..e359dc727c 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/Location.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/Location.java
@@ -1,13 +1,12 @@
 /* ###
  * IP: GHIDRA
- * REVIEWED: YES
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +37,7 @@ public interface Location {
 
 	/**
 	 * Will attempt to navigate to the location as appropriate.  For example, it may use the goto service
-	 * to navigate the code browser to a progam and and address.  Or it could launch a browser and
+	 * to navigate the code browser to a progam and an address.  Or it could launch a browser and
 	 * display a web page.
 	 * @param provider a service provider that this location can use to find a service to help with
 	 * navigation.
diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java
index 75d947e38b..c7ab691dc7 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -103,7 +103,7 @@ public interface TaskMonitor {
 	 * Set the progress maximum value
 	 * 

 	 * Note: setting this value will reset the progress to be the max if the progress is currently
-	 * greater than the new new max value.
+	 * greater than the new max value.
 	 * @param max maximum value for progress
 	 */
 	public void setMaximum(long max);
diff --git a/Ghidra/Processors/Atmel/ghidra_scripts/CreateAVR8GDTArchiveScript.java b/Ghidra/Processors/Atmel/ghidra_scripts/CreateAVR8GDTArchiveScript.java
index 781ece80ee..0274a5855a 100644
--- a/Ghidra/Processors/Atmel/ghidra_scripts/CreateAVR8GDTArchiveScript.java
+++ b/Ghidra/Processors/Atmel/ghidra_scripts/CreateAVR8GDTArchiveScript.java
@@ -207,7 +207,7 @@ public class CreateAVR8GDTArchiveScript extends GhidraScript {
 					continue;
 				}
 
-				// look at string and see if if the definition of an SFR, register
+				// look at the string and see if it is the definition of an SFR
 				String PTR_PREFIX_16 = "(*(volatile uint16_t *)";
 				String PTR_PREFIX_8 = "(*(volatile uint8_t *)";
 
diff --git a/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/relocation/RISCV_ElfRelocationContext.java b/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/relocation/RISCV_ElfRelocationContext.java
index 090ceab974..de6656d34a 100644
--- a/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/relocation/RISCV_ElfRelocationContext.java
+++ b/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/relocation/RISCV_ElfRelocationContext.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@ class RISCV_ElfRelocationContext extends ElfRelocationContext;
 	FRN_0t = int2float( FPUL );
diff --git a/Ghidra/RuntimeScripts/Common/support/analyzeHeadlessREADME.md b/Ghidra/RuntimeScripts/Common/support/analyzeHeadlessREADME.md
index 352d75c9eb..258f445dee 100644
--- a/Ghidra/RuntimeScripts/Common/support/analyzeHeadlessREADME.md
+++ b/Ghidra/RuntimeScripts/Common/support/analyzeHeadlessREADME.md
@@ -569,7 +569,7 @@ analyzeHeadless /Users/user/ghidra/projects MyProject -import hello.exe -preScri
 ```
 ----------------------------------------------------------------------------------------------------
 #### Example 17
-Import and run scripts that take their own own arguments.
+Import and run scripts that take their own arguments.
 ```bash
 analyzeHeadless /Users/user/ghidra/projects MyProject -import hello.exe -preScript Script.java arg1 arg2 arg3 -preScript AnotherScript.java "arg1 with spaces" arg2
 ```
@@ -647,7 +647,7 @@ methods can be run in both modes:
 
 _Further details for each specific `askXxx()` method can be found in the method's JavaDoc._
 
-When running headlessly, the `askXxx()` methods allow users to to "pre-set" or "pass in" one or more
+When running headlessly, the `askXxx()` methods allow users to "pre-set" or "pass in" one or more
 values for use in scripts. Use the appropriate method to pass in values of certain types (i.e., 
 file, directory, int, long).
 
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/pcode/PcodeEmitContextTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/pcode/PcodeEmitContextTest.java
index 282ed53c78..74e7cf938b 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/pcode/PcodeEmitContextTest.java
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/pcode/PcodeEmitContextTest.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -865,7 +865,7 @@ public class PcodeEmitContextTest extends AbstractGhidraHeadlessIntegrationTest
 		refManager.setPrimary(callotherOverrideRef1, true);
 		program.endTransaction(id, true);
 
-		//nothing should change without requesting overrides overrides
+		//nothing should change without requesting overrides
 		assertTrue(equalPcodeOpArrays(unmodified, userTwo.getPcode()));
 		assertTrue(equalPcodeOpArrays(unmodified, userTwo.getPcode(false)));
 
diff --git a/GhidraDocs/GhidraClass/BSim/BSimTutorial_Overview_Queries.md b/GhidraDocs/GhidraClass/BSim/BSimTutorial_Overview_Queries.md
index b2034c01bc..9fbff1f3e7 100644
--- a/GhidraDocs/GhidraClass/BSim/BSimTutorial_Overview_Queries.md
+++ b/GhidraDocs/GhidraClass/BSim/BSimTutorial_Overview_Queries.md
@@ -12,7 +12,7 @@ To perform an Overview Query, select **BSim -> Perform Overview...** from the Co
 You should see the following result:
 ![overview window](images/overview_window.png)
 1. Sort the table by the "Hit Count" column in ascending order.  Typically, the functions with the largest hit counts will have low self-significance.
-Verify that that is the case for this table. 
+Verify that that is the case for this table.
 1. Q: Examine the functions with the highest hit count. Why are there so many matches for these functions?
    
Answer: These are all instances of PostgreSQL statistics-reporting functions.  Their bodies are quite similar and they have identical BSim signatures.

 
diff --git a/GhidraDocs/GhidraClass/BSim/BSimTutorial_Scripting.md b/GhidraDocs/GhidraClass/BSim/BSimTutorial_Scripting.md
index 37f52720f7..3028971200 100644
--- a/GhidraDocs/GhidraClass/BSim/BSimTutorial_Scripting.md
+++ b/GhidraDocs/GhidraClass/BSim/BSimTutorial_Scripting.md
@@ -4,7 +4,7 @@ Finally, we briefly mention a few other topics related to BSim.
 
 ## Scripting BSim
 
-There are are number of example scripts in the ``BSim`` script category, which demonstrate how to interact with BSim programmatically.
+There are a number of example scripts in the ``BSim`` script category, which demonstrate how to interact with BSim programmatically.
 
 ![script manager](images/script_manager.png)
 
diff --git a/GhidraDocs/GhidraClass/Beginner/Introduction_to_Ghidra_Student_Guide.html b/GhidraDocs/GhidraClass/Beginner/Introduction_to_Ghidra_Student_Guide.html
index 40c5eb410a..b4972738df 100644
--- a/GhidraDocs/GhidraClass/Beginner/Introduction_to_Ghidra_Student_Guide.html
+++ b/GhidraDocs/GhidraClass/Beginner/Introduction_to_Ghidra_Student_Guide.html
@@ -1534,12 +1534,11 @@ Before you can do anything else, you must first create a project. Projects are u
   

   Notes:
   
    
-    
     
  • The Convert action only appears on the right mouse menu if the cursor is on a constant operand. It only works on the current scalar.
    • 
     
  • The Set Equate... action only appears on right mouse menu if the cursor is on a constant operand. It works on the current scalar and if there is a selection on all matching scalars in the selection.
    • 
     
  • To group Equates or Enums into a single Enum in the Data Type Manager, use the filter to group them (if possible), select them using click and drag, then do right-click->Create Enum from Selection.
    • 
-    
  • The Apply Enum... action allows users to apply the enum names to multiple matching values in an instruction or selection of instructions. It only appears on the right mouse menu if the cursor is on a constant operand (no selection) or there are are constant operands in the current selection.
    • 
-    
  • Applying Equates and Enums to the Listing will rename most in the decompiler, however...
    •  
+    
  • The Apply Enum... action allows users to apply the enum names to multiple matching values in an instruction or selection of instructions. It only appears on the right mouse menu if the cursor is on a constant operand (no selection) or there are constant operands in the current selection.
    • 
+    
  • Applying Equates and Enums to the Listing will rename most in the decompiler, however...
    • 
     
  • PREFERRED METHOD: To apply Enum names to the decompiler view, find a variable being assigned or compared to the constants then do right-click->Retype variable or right-click->Retype global. Make sure that the Enum size (1,2,4,or 8 bytes) matches the size of the variable in the decompiler or it will not display the names.
    • 
  

   

@@ -1735,7 +1734,7 @@ Before you can do anything else, you must first create a project. Projects are u
  
  • In the Program Tree, right-click on a CODE segment and choose Modularize By->:
         
      
       
    • Subroutine-> This breaks code into segments by a chosen subroutine model.
      • 
-	
    • Complexity Depth This groups functions into folders Level 0 to n, where Level 0 contains the entry function(s), Level 1 contains functions called by entry functin(s), and so on. Level n contains functions that do not call any other functions within the current program but may call external functions.
      • 
+	
    • Complexity Depth This groups functions into folders Level 0 to n, where Level 0 contains the entry function(s), Level 1 contains functions called by entry function(s), and so on. Level n contains functions that do not call any other functions within the current program but may call external functions.
      • 
 	
    • Dominance This groups functions in folders according to which functions dominate other functions. Function A dominates Function B if every path from the entry to Function B must go through Function A.
      • 
         
    
   
diff --git a/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.html b/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.html
index 40731c17b3..954e3b8211 100644
--- a/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.html
+++ b/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.html
@@ -162,7 +162,7 @@ src="images/breakpoint-enable.png" alt="set breakpoint" /> Set
 Breakpoint, press K on the keyboard, or
 double-click the margin.
    • 
 
  • From the Breakpoints window, use the Set Breakpoint
-dropdown to to access the various breakpoint actions defined by
+dropdown to access the various breakpoint actions defined by
 GDB.
    • 
 
  • From the Terminal window, use the GDB command, e.g.,
 break main.
    • 
diff --git a/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.md b/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.md
index 954ee14dfd..a42cc52a02 100644
--- a/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.md
+++ b/GhidraDocs/GhidraClass/Debugger/A3-Breakpoints.md
@@ -17,7 +17,7 @@ From here, you can toggle and delete existing breakpoints.
 There are several ways to set a new breakpoint:
 
 1. From any static or dynamic listing window, including Disassembly, Memory/Hex, and the Decompiler, right-click and select ![set breakpoint](images/breakpoint-enable.png) Set Breakpoint, press **`K`** on the keyboard, or double-click the margin.
-1. From the Breakpoints window, use the **Set Breakpoint** dropdown to to access the various breakpoint actions defined by GDB.
+1. From the Breakpoints window, use the **Set Breakpoint** dropdown to access the various breakpoint actions defined by GDB.
 1. From the Terminal window, use the GDB command, e.g., `break main`.
 
 The advantage of using the listings is that you can quickly set a breakpoint at any address.
diff --git a/GhidraDocs/InstallationGuide.md b/GhidraDocs/InstallationGuide.md
index dd7b367f45..e4ab79506e 100644
--- a/GhidraDocs/InstallationGuide.md
+++ b/GhidraDocs/InstallationGuide.md
@@ -124,7 +124,7 @@ using any unzip program (built-in OS utilities, 7-Zip, WinZip, WinRAR, etc).
        3. Click `Environment variables...`
     3. Add the JDK bin directory to the PATH variable:
        1. Under `System variables`, highlight `Path` and click `Edit...`
-       2. At the end of the the `Variable value` field, add a semicolon followed by 
+       2. At the end of the `Variable value` field, add a semicolon followed by
           `\bin`, or use the `New` button in the
           `Edit environment variable` window to add a new entry to the `Path`.
        3. Click `OK`
@@ -268,7 +268,7 @@ A single `ghidra.jar` file can be created using the `/support/
 script.
 
 ### PyGhidra Mode
-Ghidra has integrated the the popular Pyhidra extension to enable native CPython 3 support out of
+Ghidra has integrated the popular Pyhidra extension to enable native CPython 3 support out of
 the box. To enable this support, Ghidra must be launched from a Python environment using special
 launch scripts.
 1. Navigate to `/support/`