diff --git a/Doc/c-api/abstract.rst b/Doc/c-api/abstract.rst
index ad53881..0edd1d5 100644
--- a/Doc/c-api/abstract.rst
+++ b/Doc/c-api/abstract.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _abstract:
 
diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 25a867f..8e8a920 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _allocating-objects:
 
diff --git a/Doc/c-api/apiabiversion.rst b/Doc/c-api/apiabiversion.rst
index 890a038..b8a8f2f 100644
--- a/Doc/c-api/apiabiversion.rst
+++ b/Doc/c-api/apiabiversion.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _apiabiversion:
 
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
index b41130e..ba9ca5e 100644
--- a/Doc/c-api/arg.rst
+++ b/Doc/c-api/arg.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _arg-parsing:
 
diff --git a/Doc/c-api/bool.rst b/Doc/c-api/bool.rst
index a9fb342..ce8de6e 100644
--- a/Doc/c-api/bool.rst
+++ b/Doc/c-api/bool.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _boolobjects:
 
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index c7c1e3c..72d9650 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. index::
    single: buffer protocol
diff --git a/Doc/c-api/bytearray.rst b/Doc/c-api/bytearray.rst
index 41b6e3c..b4a9660 100644
--- a/Doc/c-api/bytearray.rst
+++ b/Doc/c-api/bytearray.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _bytearrayobjects:
 
diff --git a/Doc/c-api/bytes.rst b/Doc/c-api/bytes.rst
index 5b9ebf6..9a62fb6 100644
--- a/Doc/c-api/bytes.rst
+++ b/Doc/c-api/bytes.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _bytesobjects:
 
diff --git a/Doc/c-api/capsule.rst b/Doc/c-api/capsule.rst
index 8eb6695..3c921bb 100644
--- a/Doc/c-api/capsule.rst
+++ b/Doc/c-api/capsule.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _capsules:
 
diff --git a/Doc/c-api/cell.rst b/Doc/c-api/cell.rst
index 427259c..8514afe 100644
--- a/Doc/c-api/cell.rst
+++ b/Doc/c-api/cell.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _cell-objects:
 
diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
index 10d89f2..27d3f76 100644
--- a/Doc/c-api/code.rst
+++ b/Doc/c-api/code.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _codeobjects:
 
diff --git a/Doc/c-api/complex.rst b/Doc/c-api/complex.rst
index fc63b57..675bd01 100644
--- a/Doc/c-api/complex.rst
+++ b/Doc/c-api/complex.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _complexobjects:
 
diff --git a/Doc/c-api/concrete.rst b/Doc/c-api/concrete.rst
index 9558a4a..f83d711 100644
--- a/Doc/c-api/concrete.rst
+++ b/Doc/c-api/concrete.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _concrete:
diff --git a/Doc/c-api/contextvars.rst b/Doc/c-api/contextvars.rst
index c344c8d..a7cde7f 100644
--- a/Doc/c-api/contextvars.rst
+++ b/Doc/c-api/contextvars.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _contextvarsobjects:
 
diff --git a/Doc/c-api/conversion.rst b/Doc/c-api/conversion.rst
index c46722d..ed101c7 100644
--- a/Doc/c-api/conversion.rst
+++ b/Doc/c-api/conversion.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _string-conversion:
 
diff --git a/Doc/c-api/coro.rst b/Doc/c-api/coro.rst
index 2fe50b5..50428c7 100644
--- a/Doc/c-api/coro.rst
+++ b/Doc/c-api/coro.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _coro-objects:
 
diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 77b1b21..44a0437 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _datetimeobjects:
 
diff --git a/Doc/c-api/descriptor.rst b/Doc/c-api/descriptor.rst
index c8f6fa5..1005140 100644
--- a/Doc/c-api/descriptor.rst
+++ b/Doc/c-api/descriptor.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _descriptor-objects:
 
diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst
index 0ced5a5..e970771 100644
--- a/Doc/c-api/dict.rst
+++ b/Doc/c-api/dict.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _dictobjects:
 
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 13f0aff..00ef005 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _exceptionhandling:
diff --git a/Doc/c-api/file.rst b/Doc/c-api/file.rst
index 6f2ecee..defc859 100644
--- a/Doc/c-api/file.rst
+++ b/Doc/c-api/file.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _fileobjects:
 
diff --git a/Doc/c-api/float.rst b/Doc/c-api/float.rst
index 27a75e3..8a99642 100644
--- a/Doc/c-api/float.rst
+++ b/Doc/c-api/float.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _floatobjects:
 
diff --git a/Doc/c-api/function.rst b/Doc/c-api/function.rst
index 17279c7..02c4ebd 100644
--- a/Doc/c-api/function.rst
+++ b/Doc/c-api/function.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _function-objects:
 
diff --git a/Doc/c-api/gcsupport.rst b/Doc/c-api/gcsupport.rst
index b739aac..b3f30b2 100644
--- a/Doc/c-api/gcsupport.rst
+++ b/Doc/c-api/gcsupport.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _supporting-cycle-detection:
 
diff --git a/Doc/c-api/gen.rst b/Doc/c-api/gen.rst
index 1efbae4..8d54021 100644
--- a/Doc/c-api/gen.rst
+++ b/Doc/c-api/gen.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _gen-objects:
 
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
index 8cdc256..86cc403 100644
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _importing:
 
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index b306494..a0ac4d2 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _initialization:
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index 69aef0d..b003bba 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _api-intro:
diff --git a/Doc/c-api/iter.rst b/Doc/c-api/iter.rst
index 2ba444d..546efb5 100644
--- a/Doc/c-api/iter.rst
+++ b/Doc/c-api/iter.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _iterator:
 
diff --git a/Doc/c-api/iterator.rst b/Doc/c-api/iterator.rst
index 82cb4eb..4d91e4a 100644
--- a/Doc/c-api/iterator.rst
+++ b/Doc/c-api/iterator.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _iterator-objects:
 
diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index 5b263a7..279783a 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _listobjects:
 
diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index 8093f4b..6be29f9 100644
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _longobjects:
 
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index e37dec9..4244b47 100644
--- a/Doc/c-api/mapping.rst
+++ b/Doc/c-api/mapping.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _mapping:
 
diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst
index 17ec621..b086830 100644
--- a/Doc/c-api/marshal.rst
+++ b/Doc/c-api/marshal.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _marshalling-utils:
 
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 65a2076..ab49e48 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _memory:
diff --git a/Doc/c-api/memoryview.rst b/Doc/c-api/memoryview.rst
index 9f6bfd7..77afb02 100644
--- a/Doc/c-api/memoryview.rst
+++ b/Doc/c-api/memoryview.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _memoryview-objects:
 
diff --git a/Doc/c-api/method.rst b/Doc/c-api/method.rst
index 7a2a84f..1ad805e 100644
--- a/Doc/c-api/method.rst
+++ b/Doc/c-api/method.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _instancemethod-objects:
 
diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
index 017b656..68cbda2 100644
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _moduleobjects:
 
diff --git a/Doc/c-api/none.rst b/Doc/c-api/none.rst
index 45568fe..26d2b7a 100644
--- a/Doc/c-api/none.rst
+++ b/Doc/c-api/none.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _noneobject:
 
diff --git a/Doc/c-api/number.rst b/Doc/c-api/number.rst
index 9fb220b..74932f6 100644
--- a/Doc/c-api/number.rst
+++ b/Doc/c-api/number.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _number:
 
diff --git a/Doc/c-api/objbuffer.rst b/Doc/c-api/objbuffer.rst
index 3572564..6b82a64 100644
--- a/Doc/c-api/objbuffer.rst
+++ b/Doc/c-api/objbuffer.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 Old Buffer Protocol
 -------------------
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index a64ff2e..ffc3524 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _object:
 
diff --git a/Doc/c-api/objimpl.rst b/Doc/c-api/objimpl.rst
index 7023e51..8bd8c10 100644
--- a/Doc/c-api/objimpl.rst
+++ b/Doc/c-api/objimpl.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _newtypes:
 
diff --git a/Doc/c-api/refcounting.rst b/Doc/c-api/refcounting.rst
index 225a1fe..6b07c87 100644
--- a/Doc/c-api/refcounting.rst
+++ b/Doc/c-api/refcounting.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _countingrefs:
diff --git a/Doc/c-api/reflection.rst b/Doc/c-api/reflection.rst
index 9689365..080ea32 100644
--- a/Doc/c-api/reflection.rst
+++ b/Doc/c-api/reflection.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _reflection:
 
diff --git a/Doc/c-api/sequence.rst b/Doc/c-api/sequence.rst
index 6d22f35..d11a2dd 100644
--- a/Doc/c-api/sequence.rst
+++ b/Doc/c-api/sequence.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _sequence:
 
diff --git a/Doc/c-api/set.rst b/Doc/c-api/set.rst
index 64b6dde..074fcb8 100644
--- a/Doc/c-api/set.rst
+++ b/Doc/c-api/set.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _setobjects:
 
diff --git a/Doc/c-api/slice.rst b/Doc/c-api/slice.rst
index 8ad9a29..d924308 100644
--- a/Doc/c-api/slice.rst
+++ b/Doc/c-api/slice.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _slice-objects:
 
diff --git a/Doc/c-api/stable.rst b/Doc/c-api/stable.rst
index 5b771dd..9c05cb3 100644
--- a/Doc/c-api/stable.rst
+++ b/Doc/c-api/stable.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _stable:
 
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
index da45da1..5e0cfd0 100644
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _common-structs:
 
diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst
index c8ea783..04e169a 100644
--- a/Doc/c-api/sys.rst
+++ b/Doc/c-api/sys.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _os:
 
diff --git a/Doc/c-api/tuple.rst b/Doc/c-api/tuple.rst
index 20bf9f0..259ec4f 100644
--- a/Doc/c-api/tuple.rst
+++ b/Doc/c-api/tuple.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _tupleobjects:
 
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index 4dfd53f..2474df2 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _typeobjects:
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 0647a49..b1d96db 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _type-structs:
 
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 724c798..a150a9c 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _unicodeobjects:
 
diff --git a/Doc/c-api/utilities.rst b/Doc/c-api/utilities.rst
index d4484fb..a805b56 100644
--- a/Doc/c-api/utilities.rst
+++ b/Doc/c-api/utilities.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _utilities:
 
diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
index 317093e..a7ff08c 100644
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _veryhigh:
diff --git a/Doc/c-api/weakref.rst b/Doc/c-api/weakref.rst
index 6cb3e33..7a4f861 100644
--- a/Doc/c-api/weakref.rst
+++ b/Doc/c-api/weakref.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _weakrefobjects:
 
diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 9bfad7f..753b551 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _building:
 
@@ -20,7 +20,7 @@
 It returns either a fully-initialized module, or a :c:type:`PyModuleDef`
 instance. See :ref:`initializing-modules` for details.
 
-.. highlightlang:: python
+.. highlight:: python
 
 For modules with ASCII-only names, the function must be named
 ``PyInit_<modulename>``, with ``<modulename>`` replaced by the name of the
@@ -43,7 +43,7 @@
 See the *"Multiple modules in one library"* section in :pep:`489` for details.
 
 
-.. highlightlang:: c
+.. highlight:: c
 
 Building C and C++ Extensions with distutils
 ============================================
diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
index 13d83b7..483bc85 100644
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _embedding:
diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
index 433178a..e459514 100644
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _extending-intro:
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index 8b9549d..308c067 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _new-types-topics:
 
diff --git a/Doc/extending/newtypes_tutorial.rst b/Doc/extending/newtypes_tutorial.rst
index b4bf9b9..59c8cc0 100644
--- a/Doc/extending/newtypes_tutorial.rst
+++ b/Doc/extending/newtypes_tutorial.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _defining-new-types:
 
diff --git a/Doc/extending/windows.rst b/Doc/extending/windows.rst
index 67bdd47..c7b92c6 100644
--- a/Doc/extending/windows.rst
+++ b/Doc/extending/windows.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 
 .. _building-on-windows:
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index ad97cd0..a181086 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -1,6 +1,6 @@
 :tocdepth: 2
 
-.. highlightlang:: none
+.. highlight:: none
 
 .. _windows-faq:
 
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst
index 5b2457a..cfd9f2e 100644
--- a/Doc/howto/clinic.rst
+++ b/Doc/howto/clinic.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 **********************
 Argument Clinic How-To
diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
index b638e32..ce7700f 100644
--- a/Doc/howto/cporting.rst
+++ b/Doc/howto/cporting.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _cporting-howto:
 
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index e142324..a91606c 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: none
+.. highlight:: none
 
 .. _install-index:
 
diff --git a/Doc/installing/index.rst b/Doc/installing/index.rst
index 747b9223..dc44aa6 100644
--- a/Doc/installing/index.rst
+++ b/Doc/installing/index.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: none
+.. highlight:: none
 
 .. _installing-index:
 
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index dfc40d1..9e4d402 100644
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -8,7 +8,7 @@
 
 --------------
 
-.. highlightlang:: none
+.. highlight:: none
 
 **This module is automatically imported during initialization.** The automatic
 import can be suppressed using the interpreter's :option:`-S` option.
diff --git a/Doc/license.rst b/Doc/license.rst
index bf2e4c5..d877f45 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: none
+.. highlight:: none
 
 .. _history-and-license:
 
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 5ae3cc8..87af7e8 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: sh
+.. highlight:: sh
 
 .. ATTENTION: You probably should update Misc/python.man, too, if you modify
    this file.
diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index 31cf87c..021f0d3 100644
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: sh
+.. highlight:: sh
 
 .. _using-on-unix:
 
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 1f8eb16..44b646f 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: none
+.. highlight:: none
 
 .. _using-on-windows: