From 0456d3e42795481a186db05719300691fe2a1029 Mon Sep 17 00:00:00 2001
From: David Smith <39445562+smithdc1@users.noreply.github.com>
Date: Wed, 12 May 2021 19:46:01 +0100
Subject: [PATCH] Fixed #26721 -- Doc'd setting UTF-8 on Windows.

---
 docs/howto/windows.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/howto/windows.txt b/docs/howto/windows.txt
index 5dc1c3ef0d..696d83908a 100644
--- a/docs/howto/windows.txt
+++ b/docs/howto/windows.txt
@@ -125,3 +125,11 @@ Common pitfalls
 
     ...\> set http_proxy=http://username:password@proxyserver:proxyport
     ...\> set https_proxy=https://username:password@proxyserver:proxyport
+
+* In general, Django assumes that ``UTF-8`` encoding is used for I/O. This may
+  cause problems if your system is set to use a different encoding. Recent
+  versions of Python allow setting the :envvar:`PYTHONUTF8` environment
+  variable in order to force a ``UTF-8`` encoding. Windows 10 also provides a
+  system-wide setting by checking ``Use Unicode UTF-8 for worldwide language
+  support`` in :menuselection:`Language --> Administrative Language Settings
+  --> Change system locale` in system settings.