From cbb6484573ae2058e55614b28d73b0c8478f9a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Wirtel?= <stephane@wirtel.be>
Date: Fri, 17 May 2019 11:55:34 +0200
Subject: [PATCH] Doc: Replace the deprecated highlightlang directive by
 highlight. (#13377)

highlightlang is deprecated since April 2018 in Sphinx.
See https://github.com/sphinx-doc/sphinx/pull/4845
---
 Doc/c-api/abstract.rst              | 2 +-
 Doc/c-api/allocation.rst            | 2 +-
 Doc/c-api/apiabiversion.rst         | 2 +-
 Doc/c-api/arg.rst                   | 2 +-
 Doc/c-api/bool.rst                  | 2 +-
 Doc/c-api/buffer.rst                | 2 +-
 Doc/c-api/bytearray.rst             | 2 +-
 Doc/c-api/bytes.rst                 | 2 +-
 Doc/c-api/capsule.rst               | 2 +-
 Doc/c-api/cell.rst                  | 2 +-
 Doc/c-api/code.rst                  | 2 +-
 Doc/c-api/complex.rst               | 2 +-
 Doc/c-api/concrete.rst              | 2 +-
 Doc/c-api/contextvars.rst           | 2 +-
 Doc/c-api/conversion.rst            | 2 +-
 Doc/c-api/coro.rst                  | 2 +-
 Doc/c-api/datetime.rst              | 2 +-
 Doc/c-api/descriptor.rst            | 2 +-
 Doc/c-api/dict.rst                  | 2 +-
 Doc/c-api/exceptions.rst            | 2 +-
 Doc/c-api/file.rst                  | 2 +-
 Doc/c-api/float.rst                 | 2 +-
 Doc/c-api/function.rst              | 2 +-
 Doc/c-api/gcsupport.rst             | 2 +-
 Doc/c-api/gen.rst                   | 2 +-
 Doc/c-api/import.rst                | 2 +-
 Doc/c-api/init.rst                  | 2 +-
 Doc/c-api/intro.rst                 | 2 +-
 Doc/c-api/iter.rst                  | 2 +-
 Doc/c-api/iterator.rst              | 2 +-
 Doc/c-api/list.rst                  | 2 +-
 Doc/c-api/long.rst                  | 2 +-
 Doc/c-api/mapping.rst               | 2 +-
 Doc/c-api/marshal.rst               | 2 +-
 Doc/c-api/memory.rst                | 2 +-
 Doc/c-api/memoryview.rst            | 2 +-
 Doc/c-api/method.rst                | 2 +-
 Doc/c-api/module.rst                | 2 +-
 Doc/c-api/none.rst                  | 2 +-
 Doc/c-api/number.rst                | 2 +-
 Doc/c-api/objbuffer.rst             | 2 +-
 Doc/c-api/object.rst                | 2 +-
 Doc/c-api/objimpl.rst               | 2 +-
 Doc/c-api/refcounting.rst           | 2 +-
 Doc/c-api/reflection.rst            | 2 +-
 Doc/c-api/sequence.rst              | 2 +-
 Doc/c-api/set.rst                   | 2 +-
 Doc/c-api/slice.rst                 | 2 +-
 Doc/c-api/stable.rst                | 2 +-
 Doc/c-api/structures.rst            | 2 +-
 Doc/c-api/sys.rst                   | 2 +-
 Doc/c-api/tuple.rst                 | 2 +-
 Doc/c-api/type.rst                  | 2 +-
 Doc/c-api/typeobj.rst               | 2 +-
 Doc/c-api/unicode.rst               | 2 +-
 Doc/c-api/utilities.rst             | 2 +-
 Doc/c-api/veryhigh.rst              | 2 +-
 Doc/c-api/weakref.rst               | 2 +-
 Doc/extending/building.rst          | 6 +++---
 Doc/extending/embedding.rst         | 2 +-
 Doc/extending/extending.rst         | 2 +-
 Doc/extending/newtypes.rst          | 2 +-
 Doc/extending/newtypes_tutorial.rst | 2 +-
 Doc/extending/windows.rst           | 2 +-
 Doc/faq/windows.rst                 | 2 +-
 Doc/howto/clinic.rst                | 2 +-
 Doc/howto/cporting.rst              | 2 +-
 Doc/install/index.rst               | 2 +-
 Doc/installing/index.rst            | 2 +-
 Doc/library/site.rst                | 2 +-
 Doc/license.rst                     | 2 +-
 Doc/using/cmdline.rst               | 2 +-
 Doc/using/unix.rst                  | 2 +-
 Doc/using/windows.rst               | 2 +-
 74 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/Doc/c-api/abstract.rst b/Doc/c-api/abstract.rst
index ad538811127..0edd1d5f624 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 25a867f139c..8e8a92003c5 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 890a0383931..b8a8f2ff886 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 b41130ede41..ba9ca5e0d30 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 a9fb342f7c0..ce8de6e22f4 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 c7c1e3cc745..72d965053cf 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 41b6e3c71be..b4a9660a916 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 5b9ebf6b6af..9a62fb682d6 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 8eb6695e22d..3c921bbde34 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 427259cc24d..8514afe928e 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 10d89f297c8..27d3f76d7a3 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 fc63b57a855..675bd013e89 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 9558a4a583c..f83d711795c 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 c344c8d71ae..a7cde7fb195 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 c46722d782a..ed101c791ec 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 2fe50b5d8c4..50428c7eb43 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 77b1b216744..44a04373d19 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 c8f6fa5bcd7..1005140c7ac 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 0ced5a5fd00..e970771893e 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 13f0aff1cf9..00ef00526bc 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 6f2ecee51fd..defc859dd5c 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 27a75e3e0c2..8a996422ce4 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 17279c732ae..02c4ebdbed4 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 b739aacea8d..b3f30b2ed9e 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 1efbae4fcba..8d54021c181 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 8cdc256e7c9..86cc4031610 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 b30649498a9..a0ac4d21d13 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 69aef0da04f..b003bbaeff2 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 2ba444d1de6..546efb518a7 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 82cb4eba8ab..4d91e4a224f 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 5b263a7b1cd..279783a243a 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 8093f4b627a..6be29f9cd32 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 e37dec9949a..4244b47af75 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 17ec621610b..b086830feb1 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 65a207691b8..ab49e48782d 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 9f6bfd751ad..77afb020405 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 7a2a84fe110..1ad805e269a 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 017b656854a..68cbda2938f 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 45568fe657b..26d2b7aab20 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 9fb220b192b..74932f6e744 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 3572564b13e..6b82a642d7e 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 a64ff2e6b58..ffc35241e7a 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 7023e519eda..8bd8c107c98 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 225a1feb250..6b07c87d62e 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 96893652f73..080ea3222cf 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 6d22f35e22b..d11a2dde54d 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 64b6dde3b74..074fcb877e1 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 8ad9a29b256..d924308890b 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 5b771dd4adc..9c05cb3c82d 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 da45da1d3c7..5e0cfd0264f 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 c8ea78363df..04e169a00dc 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 20bf9f0b080..259ec4fb485 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 4dfd53fb9f0..2474df2c90b 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 0647a493303..b1d96db7f53 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 724c798456f..a150a9c39d8 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 d4484fb2712..a805b564763 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 317093e9561..a7ff08cfb6b 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 6cb3e33fe84..7a4f8615b9c 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 9bfad7fc318..753b5511ed9 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _building:
 
@@ -20,7 +20,7 @@ The initialization function has the signature:
 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 @@ function corresponding to the filename is found.
 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 13d83b72f82..483bc852f6c 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 433178ab64d..e459514b2b5 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 8b9549d7e39..308c06705e8 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 b4bf9b9e6f7..59c8cc01222 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 67bdd475aeb..c7b92c6ea24 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 ad97cd0932a..a181086e9ce 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 5b2457a1682..cfd9f2e4075 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 b638e32f5d0..ce7700fc599 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 e14232415be..a91606c0f38 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 747b9223b62..dc44aa64b8e 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 dfc40d17944..9e4d402c1f5 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 bf2e4c522ce..d877f456775 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 5ae3cc808b3..87af7e8be13 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 31cf87c66f5..021f0d35a8e 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 1f8eb16e505..44b646fddfc 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -1,4 +1,4 @@
-.. highlightlang:: none
+.. highlight:: none
 
 .. _using-on-windows: