diff --git a/HISTORY.md b/HISTORY.md
index 15f8949f9..2bbcf8af9 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -17,7 +17,7 @@
   - It is the first model capable of writing such large coherent, useful code edits.
   - Do large refactors or generate multiple files of new code in one go.
 - Aider now uses `claude-3-5-sonnet-20240620` by default if `ANTHROPIC_API_KEY` is set in the environment.
-- [Enabled image support](https://aider.chat/docs/images-urls.html) for 3.5 Sonnet and for GPT-4o & 3.5 Sonnet via OpenRouter (by @yamitzky).
+- [Enabled image support](https://aider.chat/docs/usage/images-urls.html) for 3.5 Sonnet and for GPT-4o & 3.5 Sonnet via OpenRouter (by @yamitzky).
 - Added `--attribute-commit-message` to prefix aider's commit messages with "aider:".
 - Fixed regression in quality of one-line commit messages.
 - Automatically retry on Anthropic `overloaded_error`.
@@ -334,7 +334,7 @@
 
 ### Aider v0.12.0
 
-- [Voice-to-code](https://aider.chat/docs/voice.html) support, which allows you to code with your voice.
+- [Voice-to-code](https://aider.chat/docs/usage/voice.html) support, which allows you to code with your voice.
 - Fixed bug where /diff was causing crash.
 - Improved prompting for gpt-4, refactor of editblock coder.
 - [Benchmarked](https://aider.chat/docs/benchmarks.html) at 63.2% for gpt-4/diff, no regression.
diff --git a/README.md b/README.md
index 51a017f08..45e56750e 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ projects like django, scikitlearn, matplotlib, etc.
 - [Documentation](https://aider.chat/)
 - [Installation](https://aider.chat/docs/install.html)
 - [Usage](https://aider.chat/docs/usage.html)
-- [Tutorial videos](https://aider.chat/docs/tutorials.html)
+- [Tutorial videos](https://aider.chat/docs/usage/tutorials.html)
 - [Connecting to LLMs](https://aider.chat/docs/llms.html)
 - [Configuration](https://aider.chat/docs/config.html)
 - [Troubleshooting](https://aider.chat/docs/troubleshooting.html)
diff --git a/aider/website/docs/usage/lint-test.md b/aider/website/docs/usage/lint-test.md
new file mode 100644
index 000000000..7d4b0e114
--- /dev/null
+++ b/aider/website/docs/usage/lint-test.md
@@ -0,0 +1,59 @@
+---
+parent: Usage
+nav_order: 900
+description: Automatically fix linting and testing errors.
+---
+
+# Linting and testing
+
+Aider can automatically lint and test your code
+every time it makes changes.
+This helps identify and repair any problems introduced
+by the AI edits.
+
+## Linting
+
+Aider comes with built in linters for 
+[most popular languages](/docs/languages.html)
+and will automatically lint code in these languages.
+
+Or you can specify you favorite linter
+with the `--lint-cmd <cmd>` switch.
+The lint command should accept the filenames
+of the files to lint. 
+If there are linting errors, aider expects the
+command to print them on stdout/stderr
+and return a non-zero exit code.
+This is how most linters normally operate.
+
+## Testing
+
+You can configure aider to run your test suite
+after each time the AI edits your code
+using the `--test-cmd <cmd>` switch.
+
+Aider will run the test command without any arguments.
+If there are test errors, aider expects the
+command to print them on stdout/stderr
+and return a non-zero exit code.
+This is how most test tools normally operate.
+
+## Compiled languages
+
+If you want to have aider compile code after each edit, you
+can use the lint and test commands to achieve this.
+
+- You might want want to recompile each file which was modified
+to check for compile errors.
+To do this,
+provide a `--lint-cmd` which both lints and compiles the file.
+You could create a small shell script for this.
+- You might want to rebuild the entire project after files
+are edited to check for build errors.
+To do this,
+provide a `--test-cmd` which both builds and tests the project.
+You could create a small shell script for this.
+Or you may be able to do something as simple as
+`--test-cmd dotnet build && dotnet test`.
+
+