Merge remote-tracking branch 'refs/remotes/origin/main'

HISTORY.md

@@ -688,7 +688,7 @@
 
 - Added `/git` command to run git from inside aider chats.
 - Use Meta-ENTER (Esc+ENTER in some environments) to enter multiline chat messages.
-- Create a `.gitignore` with `.aider*` to prevent users from accidentaly adding aider files to git.
+- Create a `.gitignore` with `.aider*` to prevent users from accidentally adding aider files to git.
 - Check pypi for newer versions and notify user.
 - Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
 - Provide GPT with detailed error if it makes a bad edit block, ask for a retry.

aider/website/HISTORY.md

@@ -703,7 +703,7 @@ cog.out(text)
 
 - Added `/git` command to run git from inside aider chats.
 - Use Meta-ENTER (Esc+ENTER in some environments) to enter multiline chat messages.
-- Create a `.gitignore` with `.aider*` to prevent users from accidentaly adding aider files to git.
+- Create a `.gitignore` with `.aider*` to prevent users from accidentally adding aider files to git.
 - Check pypi for newer versions and notify user.
 - Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
 - Provide GPT with detailed error if it makes a bad edit block, ask for a retry.

aider/website/docs/faq.md

@@ -37,7 +37,7 @@ If you still wish to add lots of files to the chat, you can:
 
 - Use a wildcard when you launch aider: `aider src/*.py`
 - Use a wildcard with the in-chat `/add` command: `/add src/*.py`
-- Give the `/add` command a directory name and it will recurisvely add every file under that dir: `/add src`
+- Give the `/add` command a directory name and it will recursively add every file under that dir: `/add src`
 
 ## Can I use aider in a large (mono) repo?
 

aider/website/examples/README.md

@@ -8,7 +8,7 @@ has_toc: false
 # Example chat transcripts
 
 Below are some chat transcripts showing what it's like to code with aider.
-In the chats, you'll see a varity of coding tasks like generating new code, editing existing code, debugging, exploring unfamiliar code, etc.
+In the chats, you'll see a variety of coding tasks like generating new code, editing existing code, debugging, exploring unfamiliar code, etc.
 
 * [**Hello World Flask App**](https://aider.chat/examples/hello-world-flask.html): Start from scratch and have aider create a simple Flask app with various endpoints, such as adding two numbers and calculating the Fibonacci sequence.
 

requirements/requirements.in

@@ -27,7 +27,7 @@ pexpect
 json5
 psutil
 
-# The proper depdendency is networkx[default], but this brings
+# The proper dependency is networkx[default], but this brings
 # in matplotlib and a bunch of other deps
 # https://github.com/networkx/networkx/blob/d7132daa8588f653eacac7a5bae1ee85a183fa43/pyproject.toml#L57
 # We really only need networkx itself and scipy for the repomap.

tests/basic/test_editblock.py

@@ -213,9 +213,9 @@ aider/coder.py
 
 aider/coder.py
 <<<<<<< SEARCH
-            self.console.print("[red]Skipped commmit.")
+            self.console.print("[red]Skipped commit.")
 =======
-            self.io.tool_error("Skipped commmit.")
+            self.io.tool_error("Skipped commit.")
 >>>>>>> REPLACE"""
 
         # Should not raise a ValueError