2 files changed, 11 insertions, 0 deletions
diff --git a/changelog.d/5214.feature b/changelog.d/5214.feature
new file mode 100644
index 0000000000..6c0f15c901
--- /dev/null
+++ b/changelog.d/5214.feature
@@ -0,0 +1 @@
+Allow server admins to define and enforce a password policy (MSC2000).
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index d218aefee5..8b8ebfa3d7 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -996,6 +996,16 @@ password_config:
    #
    #pepper: "EVEN_MORE_SECRET"
 
+   # Password policy.
+   #
+   #policy:
+   #  enabled: true
+   #  minimum_length: 15
+   #  require_digit: true
+   #  require_symbol: true
+   #  require_lowercase: true
+   #  require_uppercase: true
+
 
 
 # Enable sending emails for notification events or expiry notices