From 0fc6b9beaaef71671931427fccf96d3face207d2 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Fri, 14 Jun 2024 06:16:56 -0700
Subject: [PATCH] copy

---
 aider/args_formatter.py              | 1 +
 website/assets/sample.aider.conf.yml | 1 +
 website/docs/aider_conf.md           | 3 +++
 website/docs/dotenv.md               | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/aider/args_formatter.py b/aider/args_formatter.py
index 9ad00ff66..2503cd007 100644
--- a/aider/args_formatter.py
+++ b/aider/args_formatter.py
@@ -17,6 +17,7 @@ class YamlHelpFormatter(argparse.HelpFormatter):
         return """
 ##########################################################
 # Sample .aider.conf.yaml
+# This file lists *all* the valid configuration entries.
 # Place in your home dir, or at the root of your git repo.
 ##########################################################
 
diff --git a/website/assets/sample.aider.conf.yml b/website/assets/sample.aider.conf.yml
index 78b81609d..9a9679c27 100644
--- a/website/assets/sample.aider.conf.yml
+++ b/website/assets/sample.aider.conf.yml
@@ -1,5 +1,6 @@
 ##########################################################
 # Sample .aider.conf.yaml
+# This file lists *all* the valid configuration entries.
 # Place in your home dir, or at the root of your git repo.
 ##########################################################
 
diff --git a/website/docs/aider_conf.md b/website/docs/aider_conf.md
index e6024338c..f50c88862 100644
--- a/website/docs/aider_conf.md
+++ b/website/docs/aider_conf.md
@@ -10,6 +10,8 @@ Most of aider's options can be set in an `.aider.conf.yml` file,
 which can be placed in your home directory or at the root of
 your git repo. 
 
+{% include special-keys.md %}
+
 Below is a sample of the file, which you
 can also
 [download from GitHub](https://github.com/paul-gauthier/aider/blob/main/website/assets/sample.aider.conf.yml).
@@ -26,6 +28,7 @@ cog.outl("```")
 ```
 ##########################################################
 # Sample .aider.conf.yaml
+# This file lists *all* the valid configuration entries.
 # Place in your home dir, or at the root of your git repo.
 ##########################################################
 
diff --git a/website/docs/dotenv.md b/website/docs/dotenv.md
index 6620e2254..e45fc5783 100644
--- a/website/docs/dotenv.md
+++ b/website/docs/dotenv.md
@@ -11,6 +11,8 @@ models you use with aider.
 You currently can not set general aider options
 in the `.env` file, only LLM environment variables.
 
+{% include special-keys.md %}
+
 Aider will look for a `.env` file in the
 root of your git repo or in the current directory.
 You can give it an explicit file to load with the `--env-file <filename>` parameter.