diff --git a/HISTORY.md b/HISTORY.md index b79fddc52..385813cfb 100644 --- a/HISTORY.md +++ b/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. diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index 1555635e3..149a9b86c 100644 --- a/aider/website/HISTORY.md +++ b/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. diff --git a/aider/website/docs/ctags.md b/aider/website/docs/ctags.md index b57f8de33..7edebf886 100644 --- a/aider/website/docs/ctags.md +++ b/aider/website/docs/ctags.md @@ -228,7 +228,7 @@ Some possible approaches to reducing the amount of map data are: - Distill the global map, to prioritize important symbols and discard "internal" or otherwise less globally relevant identifiers. Possibly enlist `gpt-3.5-turbo` to perform this distillation in a flexible and language agnostic way. - Provide a mechanism for GPT to start with a distilled subset of the global map, and let it ask to see more detail about subtrees or keywords that it feels are relevant to the current coding task. - - Attempt to analyize the natural language coding task given by the user and predict which subset of the repo map is relevant. Possibly by analysis of prior coding chats within the specific repo. Work on certain files or types of features may require certain somewhat predictable context from elsewhere in the repo. Vector and keyword search against the chat history, repo map or codebase may help here. + - Attempt to analyze the natural language coding task given by the user and predict which subset of the repo map is relevant. Possibly by analysis of prior coding chats within the specific repo. Work on certain files or types of features may require certain somewhat predictable context from elsewhere in the repo. Vector and keyword search against the chat history, repo map or codebase may help here. One key goal is to prefer solutions which are language agnostic or which can be easily deployed against most popular code languages. diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 3ff692020..53037ad14 100644 --- a/aider/website/docs/faq.md +++ b/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? diff --git a/aider/website/examples/README.md b/aider/website/examples/README.md index 37e7031ae..80843df1d 100644 --- a/aider/website/examples/README.md +++ b/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. diff --git a/requirements/requirements.in b/requirements/requirements.in index b17a88589..031adb5e2 100644 --- a/requirements/requirements.in +++ b/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. diff --git a/tests/basic/test_editblock.py b/tests/basic/test_editblock.py index 058afa750..395c59d90 100644 --- a/tests/basic/test_editblock.py +++ b/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