Merge branch 'GP-0_ryanmkurtz_PR-8025_LukeSerne_fix-typo'

Author: ryanmkurtz

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 @@ static Map<String, LocationTrackingSpec> allSuggested(PluginTool tool) {
 	List<LocationTrackingSpec> 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

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 static State sameAddress(Collection<State> col) {
 		}
 
 		/**
-		 * Get the desired state were the the logical breakpoint to be toggled
+		 * Get the desired state were the logical breakpoint to be toggled
 		 * 
 		 * <p>
 		 * The expected "action" when toggling a breakpoint may vary depending on whether or not the

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.

Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py

@@ -376,7 +376,7 @@ def put_registers(self, space: str, values: Iterable[RegVal],
             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.
         """

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java

@@ -498,7 +498,7 @@ public static Variable findVariable(Function function, Register register) {
 	}
 
 	/**
-	 * 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

Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/disassemble/DebuggerDisassemblyTest.java

@@ -289,7 +289,7 @@ public void testAutoDisasembleReDisasembleX8664Offcut() throws Throwable {
 			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 void testAutoDisassembleReDisassembleX8664OffcutByEmulation() throws Thro
 			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 void testAutoDisassembleReDisassembleX8664OffcutByProgEmu() throws Throwa
 			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.
 			 */
 		});

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramView.java

@@ -1467,13 +1467,13 @@ public void updateMemoryDeleteRegionBlock(TraceMemoryRegion region) {
 	}
 
 	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;
 	}

Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java

@@ -46,7 +46,7 @@ public class XmlTargetObjectSchemaTest {
 				    <schema name="down1">
 				        <attribute schema="VOID" fixed="yes" hidden="yes" />
 				    </schema>
-				</context>"""; // Cannot have final final new-line or serialize test will fail
+				</context>"""; // 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");

Ghidra/Features/BSim/src/main/help/help/topics/BSim/IngestProcess.html

@@ -63,7 +63,7 @@ <H2 class="title" style="clear: both"><A name="IngestOverview"></A>Ingest
         "filename">localhost</CODE> is running both a Ghidra Server and a BSim PostgreSQL database
         server. On the Ghidra Server, a repository named <CODE class="filename">repo</CODE> has
         been created. On the BSim server, a database named <CODE class="filename">repo</CODE> has
-        also been created. See See <A class="xref" href=
+        also been created. See <A class="xref" href=
         "CommandLineReference.html#BSimCommand">Command-Line Utility Reference</A> for more
         details on use of <STRONG>bsim</STRONG> command and other supported BSim databases.</P>
 

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.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.
  *