vendor/krb5/1.21.1

870 files changed, 2075 insertions, 1479 deletions

diff --git a/doc/html/_sources/appdev/gssapi.txt b/doc/html/_sources/appdev/gssapi.rst.txt
index c39bbddb9738..339fd6c7c155 100644
--- a/doc/html/_sources/appdev/gssapi.txt
+++ b/doc/html/_sources/appdev/gssapi.rst.txt
@@ -55,6 +55,18 @@ name types are supported by the krb5 mechanism:
 * **GSS_C_NT_EXPORT_NAME**: The value must be the result of a
   gss_export_name_ call.
 
+* **GSS_KRB5_NT_ENTERPRISE_NAME**: The value should be a krb5
+  enterprise name string (see :rfc:`6806` section 5), in the form
+  ``user@suffix``.  This name type is used to convey alias names, and
+  is defined in the ``<gssapi/gssapi_krb5.h>`` header.  (New in
+  release 1.17.)
+
+* **GSS_KRB5_NT_X509_CERT**: The value should be an X.509 certificate
+  encoded according to :rfc:`5280`.  This name form can be used for
+  the desired_name parameter of gss_acquire_cred_impersonate_name(),
+  to identify the S4U2Self user by certificate.  (New in release
+  1.19.)
+
 
 Initiator credentials
 ---------------------
@@ -194,6 +206,93 @@ so multiple invocations may be necessary to retrieve all of the
 indicators from the ticket.  (New in release 1.15.)
 
 
+Credential store extensions
+---------------------------
+
+Beginning with release 1.11, the following GSSAPI extensions declared
+in ``<gssapi/gssapi_ext.h>`` can be used to specify how credentials
+are acquired or stored::
+
+    struct gss_key_value_element_struct {
+        const char *key;
+        const char *value;
+    };
+    typedef struct gss_key_value_element_struct gss_key_value_element_desc;
+
+    struct gss_key_value_set_struct {
+        OM_uint32 count;
+        gss_key_value_element_desc *elements;
+    };
+    typedef const struct gss_key_value_set_struct gss_key_value_set_desc;
+    typedef const gss_key_value_set_desc *gss_const_key_value_set_t;
+
+    OM_uint32 gss_acquire_cred_from(OM_uint32 *minor_status,
+                                    const gss_name_t desired_name,
+                                    OM_uint32 time_req,
+                                    const gss_OID_set desired_mechs,
+                                    gss_cred_usage_t cred_usage,
+                                    gss_const_key_value_set_t cred_store,
+                                    gss_cred_id_t *output_cred_handle,
+                                    gss_OID_set *actual_mechs,
+                                    OM_uint32 *time_rec);
+
+    OM_uint32 gss_store_cred_into(OM_uint32 *minor_status,
+                                  gss_cred_id_t input_cred_handle,
+                                  gss_cred_usage_t cred_usage,
+                                  const gss_OID desired_mech,
+                                  OM_uint32 overwrite_cred,
+                                  OM_uint32 default_cred,
+                                  gss_const_key_value_set_t cred_store,
+                                  gss_OID_set *elements_stored,
+                                  gss_cred_usage_t *cred_usage_stored);
+
+The additional *cred_store* parameter allows the caller to specify
+information about how the credentials should be obtained and stored.
+The following options are supported by the krb5 mechanism:
+
+* **ccache**: For acquiring initiator credentials, the name of the
+  :ref:`credential cache <ccache_definition>` to which the handle will
+  refer.  For storing credentials, the name of the cache or collection
+  where the credentials will be stored (see below).
+
+* **client_keytab**: For acquiring initiator credentials, the name of
+  the :ref:`keytab <keytab_definition>` which will be used, if
+  necessary, to refresh the credentials in the cache.
+
+* **keytab**: For acquiring acceptor credentials, the name of the
+  :ref:`keytab <keytab_definition>` to which the handle will refer.
+  In release 1.19 and later, this option also determines the keytab to
+  be used for verification when initiator credentials are acquired
+  using a password and verified.
+
+* **password**: For acquiring initiator credentials, this option
+  instructs the mechanism to acquire fresh credentials into a unique
+  memory credential cache.  This option may not be used with the
+  **ccache** or **client_keytab** options, and a *desired_name* must
+  be specified.  (New in release 1.19.)
+
+* **rcache**: For acquiring acceptor credentials, the name of the
+  :ref:`replay cache <rcache_definition>` to be used when processing
+  the initiator tokens.  (New in release 1.13.)
+
+* **verify**: For acquiring initiator credentials, this option
+  instructs the mechanism to verify the credentials by obtaining a
+  ticket to a service with a known key.  The service key is obtained
+  from the keytab specified with the **keytab** option or the default
+  keytab.  The value may be the name of a principal in the keytab, or
+  the empty string.  If the empty string is given, any ``host``
+  service principal in the keytab may be used.  (New in release 1.19.)
+
+In release 1.20 or later, if a collection name is specified for
+**cache** in a call to gss_store_cred_into(), an existing cache for
+the client principal within the collection will be selected, or a new
+cache will be created within the collection.  If *overwrite_cred* is
+false and the selected credential cache already exists, a
+**GSS_S_DUPLICATE_ELEMENT** error will be returned.  If *default_cred*
+is true, the primary cache of the collection will be switched to the
+selected cache.
+
+
 Importing and exporting credentials
 -----------------------------------
 
@@ -252,13 +351,13 @@ ticket-granting ticket, if the KDC is configured to allow it.
 
 To perform a constrained delegation operation, the intermediate
 service must submit to the KDC an "evidence ticket" from the client to
-the intermediate service with the forwardable bit set.  An evidence
-ticket can be acquired when the client authenticates to the
-intermediate service with Kerberos, or with an S4U2Self request if the
-KDC allows it.  The MIT krb5 GSSAPI library represents an evidence
-ticket using a "proxy credential", which is a special kind of
-gss_cred_id_t object whose underlying credential cache contains the
-evidence ticket and a krbtgt ticket for the intermediate service.
+the intermediate service.  An evidence ticket can be acquired when the
+client authenticates to the intermediate service with Kerberos, or
+with an S4U2Self request if the KDC allows it.  The MIT krb5 GSSAPI
+library represents an evidence ticket using a "proxy credential",
+which is a special kind of gss_cred_id_t object whose underlying
+credential cache contains the evidence ticket and a krbtgt ticket for
+the intermediate service.
 
 To acquire a proxy credential during client authentication, the
 service should first create an acceptor credential using the
@@ -267,9 +366,9 @@ credential as the *acceptor_cred_handle* to gss_accept_sec_context_,
 and also pass a *delegated_cred_handle* output parameter to receive a
 proxy credential containing the evidence ticket.  The output value of
 *delegated_cred_handle* may be a delegated ticket-granting ticket if
-the client sent one, or a proxy credential if the client authenticated
-with a forwardable service ticket, or **GSS_C_NO_CREDENTIAL** if
-neither is the case.
+the client sent one, or a proxy credential if not.  If the library can
+determine that the client's ticket is not a valid evidence ticket, it
+will place **GSS_C_NO_CREDENTIAL** in *delegated_cred_handle*.
 
 To acquire a proxy credential using an S4U2Self request, the service
 can use the following GSSAPI extension::
@@ -290,17 +389,10 @@ request to the KDC for a ticket from *desired_name* to the
 intermediate service.  Both *icred* and *desired_name* are required
 for this function; passing **GSS_C_NO_CREDENTIAL** or
 **GSS_C_NO_NAME** will cause the call to fail.  *icred* must contain a
-krbtgt ticket for the intermediate service.  If the KDC returns a
-forwardable ticket, the result of this operation is a proxy
-credential; if it is not forwardable, the result is a regular
-credential for *desired_name*.
-
-A recent KDC will usually allow any service to acquire a ticket from a
-client to itself with an S4U2Self request, but the ticket will only be
-forwardable if the service has a specific privilege.  In the MIT krb5
-KDC, this privilege is determined by the **ok_to_auth_as_delegate**
-bit on the intermediate service's principal entry, which can be
-configured with :ref:`kadmin(1)`.
+krbtgt ticket for the intermediate service.  The result of this
+operation is a proxy credential.  (Prior to release 1.18, the result
+of this operation may be a regular credential for *desired_name*, if
+the KDC issues a non-forwardable ticket.)
 
 Once the intermediate service has a proxy credential, it can simply
 pass it to gss_init_sec_context_ as the *initiator_cred_handle*
@@ -613,25 +705,23 @@ gss_get_mic_iov_length and gss_get_mic_iov::
     iov[1].buffer.value = "message";
     iov[1].buffer.length = 7;
 
-    major = gss_wrap_iov_length(&minor, ctx, 1, GSS_C_QOP_DEFAULT,
-                                NULL, iov, 2);
+    major = gss_get_mic_iov_length(&minor, ctx, GSS_C_QOP_DEFAULT, iov, 2);
     if (GSS_ERROR(major))
         handle_error(major, minor);
     if (iov[0].buffer.length > sizeof(data))
         handle_out_of_space_error();
     iov[0].buffer.value = data;
 
-    major = gss_wrap_iov(&minor, ctx, 1, GSS_C_QOP_DEFAULT, NULL,
-                         iov, 2);
+    major = gss_get_mic_iov(&minor, ctx, GSS_C_QOP_DEFAULT, iov, 2);
     if (GSS_ERROR(major))
         handle_error(major, minor);
 
 
-.. _gss_accept_sec_context: http://tools.ietf.org/html/rfc2744.html#section-5.1
-.. _gss_acquire_cred: http://tools.ietf.org/html/rfc2744.html#section-5.2
-.. _gss_export_name: http://tools.ietf.org/html/rfc2744.html#section-5.13
-.. _gss_get_name_attribute: http://tools.ietf.org/html/6680.html#section-7.5
-.. _gss_import_name: http://tools.ietf.org/html/rfc2744.html#section-5.16
-.. _gss_init_sec_context: http://tools.ietf.org/html/rfc2744.html#section-5.19
-.. _gss_inquire_name: http://tools.ietf.org/html/rfc6680.txt#section-7.4
-.. _gss_inquire_cred: http://tools.ietf.org/html/rfc2744.html#section-5.21
+.. _gss_accept_sec_context: https://tools.ietf.org/html/rfc2744.html#section-5.1
+.. _gss_acquire_cred: https://tools.ietf.org/html/rfc2744.html#section-5.2
+.. _gss_export_name: https://tools.ietf.org/html/rfc2744.html#section-5.13
+.. _gss_get_name_attribute: https://tools.ietf.org/html/6680.html#section-7.5
+.. _gss_import_name: https://tools.ietf.org/html/rfc2744.html#section-5.16
+.. _gss_init_sec_context: https://tools.ietf.org/html/rfc2744.html#section-5.19
+.. _gss_inquire_name: https://tools.ietf.org/html/rfc6680.txt#section-7.4
+.. _gss_inquire_cred: https://tools.ietf.org/html/rfc2744.html#section-5.21
diff --git a/doc/html/_sources/appdev/h5l_mit_apidiff.txt b/doc/html/_sources/appdev/h5l_mit_apidiff.rst.txt
index 0ea5e32efc28..b721b57be689 100644
--- a/doc/html/_sources/appdev/h5l_mit_apidiff.txt
+++ b/doc/html/_sources/appdev/h5l_mit_apidiff.rst.txt
@@ -19,10 +19,7 @@ Differences between Heimdal and MIT Kerberos API
   :c:func:`krb5_auth_con_setsendsubkey()`  H5l: Not implemented as of version 1.3.3
   :c:func:`krb5_cc_set_config()`           MIT: Before version 1.10 it was assumed that
                                            the last argument *data* is ALWAYS non-zero.
-  :c:func:`krb5_cccol_last_change_time()`  H5l takes 3 arguments: krb5_context context,
-                                           const char \*type, krb5_timestamp \*change_time
-                                           MIT takes two arguments: krb5_context context,
-                                           krb5_timestamp \*change_time
+  :c:func:`krb5_cccol_last_change_time()`  MIT: not implemented
   :c:func:`krb5_set_default_realm()`       H5l: Caches the computed default realm context
                                            field.  If the second argument is NULL,
                                            it tries to retrieve it from libdefaults or DNS.
diff --git a/doc/html/_sources/appdev/index.txt b/doc/html/_sources/appdev/index.rst.txt
index 961bb1e9e23a..961bb1e9e23a 100644
--- a/doc/html/_sources/appdev/index.txt
+++ b/doc/html/_sources/appdev/index.rst.txt
diff --git a/doc/html/_sources/appdev/init_creds.txt b/doc/html/_sources/appdev/init_creds.rst.txt
index 5c3c0a87c5da..5c3c0a87c5da 100644
--- a/doc/html/_sources/appdev/init_creds.txt
+++ b/doc/html/_sources/appdev/init_creds.rst.txt
diff --git a/doc/html/_sources/appdev/princ_handle.txt b/doc/html/_sources/appdev/princ_handle.rst.txt
index 455f00a4b6e7..455f00a4b6e7 100644
--- a/doc/html/_sources/appdev/princ_handle.txt
+++ b/doc/html/_sources/appdev/princ_handle.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/index.txt b/doc/html/_sources/appdev/refs/api/index.rst.txt
index f2f27fe72ea2..d12be47c3ce1 100644
--- a/doc/html/_sources/appdev/refs/api/index.txt
+++ b/doc/html/_sources/appdev/refs/api/index.rst.txt
@@ -157,8 +157,6 @@ Rarely used public interfaces
    krb5_cc_get_config.rst
    krb5_cc_get_flags.rst
    krb5_cc_get_full_name.rst
-   krb5_cc_last_change_time.rst
-   krb5_cc_lock.rst
    krb5_cc_move.rst
    krb5_cc_next_cred.rst
    krb5_cc_remove_cred.rst
@@ -171,14 +169,10 @@ Rarely used public interfaces
    krb5_cc_store_cred.rst
    krb5_cc_support_switch.rst
    krb5_cc_switch.rst
-   krb5_cc_unlock.rst
    krb5_cccol_cursor_free.rst
    krb5_cccol_cursor_new.rst
    krb5_cccol_cursor_next.rst
    krb5_cccol_have_content.rst
-   krb5_cccol_last_change_time.rst
-   krb5_cccol_lock.rst
-   krb5_cccol_unlock.rst
    krb5_clear_error_message.rst
    krb5_check_clockskew.rst
    krb5_copy_addresses.rst
@@ -212,6 +206,7 @@ Rarely used public interfaces
    krb5_free_string.rst
    krb5_free_ticket.rst
    krb5_free_unparsed_name.rst
+   krb5_get_etype_info.rst
    krb5_get_permitted_enctypes.rst
    krb5_get_server_rcache.rst
    krb5_get_time_offsets.rst
@@ -228,6 +223,8 @@ Rarely used public interfaces
    krb5_init_creds_step.rst
    krb5_init_keyblock.rst
    krb5_is_referral_realm.rst
+   krb5_kdc_sign_ticket.rst
+   krb5_kdc_verify_ticket.rst
    krb5_kt_add_entry.rst
    krb5_kt_end_seq_get.rst
    krb5_kt_get_entry.rst
@@ -237,6 +234,7 @@ Rarely used public interfaces
    krb5_kt_remove_entry.rst
    krb5_kt_start_seq_get.rst
    krb5_make_authdata_kdc_issued.rst
+   krb5_marshal_credentials.rst
    krb5_merge_authdata.rst
    krb5_mk_1cred.rst
    krb5_mk_error.rst
@@ -255,7 +253,10 @@ Rarely used public interfaces
    krb5_pac_init.rst
    krb5_pac_parse.rst
    krb5_pac_sign.rst
+   krb5_pac_sign_ext.rst
    krb5_pac_verify.rst
+   krb5_pac_verify_ext.rst
+   krb5_pac_get_client_info.rst
    krb5_prepend_error_message.rst
    krb5_principal2salt.rst
    krb5_rd_cred.rst
@@ -287,6 +288,7 @@ Rarely used public interfaces
    krb5_tkt_creds_get_times.rst
    krb5_tkt_creds_init.rst
    krb5_tkt_creds_step.rst
+   krb5_unmarshal_credentials.rst
    krb5_verify_init_creds.rst
    krb5_verify_init_creds_opt_init.rst
    krb5_verify_init_creds_opt_set_ap_req_nofail.rst
diff --git a/doc/html/_sources/appdev/refs/api/krb5_425_conv_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_425_conv_principal.rst.txt
index c6b68270e296..c6b68270e296 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_425_conv_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_425_conv_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_524_conv_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_524_conv_principal.rst.txt
index 14b2fc10137e..14b2fc10137e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_524_conv_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_524_conv_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_524_convert_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_524_convert_creds.rst.txt
index f8d96f0da7a1..f8d96f0da7a1 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_524_convert_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_524_convert_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_address_compare.txt b/doc/html/_sources/appdev/refs/api/krb5_address_compare.rst.txt
index 7665fc705c2e..7665fc705c2e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_address_compare.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_address_compare.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_address_order.txt b/doc/html/_sources/appdev/refs/api/krb5_address_order.rst.txt
index 6d344ccf2e5a..2ba9aab67bbf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_address_order.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_address_order.rst.txt
@@ -21,9 +21,9 @@ krb5_address_order -  Return an ordering of the specified addresses.
 
 
 :retval:
-         -   0   The two addresses are the same
-         -   \<   0 First address is less than second
-         -   \>   0 First address is greater than second
+         -   0   if The two addresses are the same
+         -   <   0 First address is less than second
+         -   >   0 First address is greater than second
 
 
 ..
diff --git a/doc/html/_sources/appdev/refs/api/krb5_address_search.txt b/doc/html/_sources/appdev/refs/api/krb5_address_search.rst.txt
index 2bc68c490111..2bc68c490111 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_address_search.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_address_search.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_allow_weak_crypto.txt b/doc/html/_sources/appdev/refs/api/krb5_allow_weak_crypto.rst.txt
index f81d5040fb2c..87e69ed281d4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_allow_weak_crypto.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_allow_weak_crypto.rst.txt
@@ -1,5 +1,5 @@
-krb5_allow_weak_crypto -  Allow the appplication to override the profile's allow_weak_crypto setting. 
-======================================================================================================
+krb5_allow_weak_crypto -  Allow the application to override the profile's allow_weak_crypto setting. 
+=====================================================================================================
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_aname_to_localname.txt b/doc/html/_sources/appdev/refs/api/krb5_aname_to_localname.rst.txt
index c6162940839d..c6162940839d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_aname_to_localname.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_aname_to_localname.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_anonymous_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_anonymous_principal.rst.txt
index 4de5547b10dd..4de5547b10dd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_anonymous_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_anonymous_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_anonymous_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_anonymous_realm.rst.txt
index b8366abb426a..b8366abb426a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_anonymous_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_anonymous_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_appdefault_boolean.txt b/doc/html/_sources/appdev/refs/api/krb5_appdefault_boolean.rst.txt
index e1643411340b..e1643411340b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_appdefault_boolean.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_appdefault_boolean.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_appdefault_string.txt b/doc/html/_sources/appdev/refs/api/krb5_appdefault_string.rst.txt
index 1c7590b75192..1c7590b75192 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_appdefault_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_appdefault_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_free.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_free.rst.txt
index 2062de7842e6..2062de7842e6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_genaddrs.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_genaddrs.rst.txt
index b8a3f40538e3..b8a3f40538e3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_genaddrs.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_genaddrs.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_get_checksum_func.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_get_checksum_func.rst.txt
index e3a427427ffd..e3a427427ffd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_get_checksum_func.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_get_checksum_func.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getaddrs.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getaddrs.rst.txt
index 1225294092e5..1225294092e5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getaddrs.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getaddrs.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getauthenticator.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getauthenticator.rst.txt
index a2883385982d..a2883385982d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getauthenticator.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getauthenticator.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getflags.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getflags.rst.txt
index 1884f127a555..1884f127a555 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getflags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getflags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey.rst.txt
index cfe99ff259c4..cfe99ff259c4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey_k.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey_k.rst.txt
index 0a320aeb3e61..0a320aeb3e61 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey_k.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getkey_k.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalseqnumber.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalseqnumber.rst.txt
index 977d0efbf5ee..977d0efbf5ee 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalseqnumber.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalseqnumber.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalsubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalsubkey.rst.txt
index 655b9d581d34..655b9d581d34 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalsubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getlocalsubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrcache.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrcache.rst.txt
index c50663643508..c50663643508 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrcache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrcache.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey.rst.txt
index 1b7ddfa63c74..1b7ddfa63c74 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.rst.txt
index 44ce57307ba5..44ce57307ba5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremoteseqnumber.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremoteseqnumber.rst.txt
index 9dee0e61fd21..9dee0e61fd21 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremoteseqnumber.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremoteseqnumber.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremotesubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremotesubkey.rst.txt
index 3f1095c9fe1a..3f1095c9fe1a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremotesubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getremotesubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey.rst.txt
index 6a842b6a3cc8..6a842b6a3cc8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey_k.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey_k.rst.txt
index c63e6c9613ac..c63e6c9613ac 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey_k.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_getsendsubkey_k.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_init.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_init.rst.txt
index 9c5ee8f10458..9c5ee8f10458 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_initivector.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_initivector.rst.txt
index 4dc9e0afb9a0..4dc9e0afb9a0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_initivector.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_initivector.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_checksum_func.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_checksum_func.rst.txt
index a762d4e85c9a..a762d4e85c9a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_checksum_func.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_checksum_func.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_req_cksumtype.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_req_cksumtype.rst.txt
index 76c948e67dc8..76c948e67dc8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_req_cksumtype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_set_req_cksumtype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setaddrs.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setaddrs.rst.txt
index 47302190492d..47302190492d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setaddrs.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setaddrs.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setflags.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setflags.rst.txt
index a159e23da2c2..a159e23da2c2 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setflags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setflags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setports.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setports.rst.txt
index 279c327e2447..279c327e2447 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setports.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setports.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrcache.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrcache.rst.txt
index 9b197a3a7a50..0a37e8aef22c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrcache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrcache.rst.txt
@@ -32,7 +32,7 @@ krb5_auth_con_setrcache -  Set the replay cache in an auth context.
 
 
 
-This function sets the replay cache in *auth_context* to *rcache* . *rcache* will be closed when *auth_context* is freed, so the caller should relinguish that responsibility.
+This function sets the replay cache in *auth_context* to *rcache* . *rcache* will be closed when *auth_context* is freed, so the caller should relinquish that responsibility.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey.rst.txt
index 7e43d9148dcd..7e43d9148dcd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.rst.txt
index feafaabff0b4..feafaabff0b4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey.rst.txt
index 47f746b57035..47f746b57035 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey_k.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey_k.rst.txt
index 59fd7392b96a..59fd7392b96a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey_k.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setsendsubkey_k.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setuseruserkey.txt b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setuseruserkey.rst.txt
index 11d9249dd9b5..11d9249dd9b5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_auth_con_setuseruserkey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_auth_con_setuseruserkey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_build_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_build_principal.rst.txt
index 5a8cb0e89479..1e0a8b3e71e4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_build_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_build_principal.rst.txt
@@ -41,6 +41,10 @@ Call :c:func:`krb5_free_principal()` to free *princ* when it is no longer needed
 
 
 
+Beginning with release 1.20, the name type of the principal will be inferred as **KRB5_NT_SRV_INST** or **KRB5_NT_WELLKNOWN** based on the principal name. The type will be **KRB5_NT_PRINCIPAL** if a type cannot be inferred.
+
+
+
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_build_principal_alloc_va.txt b/doc/html/_sources/appdev/refs/api/krb5_build_principal_alloc_va.rst.txt
index 6f8a57e49e8a..6f8a57e49e8a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_build_principal_alloc_va.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_build_principal_alloc_va.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_build_principal_ext.txt b/doc/html/_sources/appdev/refs/api/krb5_build_principal_ext.rst.txt
index e1b6397853f5..009023ea6053 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_build_principal_ext.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_build_principal_ext.rst.txt
@@ -41,6 +41,10 @@ This function creates a principal from a length-counted string and a variable-le
 
 
 
+Beginning with release 1.20, the name type of the principal will be inferred as **KRB5_NT_SRV_INST** or **KRB5_NT_WELLKNOWN** based on the principal name. The type will be **KRB5_NT_PRINCIPAL** if a type cannot be inferred.
+
+
+
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_build_principal_va.txt b/doc/html/_sources/appdev/refs/api/krb5_build_principal_va.rst.txt
index 88f530e27ba0..88f530e27ba0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_build_principal_va.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_build_principal_va.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_block_size.txt b/doc/html/_sources/appdev/refs/api/krb5_c_block_size.rst.txt
index 4c4a13eafaab..4c4a13eafaab 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_block_size.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_block_size.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_checksum_length.txt b/doc/html/_sources/appdev/refs/api/krb5_c_checksum_length.rst.txt
index 644e34bf2b9a..644e34bf2b9a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_checksum_length.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_checksum_length.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length.txt b/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length.rst.txt
index 3879981ef814..3879981ef814 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length_iov.rst.txt
index 1b4edaa50746..1b4edaa50746 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_crypto_length_iov.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_decrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_c_decrypt.rst.txt
index 31f011d12e84..31f011d12e84 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_decrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_decrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_decrypt_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_c_decrypt_iov.rst.txt
index 2dc3f1061c2b..7b925178fba1 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_decrypt_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_decrypt_iov.rst.txt
@@ -62,8 +62,6 @@ This function decrypts the data block *data* and stores the output in-place. The
 .. note::
 
 	 On return from a :c:func:`krb5_c_decrypt_iov()` call, the *data->length* in the iov structure are adjusted to reflect actual lengths of the ciphertext used. For example, if the padding length is too large, the length will be reduced. Lengths are never increased.
-
-	 This function is similar to :c:func:`krb5_k_decrypt_iov()` , but operates on keyblock *keyblock* .
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_derive_prfplus.txt b/doc/html/_sources/appdev/refs/api/krb5_c_derive_prfplus.rst.txt
index fdb62c501b24..fdb62c501b24 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_derive_prfplus.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_derive_prfplus.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt.rst.txt
index 7b6cb038b3bf..7b6cb038b3bf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_iov.rst.txt
index dbfcb527762e..5ad8585fe077 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_iov.rst.txt
@@ -62,8 +62,6 @@ This function encrypts the data block *data* and stores the output in-place. The
 .. note::
 
 	 On return from a :c:func:`krb5_c_encrypt_iov()` call, the *data->length* in the iov structure are adjusted to reflect actual lengths of the ciphertext used. For example, if the padding length is too large, the length will be reduced. Lengths are never increased.
-
-	 This function is similar to :c:func:`krb5_k_encrypt_iov()` , but operates on keyblock *keyblock* .
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_length.txt b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_length.rst.txt
index a459c3a48698..a459c3a48698 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_length.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_encrypt_length.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_enctype_compare.txt b/doc/html/_sources/appdev/refs/api/krb5_c_enctype_compare.rst.txt
index 156cdd23ebf0..156cdd23ebf0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_enctype_compare.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_enctype_compare.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_free_state.txt b/doc/html/_sources/appdev/refs/api/krb5_c_free_state.rst.txt
index f934e9595546..f934e9595546 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_free_state.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_free_state.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_fx_cf2_simple.txt b/doc/html/_sources/appdev/refs/api/krb5_c_fx_cf2_simple.rst.txt
index 0d9cf9d5c6fd..0d9cf9d5c6fd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_fx_cf2_simple.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_fx_cf2_simple.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_init_state.txt b/doc/html/_sources/appdev/refs/api/krb5_c_init_state.rst.txt
index c28dca743b73..c28dca743b73 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_init_state.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_init_state.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_is_coll_proof_cksum.txt b/doc/html/_sources/appdev/refs/api/krb5_c_is_coll_proof_cksum.rst.txt
index 478f24668a57..478f24668a57 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_is_coll_proof_cksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_is_coll_proof_cksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_is_keyed_cksum.txt b/doc/html/_sources/appdev/refs/api/krb5_c_is_keyed_cksum.rst.txt
index ed6e6ab4079a..ed6e6ab4079a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_is_keyed_cksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_is_keyed_cksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_keyed_checksum_types.txt b/doc/html/_sources/appdev/refs/api/krb5_c_keyed_checksum_types.rst.txt
index 22f509218852..22f509218852 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_keyed_checksum_types.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_keyed_checksum_types.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_keylengths.txt b/doc/html/_sources/appdev/refs/api/krb5_c_keylengths.rst.txt
index 9b195c436db9..9b195c436db9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_keylengths.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_keylengths.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum.rst.txt
index f432c601396f..f432c601396f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum_iov.rst.txt
index d313c2b04972..d313c2b04972 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_make_checksum_iov.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_make_random_key.txt b/doc/html/_sources/appdev/refs/api/krb5_c_make_random_key.rst.txt
index d485c1c50f7c..d485c1c50f7c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_make_random_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_make_random_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_padding_length.txt b/doc/html/_sources/appdev/refs/api/krb5_c_padding_length.rst.txt
index 35471bf12e03..35471bf12e03 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_padding_length.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_padding_length.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_prf.txt b/doc/html/_sources/appdev/refs/api/krb5_c_prf.rst.txt
index b626f43b6f25..b626f43b6f25 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_prf.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_prf.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_prf_length.txt b/doc/html/_sources/appdev/refs/api/krb5_c_prf_length.rst.txt
index ff20e291c29e..ff20e291c29e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_prf_length.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_prf_length.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_prfplus.txt b/doc/html/_sources/appdev/refs/api/krb5_c_prfplus.rst.txt
index 682a8f4614c3..682a8f4614c3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_prfplus.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_prfplus.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.rst.txt
new file mode 100644
index 000000000000..cfd8779786aa
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.rst.txt
@@ -0,0 +1,46 @@
+krb5_c_random_add_entropy
+=========================
+
+..
+
+.. c:function:: krb5_error_code krb5_c_random_add_entropy(krb5_context context, unsigned int randsource, const krb5_data * data)
+
+..
+
+
+:param:
+
+	          **context**
+
+	          **randsource**
+
+	          **data**
+
+
+..
+
+
+
+..
+
+
+DEPRECATED This call is no longer necessary. 
+
+
+
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.txt
deleted file mode 100644
index d64693c93c96..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_c_random_add_entropy.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-krb5_c_random_add_entropy -  Add entropy to the pseudo-random number generator. 
-================================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_c_random_add_entropy(krb5_context context, unsigned int randsource, const krb5_data * data)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **randsource** - Entropy source (see KRB5_RANDSOURCE types)
-
-	          **[in]** **data** - Data
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-Contribute entropy to the PRNG used by krb5 crypto operations. This may or may not affect the output of the next crypto operation requiring random data.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_make_octets.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_make_octets.rst.txt
index 91a1159b65fd..91a1159b65fd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_random_make_octets.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_random_make_octets.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.rst.txt
new file mode 100644
index 000000000000..d4a66bdde5eb
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.rst.txt
@@ -0,0 +1,46 @@
+krb5_c_random_os_entropy
+========================
+
+..
+
+.. c:function:: krb5_error_code krb5_c_random_os_entropy(krb5_context context, int strong, int * success)
+
+..
+
+
+:param:
+
+	          **context**
+
+	          **strong**
+
+	          **success**
+
+
+..
+
+
+
+..
+
+
+DEPRECATED This call is no longer necessary. 
+
+
+
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.txt
deleted file mode 100644
index 65fc2511c17d..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_c_random_os_entropy.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-krb5_c_random_os_entropy -  Collect entropy from the OS if possible. 
-=====================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_c_random_os_entropy(krb5_context context, int strong, int * success)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **strong** - Strongest available source of entropy
-
-	          **[out]** **success** - 1 if OS provides entropy, 0 otherwise
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-If *strong* is non-zero, this function attempts to use the strongest available source of entropy. Setting this flag may cause the function to block on some operating systems. Good uses include seeding the PRNG for kadmind and realm setup.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_seed.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_seed.rst.txt
index 9e1c81638270..0b47a86e662c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_random_seed.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_random_seed.rst.txt
@@ -22,7 +22,7 @@ krb5_c_random_seed
 ..
 
 
-DEPRECATED Replaced by krb5_c_* API family. 
+DEPRECATED This call is no longer necessary. 
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_random_to_key.txt b/doc/html/_sources/appdev/refs/api/krb5_c_random_to_key.rst.txt
index 927c8780f30d..927c8780f30d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_random_to_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_random_to_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key.txt b/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key.rst.txt
index deacb1490965..deacb1490965 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key_with_params.txt b/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key_with_params.rst.txt
index 8ec6e2170212..8ec6e2170212 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key_with_params.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_string_to_key_with_params.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_valid_cksumtype.txt b/doc/html/_sources/appdev/refs/api/krb5_c_valid_cksumtype.rst.txt
index 0cc7787fde3f..0cc7787fde3f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_valid_cksumtype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_valid_cksumtype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_valid_enctype.txt b/doc/html/_sources/appdev/refs/api/krb5_c_valid_enctype.rst.txt
index f5adeee863de..f5adeee863de 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_valid_enctype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_valid_enctype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum.rst.txt
index 49eb59902a27..49eb59902a27 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum_iov.rst.txt
index e8c37b3ce639..e8c37b3ce639 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_c_verify_checksum_iov.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_calculate_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_calculate_checksum.rst.txt
index ef40b12e32db..ef40b12e32db 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_calculate_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_calculate_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_cache_match.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_cache_match.rst.txt
index 3e01accab529..3e01accab529 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_cache_match.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_cache_match.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_close.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_close.rst.txt
index 6a58c9a214ab..6a58c9a214ab 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_close.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_close.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_copy_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_copy_creds.rst.txt
index f3af7c11665f..f3af7c11665f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_copy_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_copy_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_default.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_default.rst.txt
index 3a85ba4a1fd5..3a85ba4a1fd5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_default.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_default.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_default_name.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_default_name.rst.txt
index f54c5e5c973f..f54c5e5c973f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_default_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_default_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_destroy.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_destroy.rst.txt
index 12254719d3d0..12254719d3d0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_destroy.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_destroy.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_dup.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_dup.rst.txt
index 00179a0bf06c..00179a0bf06c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_dup.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_dup.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_end_seq_get.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_end_seq_get.rst.txt
index b5b0900972a9..b5b0900972a9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_end_seq_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_end_seq_get.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_gen_new.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_gen_new.rst.txt
index 3672b36274c8..3672b36274c8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_gen_new.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_gen_new.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_config.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_config.rst.txt
index 4021ee60e7f5..4021ee60e7f5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_config.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_config.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_flags.rst.txt
index ca764c8b4f06..ca764c8b4f06 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_full_name.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_full_name.rst.txt
index 7c570459724f..7c570459724f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_full_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_full_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_name.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_name.rst.txt
index 34afeee49de6..34afeee49de6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_principal.rst.txt
index 139817c0451b..139817c0451b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_get_type.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_get_type.rst.txt
index a970bd6d1974..a970bd6d1974 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_get_type.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_get_type.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_initialize.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_initialize.rst.txt
index d306a2924db0..d306a2924db0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_initialize.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_initialize.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_last_change_time.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_last_change_time.txt
deleted file mode 100644
index c3c5701b2ead..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_last_change_time.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-krb5_cc_last_change_time -  Return a timestamp of the last modification to a credential cache. 
-===============================================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cc_last_change_time(krb5_context context, krb5_ccache ccache, krb5_timestamp * change_time)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **ccache** - Credential cache handle
-
-	          **[out]** **change_time** - The last change time of *ccache*
-
-
-..
-
-
-
-..
-
-
-
-
-
-
-
-If an error occurs, *change_time* is set to 0.
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_lock.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_lock.txt
deleted file mode 100644
index 58dfe6f412b7..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_lock.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-krb5_cc_lock -  Lock a credential cache. 
-=========================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cc_lock(krb5_context context, krb5_ccache ccache)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **ccache** - Credential cache handle
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-Use :c:func:`krb5_cc_unlock()` to unlock the lock.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_move.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_move.rst.txt
index ba9f0fd1ee7d..ba9f0fd1ee7d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_move.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_move.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_new_unique.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_new_unique.rst.txt
index e4313c07c636..e4313c07c636 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_new_unique.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_new_unique.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_next_cred.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_next_cred.rst.txt
index 98d2586cd1e3..98d2586cd1e3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_next_cred.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_next_cred.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_remove_cred.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_remove_cred.rst.txt
index 3843e74ad716..3843e74ad716 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_remove_cred.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_remove_cred.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_resolve.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_resolve.rst.txt
index 746ac6c2632c..746ac6c2632c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_resolve.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_resolve.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_retrieve_cred.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_retrieve_cred.rst.txt
index b334e3062a01..b334e3062a01 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_retrieve_cred.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_retrieve_cred.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_select.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_select.rst.txt
index 221eb2844460..221eb2844460 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_select.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_select.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_set_config.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_set_config.rst.txt
index fdcc61391db3..fdcc61391db3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_set_config.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_set_config.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_set_default_name.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_set_default_name.rst.txt
index f1eb902c25e8..f1eb902c25e8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_set_default_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_set_default_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_set_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_set_flags.rst.txt
index d68d874835e0..d68d874835e0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_set_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_set_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_start_seq_get.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_start_seq_get.rst.txt
index 75f4b09f1d17..1bdbe823b2de 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_start_seq_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_start_seq_get.rst.txt
@@ -52,7 +52,7 @@ krb5_cc_start_seq_get -  Prepare to sequentially read every credential in a cred
 
 .. note::
 
-	 If *cache* is modified between the time of the call to this function and the time of the final :c:func:`krb5_cc_end_seq_get()` , the results are undefined.
+	 If the cache represented by *cache* is modified between the time of the call to this function and the time of the final :c:func:`krb5_cc_end_seq_get()` , these changes may not be reflected in the results of :c:func:`krb5_cc_next_cred()` calls.
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_store_cred.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_store_cred.rst.txt
index 1cc27ccc8685..1cc27ccc8685 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_store_cred.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_store_cred.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_support_switch.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_support_switch.rst.txt
index 394629b0f939..394629b0f939 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_support_switch.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_support_switch.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_switch.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_switch.rst.txt
index ef4c570d4c74..ef4c570d4c74 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_switch.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cc_switch.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cc_unlock.txt b/doc/html/_sources/appdev/refs/api/krb5_cc_unlock.txt
deleted file mode 100644
index 5e280461af3b..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cc_unlock.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-krb5_cc_unlock -  Unlock a credential cache. 
-=============================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cc_unlock(krb5_context context, krb5_ccache ccache)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **ccache** - Credential cache handle
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function unlocks the *ccache* locked by :c:func:`krb5_cc_lock()` .
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_free.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_free.rst.txt
index 14bc7306c1d6..14bc7306c1d6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_new.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_new.rst.txt
index 8a447fc6a4dc..8a447fc6a4dc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_new.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_new.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_next.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_next.rst.txt
index 7b8c9646280e..7b8c9646280e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_next.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cccol_cursor_next.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_have_content.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_have_content.rst.txt
index fbd6a8565c6e..d1c7426ee887 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_have_content.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cccol_have_content.rst.txt
@@ -1,5 +1,5 @@
-krb5_cccol_have_content -  Check if the credential cache collection contains any credentials. 
-==============================================================================================
+krb5_cccol_have_content -  Check if the credential cache collection contains any initialized caches. 
+=====================================================================================================
 
 ..
 
@@ -17,8 +17,8 @@ krb5_cccol_have_content -  Check if the credential cache collection contains any
 
 
 :retval:
-         -   0   Credentials are available in the collection
-         -   KRB5_CC_NOTFOUND   The collection contains no credentials
+         -   0   At least one initialized cache is present in the collection
+         -   KRB5_CC_NOTFOUND   The collection contains no caches
 
 
 ..
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_last_change_time.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_last_change_time.txt
deleted file mode 100644
index b6868d061098..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_last_change_time.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-krb5_cccol_last_change_time -  Return a timestamp of the last modification of any known credential cache. 
-==========================================================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cccol_last_change_time(krb5_context context, krb5_timestamp * change_time)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[out]** **change_time** - Last modification timestamp
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function returns the most recent modification time of any known credential cache, ignoring any caches which cannot supply a last modification time.
-
-
-
-If there are no known credential caches, *change_time* is set to 0.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_lock.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_lock.txt
deleted file mode 100644
index 79071292e271..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_lock.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-krb5_cccol_lock -  Acquire a global lock for credential caches. 
-================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cccol_lock(krb5_context context)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function locks the global credential cache collection, ensuring that no ccaches are added to or removed from it until the collection lock is released.
-
-
-
-Use :c:func:`krb5_cccol_unlock()` to unlock the lock.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cccol_unlock.txt b/doc/html/_sources/appdev/refs/api/krb5_cccol_unlock.txt
deleted file mode 100644
index 4c5a2145e335..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_cccol_unlock.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-krb5_cccol_unlock -  Release a global lock for credential caches. 
-==================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_cccol_unlock(krb5_context context)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function unlocks the lock from :c:func:`krb5_cccol_lock()` .
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_change_password.txt b/doc/html/_sources/appdev/refs/api/krb5_change_password.rst.txt
index 7c5db7f5c5f1..7c5db7f5c5f1 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_change_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_change_password.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_check_clockskew.txt b/doc/html/_sources/appdev/refs/api/krb5_check_clockskew.rst.txt
index 4999d4851800..4999d4851800 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_check_clockskew.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_check_clockskew.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_checksum_size.txt b/doc/html/_sources/appdev/refs/api/krb5_checksum_size.rst.txt
index 5a6769914f13..5a6769914f13 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_checksum_size.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_checksum_size.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_chpw_message.txt b/doc/html/_sources/appdev/refs/api/krb5_chpw_message.rst.txt
index 372c95d29f61..372c95d29f61 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_chpw_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_chpw_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_cksumtype_to_string.txt b/doc/html/_sources/appdev/refs/api/krb5_cksumtype_to_string.rst.txt
index a297c8f9666d..a297c8f9666d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_cksumtype_to_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_cksumtype_to_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_clear_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_clear_error_message.rst.txt
index c988ca3ab07b..c988ca3ab07b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_clear_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_clear_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_addresses.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_addresses.rst.txt
index a9c7c748356e..a9c7c748356e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_addresses.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_addresses.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_authdata.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_authdata.rst.txt
index 0ee9ba0c6f0e..0ee9ba0c6f0e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_authdata.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_authdata.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_authenticator.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_authenticator.rst.txt
index bc0c3459d80d..bc0c3459d80d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_authenticator.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_authenticator.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_checksum.rst.txt
index 1c9395501490..1c9395501490 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_context.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_context.rst.txt
index 2b5d2154dd11..2b5d2154dd11 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_context.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_context.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_creds.rst.txt
index 862293b075bc..862293b075bc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_data.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_data.rst.txt
index 81ad0f2af5b0..81ad0f2af5b0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_data.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_data.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_error_message.rst.txt
index 3904cabfff44..3904cabfff44 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock.rst.txt
index 5bb2958ff546..5bb2958ff546 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock_contents.rst.txt
index 9f858598f6b1..9f858598f6b1 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_keyblock_contents.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_principal.rst.txt
index 1ca9fea71603..1ca9fea71603 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_copy_ticket.txt b/doc/html/_sources/appdev/refs/api/krb5_copy_ticket.rst.txt
index a643cc5f42fa..a643cc5f42fa 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_copy_ticket.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_copy_ticket.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_decode_authdata_container.txt b/doc/html/_sources/appdev/refs/api/krb5_decode_authdata_container.rst.txt
index 791b41be893c..791b41be893c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_decode_authdata_container.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_decode_authdata_container.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_decode_ticket.txt b/doc/html/_sources/appdev/refs/api/krb5_decode_ticket.rst.txt
index 8f2cf8210baf..8f2cf8210baf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_decode_ticket.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_decode_ticket.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_decrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_decrypt.rst.txt
index eb8123ff54e0..eb8123ff54e0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_decrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_decrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_deltat_to_string.txt b/doc/html/_sources/appdev/refs/api/krb5_deltat_to_string.rst.txt
index 3b66ba3b2095..3b66ba3b2095 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_deltat_to_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_deltat_to_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_eblock_enctype.txt b/doc/html/_sources/appdev/refs/api/krb5_eblock_enctype.rst.txt
index c621a6df3755..c621a6df3755 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_eblock_enctype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_eblock_enctype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_encode_authdata_container.txt b/doc/html/_sources/appdev/refs/api/krb5_encode_authdata_container.rst.txt
index 4ca53b4b4315..4ca53b4b4315 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_encode_authdata_container.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_encode_authdata_container.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_encrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_encrypt.rst.txt
index 56e93be139cf..56e93be139cf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_encrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_encrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_encrypt_size.txt b/doc/html/_sources/appdev/refs/api/krb5_encrypt_size.rst.txt
index f331490f5d2a..f331490f5d2a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_encrypt_size.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_encrypt_size.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_enctype_to_name.txt b/doc/html/_sources/appdev/refs/api/krb5_enctype_to_name.rst.txt
index d830697cfd4b..d830697cfd4b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_enctype_to_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_enctype_to_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_enctype_to_string.txt b/doc/html/_sources/appdev/refs/api/krb5_enctype_to_string.rst.txt
index d46d83eba426..d46d83eba426 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_enctype_to_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_enctype_to_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_expand_hostname.txt b/doc/html/_sources/appdev/refs/api/krb5_expand_hostname.rst.txt
index 60ff0b5c321e..60ff0b5c321e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_expand_hostname.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_expand_hostname.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_find_authdata.txt b/doc/html/_sources/appdev/refs/api/krb5_find_authdata.rst.txt
index 42aea2c405c0..42aea2c405c0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_find_authdata.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_find_authdata.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_finish_key.txt b/doc/html/_sources/appdev/refs/api/krb5_finish_key.rst.txt
index a9f3da59e0a3..a9f3da59e0a3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_finish_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_finish_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_finish_random_key.txt b/doc/html/_sources/appdev/refs/api/krb5_finish_random_key.rst.txt
index 26c8b59d29d0..26c8b59d29d0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_finish_random_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_finish_random_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_addresses.txt b/doc/html/_sources/appdev/refs/api/krb5_free_addresses.rst.txt
index 6717f529d8a4..6717f529d8a4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_addresses.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_addresses.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_ap_rep_enc_part.txt b/doc/html/_sources/appdev/refs/api/krb5_free_ap_rep_enc_part.rst.txt
index 33f24e8926ff..33f24e8926ff 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_ap_rep_enc_part.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_ap_rep_enc_part.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_authdata.txt b/doc/html/_sources/appdev/refs/api/krb5_free_authdata.rst.txt
index e2b3e90b0826..e2b3e90b0826 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_authdata.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_authdata.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_authenticator.txt b/doc/html/_sources/appdev/refs/api/krb5_free_authenticator.rst.txt
index 505a508ae731..505a508ae731 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_authenticator.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_authenticator.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_free_checksum.rst.txt
index b1cd9bc591d4..7809f6cffba9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_checksum.rst.txt
@@ -3,7 +3,7 @@ krb5_free_checksum -  Free a krb5_checksum structure.
 
 ..
 
-.. c:function:: void krb5_free_checksum(krb5_context context, register krb5_checksum * val)
+.. c:function:: void krb5_free_checksum(krb5_context context, krb5_checksum * val)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_checksum_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_free_checksum_contents.rst.txt
index d265d49f770a..4ef12c3bcecb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_checksum_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_checksum_contents.rst.txt
@@ -3,7 +3,7 @@ krb5_free_checksum_contents -  Free the contents of a krb5_checksum structure.
 
 ..
 
-.. c:function:: void krb5_free_checksum_contents(krb5_context context, register krb5_checksum * val)
+.. c:function:: void krb5_free_checksum_contents(krb5_context context, krb5_checksum * val)
 
 ..
 
@@ -27,7 +27,7 @@ krb5_free_checksum_contents -  Free the contents of a krb5_checksum structure.
 
 
 
-This function frees the contents of *val* , but not the structure itself.
+This function frees the contents of *val* , but not the structure itself. It sets the checksum's data pointer to null and (beginning in release 1.19) sets its length to zero.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_cksumtypes.txt b/doc/html/_sources/appdev/refs/api/krb5_free_cksumtypes.rst.txt
index d4d0d288d3cc..d4d0d288d3cc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_cksumtypes.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_cksumtypes.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_context.txt b/doc/html/_sources/appdev/refs/api/krb5_free_context.rst.txt
index dc05228a2a40..dc05228a2a40 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_context.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_context.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_cred_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_free_cred_contents.rst.txt
index cc26788018cb..cc26788018cb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_cred_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_cred_contents.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_free_creds.rst.txt
index c78ecdfcb83b..c78ecdfcb83b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_data.txt b/doc/html/_sources/appdev/refs/api/krb5_free_data.rst.txt
index 8cd23a50cc69..8cd23a50cc69 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_data.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_data.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_data_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_free_data_contents.rst.txt
index 9feddc9632fa..c64ded129d26 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_data_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_data_contents.rst.txt
@@ -27,7 +27,7 @@ krb5_free_data_contents -  Free the contents of a krb5_data structure and zero t
 
 
 
-This function frees the contents of *val* , but not the structure itself.
+This function frees the contents of *val* , but not the structure itself. It sets the structure's data pointer to null and (beginning in release 1.19) sets its length to zero.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_default_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_free_default_realm.rst.txt
index 79228bf869d9..79228bf869d9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_default_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_default_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_enctypes.txt b/doc/html/_sources/appdev/refs/api/krb5_free_enctypes.rst.txt
index e1189cb0aade..e1189cb0aade 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_enctypes.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_enctypes.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_error.txt b/doc/html/_sources/appdev/refs/api/krb5_free_error.rst.txt
index 4339bda91b2d..0d47bba66ca6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_error.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_error.rst.txt
@@ -3,7 +3,7 @@ krb5_free_error -  Free an error allocated by krb5_read_error() or krb5_sendauth
 
 ..
 
-.. c:function:: void krb5_free_error(krb5_context context, register krb5_error * val)
+.. c:function:: void krb5_free_error(krb5_context context, krb5_error * val)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_free_error_message.rst.txt
index b4b006134acc..b4b006134acc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_host_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_free_host_realm.rst.txt
index a38e6ae6a1ab..a38e6ae6a1ab 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_host_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_host_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_keyblock.txt b/doc/html/_sources/appdev/refs/api/krb5_free_keyblock.rst.txt
index d3b7dc62b2d5..ec58604c65d3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_keyblock.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_keyblock.rst.txt
@@ -3,7 +3,7 @@ krb5_free_keyblock -  Free a krb5_keyblock structure.
 
 ..
 
-.. c:function:: void krb5_free_keyblock(krb5_context context, register krb5_keyblock * val)
+.. c:function:: void krb5_free_keyblock(krb5_context context, krb5_keyblock * val)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_keyblock_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_free_keyblock_contents.rst.txt
index 5f5aa5824bc6..264444e71cbc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_keyblock_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_keyblock_contents.rst.txt
@@ -3,7 +3,7 @@ krb5_free_keyblock_contents -  Free the contents of a krb5_keyblock structure.
 
 ..
 
-.. c:function:: void krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock * key)
+.. c:function:: void krb5_free_keyblock_contents(krb5_context context, krb5_keyblock * key)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_keytab_entry_contents.txt b/doc/html/_sources/appdev/refs/api/krb5_free_keytab_entry_contents.rst.txt
index adecfe2fa9dc..adecfe2fa9dc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_keytab_entry_contents.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_keytab_entry_contents.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_free_principal.rst.txt
index 218369af551e..218369af551e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_string.txt b/doc/html/_sources/appdev/refs/api/krb5_free_string.rst.txt
index 4c7bcac3c100..4c7bcac3c100 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_tgt_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_free_tgt_creds.rst.txt
index f885fc0c9a8d..f885fc0c9a8d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_tgt_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_tgt_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_ticket.txt b/doc/html/_sources/appdev/refs/api/krb5_free_ticket.rst.txt
index f523917c8d7c..f523917c8d7c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_ticket.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_ticket.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_free_unparsed_name.txt b/doc/html/_sources/appdev/refs/api/krb5_free_unparsed_name.rst.txt
index b6f9e1626b91..b6f9e1626b91 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_free_unparsed_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_free_unparsed_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_fwd_tgt_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_fwd_tgt_creds.rst.txt
index fab6d70594f3..fab6d70594f3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_fwd_tgt_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_fwd_tgt_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_credentials.txt b/doc/html/_sources/appdev/refs/api/krb5_get_credentials.rst.txt
index 6cf56d0c71c3..6cf56d0c71c3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_credentials.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_credentials.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_credentials_renew.txt b/doc/html/_sources/appdev/refs/api/krb5_get_credentials_renew.rst.txt
index 75aac54057ed..75aac54057ed 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_credentials_renew.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_credentials_renew.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_credentials_validate.txt b/doc/html/_sources/appdev/refs/api/krb5_get_credentials_validate.rst.txt
index 29033b9d5c31..29033b9d5c31 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_credentials_validate.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_credentials_validate.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_default_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_get_default_realm.rst.txt
index 5b63648cad73..5b63648cad73 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_default_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_default_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_get_error_message.rst.txt
index 81b7de31f1b0..81b7de31f1b0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_etype_info.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_get_etype_info.rst.txt
new file mode 100644
index 000000000000..15ab1d19545e
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_etype_info.rst.txt
@@ -0,0 +1,72 @@
+krb5_get_etype_info -  Retrieve enctype, salt and s2kparams from KDC. 
+======================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_get_etype_info(krb5_context context, krb5_principal principal, krb5_get_init_creds_opt * opt, krb5_enctype * enctype_out, krb5_data * salt_out, krb5_data * s2kparams_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **principal** - Principal whose information is requested
+
+	          **[in]** **opt** - Initial credential options
+
+	          **[out]** **enctype_out** - The enctype chosen by KDC
+
+	          **[out]** **salt_out** - Salt returned from KDC
+
+	          **[out]** **s2kparams_out** - String-to-key parameters returned from KDC
+
+
+..
+
+
+:retval:
+         -   0   Success
+
+
+:return:
+         -  A Kerberos error code 
+
+..
+
+
+
+
+
+
+
+Send an initial ticket request for *principal* and extract the encryption type, salt type, and string-to-key parameters from the KDC response. If the KDC provides no etype-info, set *enctype_out* to **ENCTYPE_NULL** and set *salt_out* and *s2kparams_out* to empty. If the KDC etype-info provides no salt, compute the default salt and place it in *salt_out* . If the KDC etype-info provides no string-to-key parameters, set *s2kparams_out* to empty.
+
+
+
+ *opt* may be used to specify options which affect the initial request, such as request encryption types or a FAST armor cache (see :c:func:`krb5_get_init_creds_opt_set_etype_list()` and :c:func:`krb5_get_init_creds_opt_set_fast_ccache_name()` ).
+
+
+
+Use :c:func:`krb5_free_data_contents()` to free *salt_out* and *s2kparams_out* when they are no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+.. note::
+
+	 New in 1.17
+ 
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_fallback_host_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_get_fallback_host_realm.rst.txt
index 6ab4330cc686..6ab4330cc686 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_fallback_host_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_fallback_host_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_host_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_get_host_realm.rst.txt
index 7cc8e947a2a3..7cc8e947a2a3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_host_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_host_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_keytab.txt b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_keytab.rst.txt
index fd3985bbd2eb..fd3985bbd2eb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_keytab.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_keytab.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_password.txt b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_password.rst.txt
index 556c6fee0ab7..556c6fee0ab7 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_password.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_skey.txt b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_skey.rst.txt
index fed7f0b47fec..fed7f0b47fec 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_skey.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_in_tkt_with_skey.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_keytab.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_keytab.rst.txt
index 32ce5cb62a71..32ce5cb62a71 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_keytab.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_keytab.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_alloc.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_alloc.rst.txt
index 45fa82d65514..45fa82d65514 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_alloc.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_alloc.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_free.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_free.rst.txt
index 0e75e152a718..0e75e152a718 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.rst.txt
index b38ddacf3087..b38ddacf3087 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_init.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_init.rst.txt
index 1cbaa9abc864..1cbaa9abc864 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.rst.txt
index e460a46e96e5..e460a46e96e5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.rst.txt
index 6953b2c526c6..6953b2c526c6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.rst.txt
index 099644fea0da..099644fea0da 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.rst.txt
index 633dd7df0d60..633dd7df0d60 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.rst.txt
index ac6f8ab6402a..ac6f8ab6402a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.rst.txt
index 2690cf1947c8..4942631c4478 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.rst.txt
@@ -35,7 +35,7 @@ Set a callback to receive password and account expiration times.
 
 
 
-This option only applies to :c:func:`krb5_get_init_creds_password()` . *cb* will be invoked if and only if credentials are successfully acquired. The callback will receive the *context* from the :c:func:`krb5_get_init_creds_password()` call and the *data* argument supplied with this API. The remaining arguments should be interpreted as follows:
+ *cb* will be invoked if and only if credentials are successfully acquired. The callback will receive the *context* from the calling function and the *data* argument supplied with this API. The remaining arguments should be interpreted as follows:
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.rst.txt
index 8a26b321b35e..8a26b321b35e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.rst.txt
index da1c78231082..da1c78231082 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.rst.txt
index 272cbac19e4c..272cbac19e4c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.rst.txt
index 50d64b8cb505..50d64b8cb505 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.rst.txt
index 41d511766714..41d511766714 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.rst.txt
index dcb1cf606c6a..dcb1cf606c6a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pa.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pa.rst.txt
index a610fa0cb557..a610fa0cb557 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pa.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pa.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.rst.txt
index ed46081b99df..ed46081b99df 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.rst.txt
index 3bcbcb4d363d..3bcbcb4d363d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.rst.txt
index 7ced7273c668..7ced7273c668 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.rst.txt
index 58e938d9f079..58e938d9f079 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_responder.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_responder.rst.txt
index 220ba403df7a..220ba403df7a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_responder.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_responder.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_salt.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_salt.rst.txt
index 22512f671ad7..22512f671ad7 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_salt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_salt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.rst.txt
index a5c1f685ca52..a5c1f685ca52 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_password.txt b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_password.rst.txt
index 1c6fd6853934..1c6fd6853934 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_init_creds_password.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_permitted_enctypes.txt b/doc/html/_sources/appdev/refs/api/krb5_get_permitted_enctypes.rst.txt
index f55adc6bfe02..f55adc6bfe02 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_permitted_enctypes.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_permitted_enctypes.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_profile.txt b/doc/html/_sources/appdev/refs/api/krb5_get_profile.rst.txt
index 4ef2949a32df..4ef2949a32df 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_profile.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_profile.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_prompt_types.txt b/doc/html/_sources/appdev/refs/api/krb5_get_prompt_types.rst.txt
index 39156ca153af..39156ca153af 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_prompt_types.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_prompt_types.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_renewed_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_get_renewed_creds.rst.txt
index 21458f8531bd..21458f8531bd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_renewed_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_renewed_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_server_rcache.txt b/doc/html/_sources/appdev/refs/api/krb5_get_server_rcache.rst.txt
index 0e7474725991..38bb1305c1b1 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_server_rcache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_server_rcache.rst.txt
@@ -12,7 +12,7 @@ krb5_get_server_rcache -  Generate a replay cache object for server use and open
 
 	          **[in]** **context** - Library context
 
-	          **[in]** **piece** - Unique identifier for replay cache
+	          **[in]** **piece** - Unused (replay cache identifier)
 
 	          **[out]** **rcptr** - Handle to an open rcache
 
@@ -32,7 +32,7 @@ krb5_get_server_rcache -  Generate a replay cache object for server use and open
 
 
 
-This function generates a replay cache name based on *piece* and opens a handle to it. Typically *piece* is the first component of the service principal name. Use krb5_rc_close() to close *rcptr* when it is no longer needed.
+This function creates a handle to the default replay cache. Use krb5_rc_close() to close *rcptr* when it is no longer needed.
 
 
 
@@ -48,4 +48,8 @@ This function generates a replay cache name based on *piece* and opens a handle
 
 
 
+.. note::
+
+	 Prior to release 1.18, this function creates a handle to a different replay cache for each unique value of *piece* .
+ 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_time_offsets.txt b/doc/html/_sources/appdev/refs/api/krb5_get_time_offsets.rst.txt
index 9bdd8ecb5e69..9bdd8ecb5e69 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_time_offsets.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_time_offsets.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_get_validated_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_get_validated_creds.rst.txt
index e1bf3107abb7..e1bf3107abb7 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_get_validated_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_get_validated_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_context.txt b/doc/html/_sources/appdev/refs/api/krb5_init_context.rst.txt
index ec50809c440b..ec50809c440b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_context.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_context.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_context_profile.txt b/doc/html/_sources/appdev/refs/api/krb5_init_context_profile.rst.txt
index 273230908a4a..273230908a4a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_context_profile.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_context_profile.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_free.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_free.rst.txt
index 011fe47837fd..011fe47837fd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get.rst.txt
index 291fa509269d..291fa509269d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_creds.rst.txt
index 46ef1cf4e1df..46ef1cf4e1df 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_error.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_error.rst.txt
index 66aea0b85b7f..66aea0b85b7f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_error.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_error.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_times.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_times.rst.txt
index 7e9d516fc79b..7e9d516fc79b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_times.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_get_times.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_init.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_init.rst.txt
index c703124106db..c703124106db 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_keytab.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_keytab.rst.txt
index 222755aab8bb..222755aab8bb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_keytab.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_keytab.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_password.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_password.rst.txt
index 10ad140d04d3..10ad140d04d3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_password.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_service.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_service.rst.txt
index 67b9b5d6de0b..d08ffc7d629d 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_service.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_set_service.rst.txt
@@ -32,7 +32,7 @@ krb5_init_creds_set_service -  Specify a service principal for acquiring initial
 
 
 
-Thisfunction supplies a service principal string to acquire initial credentials for instead of the default krbtgt service. *service* is parsed as a principal name; any realm part is ignored.
+This function supplies a service principal string to acquire initial credentials for instead of the default krbtgt service. *service* is parsed as a principal name; any realm part is ignored.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_creds_step.txt b/doc/html/_sources/appdev/refs/api/krb5_init_creds_step.rst.txt
index 8008e6724f1a..8008e6724f1a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_creds_step.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_creds_step.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_keyblock.txt b/doc/html/_sources/appdev/refs/api/krb5_init_keyblock.rst.txt
index b0258eb6a067..b0258eb6a067 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_keyblock.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_keyblock.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_random_key.txt b/doc/html/_sources/appdev/refs/api/krb5_init_random_key.rst.txt
index 271d7274a122..271d7274a122 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_random_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_random_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_init_secure_context.txt b/doc/html/_sources/appdev/refs/api/krb5_init_secure_context.rst.txt
index 8d27396e3890..8d27396e3890 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_init_secure_context.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_init_secure_context.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_is_config_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_is_config_principal.rst.txt
index 3b50605a0547..3b50605a0547 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_is_config_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_is_config_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_is_referral_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_is_referral_realm.rst.txt
index 89916c322a10..89916c322a10 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_is_referral_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_is_referral_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_is_thread_safe.txt b/doc/html/_sources/appdev/refs/api/krb5_is_thread_safe.rst.txt
index 812a2c321121..812a2c321121 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_is_thread_safe.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_is_thread_safe.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_create_key.txt b/doc/html/_sources/appdev/refs/api/krb5_k_create_key.rst.txt
index 547338259701..547338259701 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_create_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_create_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_decrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_k_decrypt.rst.txt
index 81b5c6321520..81b5c6321520 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_decrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_decrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_decrypt_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_k_decrypt_iov.rst.txt
index f6cf2f31f6e3..dd8633fabdfb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_decrypt_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_decrypt_iov.rst.txt
@@ -62,8 +62,6 @@ This function decrypts the data block *data* and stores the output in-place. The
 .. note::
 
 	 On return from a :c:func:`krb5_c_decrypt_iov()` call, the *data->length* in the iov structure are adjusted to reflect actual lengths of the ciphertext used. For example, if the padding length is too large, the length will be reduced. Lengths are never increased.
-
-	 This function is similar to :c:func:`krb5_c_decrypt_iov()` , but operates on opaque key *key* .
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_encrypt.txt b/doc/html/_sources/appdev/refs/api/krb5_k_encrypt.rst.txt
index 90f92c49e18c..90f92c49e18c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_encrypt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_encrypt.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_encrypt_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_k_encrypt_iov.rst.txt
index c22152946681..b28a108e72e0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_encrypt_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_encrypt_iov.rst.txt
@@ -62,8 +62,6 @@ This function encrypts the data block *data* and stores the output in-place. The
 .. note::
 
 	 On return from a :c:func:`krb5_c_encrypt_iov()` call, the *data->length* in the iov structure are adjusted to reflect actual lengths of the ciphertext used. For example, if the padding length is too large, the length will be reduced. Lengths are never increased.
-
-	 This function is similar to :c:func:`krb5_c_encrypt_iov()` , but operates on opaque key *key* .
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_free_key.txt b/doc/html/_sources/appdev/refs/api/krb5_k_free_key.rst.txt
index c1060f6dd4d8..c1060f6dd4d8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_free_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_free_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_key_enctype.txt b/doc/html/_sources/appdev/refs/api/krb5_k_key_enctype.rst.txt
index d77a541e9869..d77a541e9869 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_key_enctype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_key_enctype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_key_keyblock.txt b/doc/html/_sources/appdev/refs/api/krb5_k_key_keyblock.rst.txt
index efd782c95ee5..efd782c95ee5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_key_keyblock.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_key_keyblock.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum.rst.txt
index 2a11066fc7cf..2a11066fc7cf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum_iov.rst.txt
index 381f70632bf8..381f70632bf8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_make_checksum_iov.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_prf.txt b/doc/html/_sources/appdev/refs/api/krb5_k_prf.rst.txt
index f6d952715098..f6d952715098 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_prf.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_prf.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_reference_key.txt b/doc/html/_sources/appdev/refs/api/krb5_k_reference_key.rst.txt
index 06b4629eda7c..06b4629eda7c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_reference_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_reference_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum.rst.txt
index 1a183f259804..1a183f259804 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum_iov.txt b/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum_iov.rst.txt
index 1cfca031ea18..1cfca031ea18 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum_iov.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_k_verify_checksum_iov.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kdc_sign_ticket.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_kdc_sign_ticket.rst.txt
new file mode 100644
index 000000000000..4697e4550ca0
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_kdc_sign_ticket.rst.txt
@@ -0,0 +1,65 @@
+krb5_kdc_sign_ticket -  Sign a PAC, possibly including a ticket signature. 
+===========================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_kdc_sign_ticket(krb5_context context, krb5_enc_tkt_part * enc_tkt, const krb5_pac pac, krb5_const_principal server_princ, krb5_const_principal client_princ, const krb5_keyblock * server, const krb5_keyblock * privsvr, krb5_boolean with_realm)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **enc_tkt** - The ticket for the signature
+
+	          **[in]** **pac** - PAC handle
+
+	          **[in]** **server_princ** - Canonical ticket server name
+
+	          **[in]** **client_princ** - PAC_CLIENT_INFO principal (or NULL)
+
+	          **[in]** **server** - Key for server checksum
+
+	          **[in]** **privsvr** - Key for KDC and ticket checksum
+
+	          **[in]** **with_realm** - If true, include the realm of *principal*
+
+
+..
+
+
+:retval:
+         -   0   on success, otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+Sign *pac* using the keys *server* and *privsvr* . Include a ticket signature over *enc_tkt* if *server_princ* is not a TGS or kadmin/changepw principal name. Add the signed PAC's encoding to the authorization data of *enc_tkt* in the first slot, wrapped in an AD-IF-RELEVANT container. If *client_princ* is non-null, add a PAC_CLIENT_INFO buffer, including the realm if *with_realm* is true.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+.. note::
+
+	 New in 1.20
+ 
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kdc_verify_ticket.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_kdc_verify_ticket.rst.txt
new file mode 100644
index 000000000000..eccac3b81fbf
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_kdc_verify_ticket.rst.txt
@@ -0,0 +1,73 @@
+krb5_kdc_verify_ticket -  Verify a PAC, possibly including ticket signature. 
+=============================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_kdc_verify_ticket(krb5_context context, const krb5_enc_tkt_part * enc_tkt, krb5_const_principal server_princ, const krb5_keyblock * server, const krb5_keyblock * privsvr, krb5_pac * pac_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **enc_tkt** - Ticket enc-part, possibly containing a PAC
+
+	          **[in]** **server_princ** - Canonicalized name of ticket server
+
+	          **[in]** **server** - Key to validate server checksum (or NULL)
+
+	          **[in]** **privsvr** - Key to validate KDC checksum (or NULL)
+
+	          **[out]** **pac_out** - Verified PAC (NULL if no PAC included)
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+If a PAC is present in *enc_tkt* , verify its signatures. If *privsvr* is not NULL and *server_princ* is not a krbtgt or kadmin/changepw service, require a ticket signature over *enc_tkt* in addition to the KDC signature. Place the verified PAC in *pac_out* . If an invalid PAC signature is found, return an error matching the Windows KDC protocol code for that condition as closely as possible.
+
+
+
+If no PAC is present in *enc_tkt* , set *pac_out* to NULL and return successfully.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 This function does not validate the PAC_CLIENT_INFO buffer. If a specific value is expected, the caller can make a separate call to :c:func:`krb5_pac_verify_ext()` with a principal but no keys.
+ 
+
+
+.. note::
+
+	 New in 1.20
+ 
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_add_entry.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_add_entry.rst.txt
index f762d360ff70..f762d360ff70 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_add_entry.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_add_entry.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_client_default.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_client_default.rst.txt
index 8f5663bcc05b..8f5663bcc05b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_client_default.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_client_default.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_close.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_close.rst.txt
index 4761ad689786..4761ad689786 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_close.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_close.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_default.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_default.rst.txt
index 35f5a66049fb..35f5a66049fb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_default.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_default.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_default_name.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_default_name.rst.txt
index 6f9e558f97f5..6f9e558f97f5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_default_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_default_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_dup.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_dup.rst.txt
index 745463503769..745463503769 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_dup.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_dup.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_end_seq_get.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_end_seq_get.rst.txt
index 9e4265307468..9e4265307468 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_end_seq_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_end_seq_get.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_free_entry.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_free_entry.rst.txt
index 5eaa118f81c0..5eaa118f81c0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_free_entry.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_free_entry.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_get_entry.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_get_entry.rst.txt
index cfbae19e62d5..cfbae19e62d5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_get_entry.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_get_entry.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_get_name.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_get_name.rst.txt
index 5d36dbba68a8..5d36dbba68a8 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_get_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_get_name.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_get_type.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_get_type.rst.txt
index c675af8fa092..c675af8fa092 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_get_type.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_get_type.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_have_content.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_have_content.rst.txt
index dffa94e6ea54..dffa94e6ea54 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_have_content.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_have_content.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_next_entry.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_next_entry.rst.txt
index 993a4cc6f801..993a4cc6f801 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_next_entry.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_next_entry.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_read_service_key.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_read_service_key.rst.txt
index dd51694507e4..dd51694507e4 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_read_service_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_read_service_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_remove_entry.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_remove_entry.rst.txt
index 10c1705acf76..10c1705acf76 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_remove_entry.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_remove_entry.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_resolve.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_resolve.rst.txt
index 49d5e2563331..49d5e2563331 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_resolve.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_resolve.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kt_start_seq_get.txt b/doc/html/_sources/appdev/refs/api/krb5_kt_start_seq_get.rst.txt
index b00b263656b9..b00b263656b9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kt_start_seq_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kt_start_seq_get.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_kuserok.txt b/doc/html/_sources/appdev/refs/api/krb5_kuserok.rst.txt
index 7dbd15f7646c..7dbd15f7646c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_kuserok.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_kuserok.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_make_authdata_kdc_issued.txt b/doc/html/_sources/appdev/refs/api/krb5_make_authdata_kdc_issued.rst.txt
index e671af5f8e85..e671af5f8e85 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_make_authdata_kdc_issued.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_make_authdata_kdc_issued.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_marshal_credentials.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_marshal_credentials.rst.txt
new file mode 100644
index 000000000000..8784243af968
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_marshal_credentials.rst.txt
@@ -0,0 +1,55 @@
+krb5_marshal_credentials -  Serialize a krb5_creds object. 
+===========================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_marshal_credentials(krb5_context context, krb5_creds * in_creds, krb5_data ** data_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **in_creds** - The credentials object to serialize
+
+	          **[out]** **data_out** - The serialized credentials
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+Serialize *creds* in the format used by the FILE ccache format (vesion 4) and KCM ccache protocol.
+
+
+
+Use :c:func:`krb5_free_data()` to free *data_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_merge_authdata.txt b/doc/html/_sources/appdev/refs/api/krb5_merge_authdata.rst.txt
index 86370ec42b93..86370ec42b93 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_merge_authdata.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_merge_authdata.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_1cred.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_1cred.rst.txt
index c1ab909eff14..69a93c0ae43c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_1cred.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_1cred.rst.txt
@@ -3,7 +3,7 @@ krb5_mk_1cred -  Format a KRB-CRED message for a single set of credentials.
 
 ..
 
-.. c:function:: krb5_error_code krb5_mk_1cred(krb5_context context, krb5_auth_context auth_context, krb5_creds * pcreds, krb5_data ** ppdata, krb5_replay_data * outdata)
+.. c:function:: krb5_error_code krb5_mk_1cred(krb5_context context, krb5_auth_context auth_context, krb5_creds * creds, krb5_data ** der_out, krb5_replay_data * rdata_out)
 
 ..
 
@@ -14,11 +14,11 @@ krb5_mk_1cred -  Format a KRB-CRED message for a single set of credentials.
 
 	          **[in]** **auth_context** - Authentication context
 
-	          **[in]** **pcreds** - Pointer to credentials
+	          **[in]** **creds** - Pointer to credentials
 
-	          **[out]** **ppdata** - Encoded credentials
+	          **[out]** **der_out** - Encoded credentials
 
-	          **[out]** **outdata** - Replay cache data (NULL if not needed)
+	          **[out]** **rdata_out** - Replay cache data (NULL if not needed)
 
 
 ..
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_error.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_error.rst.txt
index e0432106b031..e0432106b031 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_error.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_error.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.rst.txt
new file mode 100644
index 000000000000..42ad8cc7449f
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.rst.txt
@@ -0,0 +1,88 @@
+krb5_mk_ncred -  Format a KRB-CRED message for an array of credentials. 
+========================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_mk_ncred(krb5_context context, krb5_auth_context auth_context, krb5_creds ** creds, krb5_data ** der_out, krb5_replay_data * rdata_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **auth_context** - Authentication context
+
+	          **[in]** **creds** - Null-terminated array of credentials
+
+	          **[out]** **der_out** - Encoded credentials
+
+	          **[out]** **rdata_out** - Replay cache information (NULL if not needed)
+
+
+..
+
+
+:retval:
+         -   0   Success
+         -   ENOMEM   Insufficient memory
+         -   KRB5_RC_REQUIRED   Message replay detection requires rcache parameter
+
+
+:return:
+         -  Kerberos error codes 
+
+..
+
+
+
+
+
+
+
+This function takes an array of credentials *creds* and formats a **KRB-CRED** message *der_out* to pass to :c:func:`krb5_rd_cred()` .
+
+
+
+The local and remote addresses in *auth_context* are optional; if either is specified, they are used to form the sender and receiver addresses in the KRB-CRED message.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , an entry for the message is entered in an in-memory replay cache to detect if the message is reflected by an attacker. If :data:`KRB5_AUTH_CONTEXT_DO_TIME` is not set, no replay cache is used. If :data:`KRB5_AUTH_CONTEXT_RET_TIME` is set in *auth_context* , the timestamp used for the KRB-CRED message is stored in *rdata_out* .
+
+
+
+If either :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the *auth_context* local sequence number is included in the KRB-CRED message and then incremented. If :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the sequence number used is stored in *rdata_out* .
+
+
+
+Use :c:func:`krb5_free_data_contents()` to free *der_out* when it is no longer needed.
+
+
+
+The message will be encrypted using the send subkey of *auth_context* if it is present, or the session key otherwise. If neither key is present, the credentials will not be encrypted, and the message should only be sent over a secure channel. No replay cache entry is used in this case.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .
+ 
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.txt
deleted file mode 100644
index 7bf0577e5967..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_ncred.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-krb5_mk_ncred -  Format a KRB-CRED message for an array of credentials. 
-========================================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_mk_ncred(krb5_context context, krb5_auth_context auth_context, krb5_creds ** ppcreds, krb5_data ** ppdata, krb5_replay_data * outdata)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **auth_context** - Authentication context
-
-	          **[in]** **ppcreds** - Null-terminated array of credentials
-
-	          **[out]** **ppdata** - Encoded credentials
-
-	          **[out]** **outdata** - Replay cache information (NULL if not needed)
-
-
-..
-
-
-:retval:
-         -   0   Success
-         -   ENOMEM   Insufficient memory
-         -   KRB5_RC_REQUIRED   Message replay detection requires rcache parameter
-
-
-:return:
-         -  Kerberos error codes 
-
-..
-
-
-
-
-
-
-
-This function takes an array of credentials *ppcreds* and formats a **KRB-CRED** message *ppdata* to pass to :c:func:`krb5_rd_cred()` .
-
-
-
-The message will be encrypted using the send subkey of *auth_context* if it is present, or the session key otherwise.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
-
-.. note::
-
-	 If the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* , *outdata* is required.
- 
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_priv.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_priv.rst.txt
new file mode 100644
index 000000000000..e607080cfc17
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_priv.rst.txt
@@ -0,0 +1,79 @@
+krb5_mk_priv -  Format a KRB-PRIV message. 
+===========================================
+
+..
+
+.. c:function:: krb5_error_code krb5_mk_priv(krb5_context context, krb5_auth_context auth_context, const krb5_data * userdata, krb5_data * der_out, krb5_replay_data * rdata_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **auth_context** - Authentication context
+
+	          **[in]** **userdata** - User data for **KRB-PRIV** message
+
+	          **[out]** **der_out** - Formatted **KRB-PRIV** message
+
+	          **[out]** **rdata_out** - Replay data (NULL if not needed)
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+This function is similar to :c:func:`krb5_mk_safe()` , but the message is encrypted and integrity-protected, not just integrity-protected.
+
+
+
+The local address in *auth_context* must be set, and is used to form the sender address used in the KRB-PRIV message. The remote address is optional; if specified, it will be used to form the receiver address used in the message.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , a timestamp is included in the KRB-PRIV message, and an entry for the message is entered in an in-memory replay cache to detect if the message is reflected by an attacker. If :data:`KRB5_AUTH_CONTEXT_DO_TIME` is not set, no replay cache is used. If :data:`KRB5_AUTH_CONTEXT_RET_TIME` is set in *auth_context* , a timestamp is included in the KRB-PRIV message and is stored in *rdata_out* .
+
+
+
+If either :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the *auth_context* local sequence number is included in the KRB-PRIV message and then incremented. If :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the sequence number used is stored in *rdata_out* .
+
+
+
+Use :c:func:`krb5_free_data_contents()` to free *der_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .
+ 
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_priv.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_priv.txt
deleted file mode 100644
index 2c3cefaf32e6..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_priv.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-krb5_mk_priv -  Format a KRB-PRIV message. 
-===========================================
-
-..
-
-.. c:function:: krb5_error_code krb5_mk_priv(krb5_context context, krb5_auth_context auth_context, const krb5_data * userdata, krb5_data * outbuf, krb5_replay_data * outdata)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **auth_context** - Authentication context
-
-	          **[in]** **userdata** - User data for **KRB-PRIV** message
-
-	          **[out]** **outbuf** - Formatted **KRB-PRIV** message
-
-	          **[out]** **outdata** - Replay cache handle (NULL if not needed)
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function is similar to :c:func:`krb5_mk_safe()` , but the message is encrypted and integrity-protected, not just integrity-protected.
-
-
-
-The local address in *auth_context* must be set, and is used to form the sender address used in the KRB-SAFE message. The remote address is optional; if specified, it will be used to form the receiver address used in the message.
-
-
-
- 
- 
-	 - :data:`KRB5_AUTH_CONTEXT_DO_TIME` - Use timestamps in *outdata* 
- 
- 
-	 - :data:`KRB5_AUTH_CONTEXT_RET_TIME` - Copy timestamp to *outdata* .
- 
- 
-	 - :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` - Use local sequence numbers from *auth_context* in replay cache.
- 
- 
-	 - :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` - Use local sequence numbers from *auth_context* as a sequence number in the encrypted message *outbuf* .
- 
- 
-
-
-
-
-
-
-..
-
-
-
-
-
-
-.. note::
-
-	 If the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* , the *outdata* is required.
-
-	 The flags from *auth_context* specify whether sequence numbers or timestamps will be used to identify the message. Valid values are:
- 
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_rep.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_rep.rst.txt
index ef712e6849b6..ef712e6849b6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_rep.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_rep.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_rep_dce.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_rep_dce.rst.txt
index ead597faa942..ead597faa942 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_rep_dce.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_rep_dce.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_req.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_req.rst.txt
index 695eb79399cb..695eb79399cb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_req.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_req.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_req_extended.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_req_extended.rst.txt
index e3ef4b99b480..dec402bb016e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_req_extended.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_req_extended.rst.txt
@@ -43,7 +43,7 @@ Valid *ap_req_options* are:
 	 - :data:`AP_OPTS_USE_SESSION_KEY` - Use the session key when creating the request used for user to user authentication.
  
  
-	 - :data:`AP_OPTS_MUTUAL_REQUIRED` - Request a mutual authentication packet from the reciever.
+	 - :data:`AP_OPTS_MUTUAL_REQUIRED` - Request a mutual authentication packet from the receiver.
  
  
 	 - :data:`AP_OPTS_USE_SUBKEY` - Generate a subsession key from the current session key obtained from the credentials.
diff --git a/doc/html/_sources/appdev/refs/api/krb5_mk_safe.txt b/doc/html/_sources/appdev/refs/api/krb5_mk_safe.rst.txt
index 3921890d387c..a1fa56d36e24 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_mk_safe.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_mk_safe.rst.txt
@@ -3,7 +3,7 @@ krb5_mk_safe -  Format a KRB-SAFE message.
 
 ..
 
-.. c:function:: krb5_error_code krb5_mk_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data * userdata, krb5_data * outbuf, krb5_replay_data * outdata)
+.. c:function:: krb5_error_code krb5_mk_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data * userdata, krb5_data * der_out, krb5_replay_data * rdata_out)
 
 ..
 
@@ -16,9 +16,9 @@ krb5_mk_safe -  Format a KRB-SAFE message.
 
 	          **[in]** **userdata** - User data in the message
 
-	          **[out]** **outbuf** - Formatted **KRB-SAFE** buffer
+	          **[out]** **der_out** - Formatted **KRB-SAFE** buffer
 
-	          **[out]** **outdata** - Replay data. Specify NULL if not needed
+	          **[out]** **rdata_out** - Replay data. Specify NULL if not needed
 
 
 ..
@@ -48,15 +48,15 @@ The local address in *auth_context* must be set, and is used to form the sender
 
 
 
-If :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in the *auth_context* , an entry describing the message is entered in the replay cache *auth_context->rcache* which enables the caller to detect if this message is reflected by an attacker. If :data:`KRB5_AUTH_CONTEXT_DO_TIME` is not set, the replay cache is not used.
+If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , a timestamp is included in the KRB-SAFE message, and an entry for the message is entered in an in-memory replay cache to detect if the message is reflected by an attacker. If :data:`KRB5_AUTH_CONTEXT_DO_TIME` is not set, no replay cache is used. If :data:`KRB5_AUTH_CONTEXT_RET_TIME` is set in *auth_context* , a timestamp is included in the KRB-SAFE message and is stored in *rdata_out* .
 
 
 
-If either :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the *auth_context* local sequence number will be placed in *outdata* as its sequence number.
+If either :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the *auth_context* local sequence number is included in the KRB-SAFE message and then incremented. If :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` is set, the sequence number used is stored in *rdata_out* .
 
 
 
-Use :c:func:`krb5_free_data_contents()` to free *outbuf* when it is no longer needed.
+Use :c:func:`krb5_free_data_contents()` to free *der_out* when it is no longer needed.
 
 
 
@@ -76,7 +76,7 @@ Use :c:func:`krb5_free_data_contents()` to free *outbuf* when it is no longer ne
 
 .. note::
 
-	 The *outdata* argument is required if :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in the *auth_context* .
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .
  
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_os_localaddr.txt b/doc/html/_sources/appdev/refs/api/krb5_os_localaddr.rst.txt
index 7af9e614a76f..7af9e614a76f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_os_localaddr.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_os_localaddr.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_add_buffer.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_add_buffer.rst.txt
index 3f5fa7b8a69a..3f5fa7b8a69a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_add_buffer.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_add_buffer.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_free.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_free.rst.txt
index 9b204befa350..9b204befa350 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_get_buffer.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_get_buffer.rst.txt
index ef31a5bcaa76..ef31a5bcaa76 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_get_buffer.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_get_buffer.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_get_client_info.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_get_client_info.rst.txt
new file mode 100644
index 000000000000..4c628c46f5e9
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_get_client_info.rst.txt
@@ -0,0 +1,57 @@
+krb5_pac_get_client_info -  Read client information from a PAC. 
+================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_pac_get_client_info(krb5_context context, const krb5_pac pac, krb5_timestamp * authtime_out, char ** princname_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **pac** - PAC handle
+
+	          **[out]** **authtime_out** - Authentication timestamp (NULL if not needed)
+
+	          **[out]** **princname_out** - Client account name
+
+
+..
+
+
+:retval:
+         -   0   on success, ENOENT if no PAC_CLIENT_INFO buffer is present in pac , ERANGE if the buffer contains invalid lengths.
+
+
+..
+
+
+
+
+
+
+
+Read the PAC_CLIENT_INFO buffer in *pac* . Place the client account name as a string in *princname_out* . If *authtime_out* is not NULL, place the initial authentication timestamp in *authtime_out* .
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+.. note::
+
+	 New in 1.18
+ 
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_get_types.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_get_types.rst.txt
index bce3b2c84fe6..bce3b2c84fe6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_get_types.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_get_types.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_init.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_init.rst.txt
index 4a0630d76917..4a0630d76917 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_parse.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_parse.rst.txt
index 1cae5be5a16c..1cae5be5a16c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_parse.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_parse.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_sign.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_sign.rst.txt
new file mode 100644
index 000000000000..9b2499a83870
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_sign.rst.txt
@@ -0,0 +1,54 @@
+krb5_pac_sign
+=============
+
+..
+
+.. c:function:: krb5_error_code krb5_pac_sign(krb5_context context, krb5_pac pac, krb5_timestamp authtime, krb5_const_principal principal, const krb5_keyblock * server_key, const krb5_keyblock * privsvr_key, krb5_data * data)
+
+..
+
+
+:param:
+
+	          **context**
+
+	          **pac**
+
+	          **authtime**
+
+	          **principal**
+
+	          **server_key**
+
+	          **privsvr_key**
+
+	          **data**
+
+
+..
+
+
+
+..
+
+
+DEPRECATED Use krb5_kdc_sign_ticket() instead. 
+
+
+
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_sign.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_sign.txt
deleted file mode 100644
index 3c6bc41e428c..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_sign.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-krb5_pac_sign -  Sign a PAC. 
-=============================
-
-..
-
-.. c:function:: krb5_error_code krb5_pac_sign(krb5_context context, krb5_pac pac, krb5_timestamp authtime, krb5_const_principal principal, const krb5_keyblock * server_key, const krb5_keyblock * privsvr_key, krb5_data * data)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **pac** - PAC handle
-
-	          **[in]** **authtime** - Expected timestamp
-
-	          **[in]** **principal** - Expected principal name (or NULL)
-
-	          **[in]** **server_key** - Key for server checksum
-
-	          **[in]** **privsvr_key** - Key for KDC checksum
-
-	          **[out]** **data** - Signed PAC encoding
-
-
-..
-
-
-
-..
-
-
-
-
-
-
-
-This function signs *pac* using the keys *server_key* and *privsvr_key* and returns the signed encoding in *data* . *pac* is modified to include the server and KDC checksum buffers. Use :c:func:`krb5_free_data_contents()` to free *data* when it is no longer needed.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-.. note::
-
-	 New in 1.10
- 
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_sign_ext.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_sign_ext.rst.txt
new file mode 100644
index 000000000000..46f1552bafa6
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_sign_ext.rst.txt
@@ -0,0 +1,56 @@
+krb5_pac_sign_ext
+=================
+
+..
+
+.. c:function:: krb5_error_code krb5_pac_sign_ext(krb5_context context, krb5_pac pac, krb5_timestamp authtime, krb5_const_principal principal, const krb5_keyblock * server_key, const krb5_keyblock * privsvr_key, krb5_boolean with_realm, krb5_data * data)
+
+..
+
+
+:param:
+
+	          **context**
+
+	          **pac**
+
+	          **authtime**
+
+	          **principal**
+
+	          **server_key**
+
+	          **privsvr_key**
+
+	          **with_realm**
+
+	          **data**
+
+
+..
+
+
+
+..
+
+
+DEPRECATED Use krb5_kdc_sign_ticket() instead. 
+
+
+
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_verify.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_verify.rst.txt
index 338b43a1453e..338b43a1453e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_pac_verify.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_verify.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_pac_verify_ext.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_pac_verify_ext.rst.txt
new file mode 100644
index 000000000000..2330993ca9bd
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_pac_verify_ext.rst.txt
@@ -0,0 +1,60 @@
+krb5_pac_verify_ext -  Verify a PAC, possibly from a specified realm. 
+======================================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_pac_verify_ext(krb5_context context, const krb5_pac pac, krb5_timestamp authtime, krb5_const_principal principal, const krb5_keyblock * server, const krb5_keyblock * privsvr, krb5_boolean with_realm)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **pac** - PAC handle
+
+	          **[in]** **authtime** - Expected timestamp
+
+	          **[in]** **principal** - Expected principal name (or NULL)
+
+	          **[in]** **server** - Key to validate server checksum (or NULL)
+
+	          **[in]** **privsvr** - Key to validate KDC checksum (or NULL)
+
+	          **[in]** **with_realm** - If true, expect the realm of *principal*
+
+
+..
+
+
+
+..
+
+
+
+
+
+
+
+This function is similar to :c:func:`krb5_pac_verify()` , but adds a parameter *with_realm* . If *with_realm* is true, the PAC_CLIENT_INFO field is expected to include the realm of *principal* as well as the name. This flag is necessary to verify PACs in cross-realm S4U2Self referral TGTs.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+.. note::
+
+	 New in 1.17
+ 
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_parse_name.txt b/doc/html/_sources/appdev/refs/api/krb5_parse_name.rst.txt
index bbd1a1ac533f..e322b65a18bc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_parse_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_parse_name.rst.txt
@@ -47,6 +47,10 @@ To use the slash and @ symbols as part of a component (quoted) instead of using
 
 
 
+Beginning with release 1.20, the name type of the principal will be inferred as **KRB5_NT_SRV_INST** or **KRB5_NT_WELLKNOWN** based on the principal name. The type will be **KRB5_NT_PRINCIPAL** if a type cannot be inferred.
+
+
+
 Use :c:func:`krb5_free_principal()` to free *principal_out* when it is no longer needed.
 
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_parse_name_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_parse_name_flags.rst.txt
index 1190ec32d73e..1190ec32d73e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_parse_name_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_parse_name_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_prepend_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_prepend_error_message.rst.txt
index 6503ab162196..6503ab162196 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_prepend_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_prepend_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_principal2salt.txt b/doc/html/_sources/appdev/refs/api/krb5_principal2salt.rst.txt
index c8852912309d..ff0f3416e54e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_principal2salt.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_principal2salt.rst.txt
@@ -3,7 +3,7 @@ krb5_principal2salt -  Convert a principal name into the default salt for that p
 
 ..
 
-.. c:function:: krb5_error_code krb5_principal2salt(krb5_context context, register krb5_const_principal pr, krb5_data * ret)
+.. c:function:: krb5_error_code krb5_principal2salt(krb5_context context, krb5_const_principal pr, krb5_data * ret)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_principal_compare.txt b/doc/html/_sources/appdev/refs/api/krb5_principal_compare.rst.txt
index 269efe315b7b..269efe315b7b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_principal_compare.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_principal_compare.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_principal_compare_any_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_principal_compare_any_realm.rst.txt
index d2766bdb0b66..d2766bdb0b66 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_principal_compare_any_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_principal_compare_any_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_principal_compare_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_principal_compare_flags.rst.txt
index 3df09d3f4aa0..3df09d3f4aa0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_principal_compare_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_principal_compare_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_process_key.txt b/doc/html/_sources/appdev/refs/api/krb5_process_key.rst.txt
index 3d08b5dcaea0..3d08b5dcaea0 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_process_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_process_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_prompter_posix.txt b/doc/html/_sources/appdev/refs/api/krb5_prompter_posix.rst.txt
index 5450996a42de..5450996a42de 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_prompter_posix.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_prompter_posix.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_random_key.txt b/doc/html/_sources/appdev/refs/api/krb5_random_key.rst.txt
index d8e81ba33d79..d8e81ba33d79 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_random_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_random_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_cred.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_cred.rst.txt
new file mode 100644
index 000000000000..03e087662e10
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_cred.rst.txt
@@ -0,0 +1,67 @@
+krb5_rd_cred -  Read and validate a KRB-CRED message. 
+======================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_rd_cred(krb5_context context, krb5_auth_context auth_context, krb5_data * creddata, krb5_creds *** creds_out, krb5_replay_data * rdata_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **auth_context** - Authentication context
+
+	          **[in]** **creddata** - **KRB-CRED** message
+
+	          **[out]** **creds_out** - Null-terminated array of forwarded credentials
+
+	          **[out]** **rdata_out** - Replay data (NULL if not needed)
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+ *creddata* will be decrypted using the receiving subkey if it is present in *auth_context* , or the session key if the receiving subkey is not present or fails to decrypt the message.
+
+
+
+Use :c:func:`krb5_free_tgt_creds()` to free *creds_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .`
+ 
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_cred.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_cred.txt
deleted file mode 100644
index 29405647bf0e..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_cred.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-krb5_rd_cred -  Read and validate a KRB-CRED message. 
-======================================================
-
-..
-
-.. c:function:: krb5_error_code krb5_rd_cred(krb5_context context, krb5_auth_context auth_context, krb5_data * pcreddata, krb5_creds *** pppcreds, krb5_replay_data * outdata)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **auth_context** - Authentication context
-
-	          **[in]** **pcreddata** - **KRB-CRED** message
-
-	          **[out]** **pppcreds** - Null-terminated array of forwarded credentials
-
-	          **[out]** **outdata** - Replay data (NULL if not needed)
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
- *pcreddata* will be decrypted using the receiving subkey if it is present in *auth_context* , or the session key if the receiving subkey is not present or fails to decrypt the message.
-
-
-
-Use :c:func:`krb5_free_tgt_creds()` to free *pppcreds* when it is no longer needed.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
-
-.. note::
-
-	 The *outdata* argument is required if :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in the *auth_context* .`
- 
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_error.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_error.rst.txt
index dd3437594e1b..dd3437594e1b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_error.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_error.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_priv.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_priv.rst.txt
new file mode 100644
index 000000000000..592d593003b6
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_priv.rst.txt
@@ -0,0 +1,79 @@
+krb5_rd_priv -  Process a KRB-PRIV message. 
+============================================
+
+..
+
+.. c:function:: krb5_error_code krb5_rd_priv(krb5_context context, krb5_auth_context auth_context, const krb5_data * inbuf, krb5_data * userdata_out, krb5_replay_data * rdata_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **auth_context** - Authentication structure
+
+	          **[in]** **inbuf** - **KRB-PRIV** message to be parsed
+
+	          **[out]** **userdata_out** - Data parsed from **KRB-PRIV** message
+
+	          **[out]** **rdata_out** - Replay data. Specify NULL if not needed
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+This function parses a **KRB-PRIV** message, verifies its integrity, and stores its unencrypted data into *userdata_out* .
+
+
+
+If *auth_context* has a remote address set, the address will be used to verify the sender address in the KRB-PRIV message. If *auth_context* has a local address set, it will be used to verify the receiver address in the KRB-PRIV message if the message contains one.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` flag is set in *auth_context* , the sequence number of the KRB-PRIV message is checked against the remote sequence number field of *auth_context* . Otherwise, the sequence number is not used.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , then the timestamp in the message is verified to be within the permitted clock skew of the current time, and the message is checked against an in-memory replay cache to detect reflections or replays.
+
+
+
+Use :c:func:`krb5_free_data_contents()` to free *userdata_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .
+ 
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_priv.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_priv.txt
deleted file mode 100644
index af75e8f88eea..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_priv.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-krb5_rd_priv -  Process a KRB-PRIV message. 
-============================================
-
-..
-
-.. c:function:: krb5_error_code krb5_rd_priv(krb5_context context, krb5_auth_context auth_context, const krb5_data * inbuf, krb5_data * outbuf, krb5_replay_data * outdata)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **auth_context** - Authentication structure
-
-	          **[in]** **inbuf** - **KRB-PRIV** message to be parsed
-
-	          **[out]** **outbuf** - Data parsed from **KRB-PRIV** message
-
-	          **[out]** **outdata** - Replay data. Specify NULL if not needed
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function parses a **KRB-PRIV** message, verifies its integrity, and stores its unencrypted data into *outbuf* .
-
-
-
-If the :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` flag is set in *auth_context* , the sequence number of the KRB-SAFE message is checked against the remote sequence number field of *auth_context* . Otherwise, the sequence number is not used.
-
-
-
-If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , then two additional checks are performed: 
- 
-	 - The timestamp in the message must be within the permitted clock skew (which is usually five minutes).
- 
- 
-	 - The message must not be a replayed message field in *auth_context* .
- 
- 
-
-
-
-
-
-
-..
-
-
-
-
-
-
-.. note::
-
-	 If the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* , *outdata* is required.
-
-	 *auth_context* must have a remote address set. This address will be used to verify the sender address in the KRB-PRIV message. If *auth_context* has a local address set, it will be used to verify the receiver address in the KRB-PRIV message if the message contains one. Both addresses must use type **ADDRTYPE_ADDRPORT** .
- 
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_rep.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_rep.rst.txt
index 67419a853be2..67419a853be2 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_rep.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_rep.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_rep_dce.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_rep_dce.rst.txt
index c82ef4317ce5..c82ef4317ce5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_rep_dce.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_rep_dce.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_req.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_req.rst.txt
index 85516e3df54b..85516e3df54b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_req.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_req.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_safe.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_safe.rst.txt
new file mode 100644
index 000000000000..6b7692dd0ee8
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_rd_safe.rst.txt
@@ -0,0 +1,79 @@
+krb5_rd_safe -  Process KRB-SAFE message. 
+==========================================
+
+..
+
+.. c:function:: krb5_error_code krb5_rd_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data * inbuf, krb5_data * userdata_out, krb5_replay_data * rdata_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **auth_context** - Authentication context
+
+	          **[in]** **inbuf** - **KRB-SAFE** message to be parsed
+
+	          **[out]** **userdata_out** - Data parsed from **KRB-SAFE** message
+
+	          **[out]** **rdata_out** - Replay data. Specify NULL if not needed
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+This function parses a **KRB-SAFE** message, verifies its integrity, and stores its data into *userdata_out* .
+
+
+
+If *auth_context* has a remote address set, the address will be used to verify the sender address in the KRB-SAFE message. If *auth_context* has a local address set, it will be used to verify the receiver address in the KRB-SAFE message if the message contains one.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` flag is set in *auth_context* , the sequence number of the KRB-SAFE message is checked against the remote sequence number field of *auth_context* . Otherwise, the sequence number is not used.
+
+
+
+If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , then the timestamp in the message is verified to be within the permitted clock skew of the current time, and the message is checked against an in-memory replay cache to detect reflections or replays.
+
+
+
+Use :c:func:`krb5_free_data_contents()` to free *userdata_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
+
+.. note::
+
+	 The *rdata_out* argument is required if the :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in *auth_context* .
+ 
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_rd_safe.txt b/doc/html/_sources/appdev/refs/api/krb5_rd_safe.txt
deleted file mode 100644
index d6c096fa4c0e..000000000000
--- a/doc/html/_sources/appdev/refs/api/krb5_rd_safe.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-krb5_rd_safe -  Process KRB-SAFE message. 
-==========================================
-
-..
-
-.. c:function:: krb5_error_code krb5_rd_safe(krb5_context context, krb5_auth_context auth_context, const krb5_data * inbuf, krb5_data * outbuf, krb5_replay_data * outdata)
-
-..
-
-
-:param:
-
-	          **[in]** **context** - Library context
-
-	          **[in]** **auth_context** - Authentication context
-
-	          **[in]** **inbuf** - **KRB-SAFE** message to be parsed
-
-	          **[out]** **outbuf** - Data parsed from **KRB-SAFE** message
-
-	          **[out]** **outdata** - Replay data. Specify NULL if not needed
-
-
-..
-
-
-:retval:
-         -   0   Success; otherwise - Kerberos error codes
-
-
-..
-
-
-
-
-
-
-
-This function parses a **KRB-SAFE** message, verifies its integrity, and stores its data into *outbuf* .
-
-
-
-If the :data:`KRB5_AUTH_CONTEXT_DO_SEQUENCE` flag is set in *auth_context* , the sequence number of the KRB-SAFE message is checked against the remote sequence number field of *auth_context* . Otherwise, the sequence number is not used.
-
-
-
-If the :data:`KRB5_AUTH_CONTEXT_DO_TIME` flag is set in *auth_context* , then two additional checks are performed: 
- 
-	 - The timestamp in the message must be within the permitted clock skew (which is usually five minutes).
- 
- 
-	 - The message must not be a replayed message field in *auth_context* .
- 
- Use :c:func:`krb5_free_data_contents()` to free *outbuf* when it is no longer needed.
-
-
-
-
-
-
-
-
-
-
-..
-
-
-
-
-
-
-.. note::
-
-	 The *outdata* argument is required if :data:`KRB5_AUTH_CONTEXT_RET_TIME` or :data:`KRB5_AUTH_CONTEXT_RET_SEQUENCE` flag is set in the *auth_context* .
-
-	 *auth_context* must have a remote address set. This address will be used to verify the sender address in the KRB-SAFE message. If *auth_context* has a local address set, it will be used to verify the receiver address in the KRB-SAFE message if the message contains one. Both addresses must use type **ADDRTYPE_ADDRPORT** .
- 
-
-
-
diff --git a/doc/html/_sources/appdev/refs/api/krb5_read_password.txt b/doc/html/_sources/appdev/refs/api/krb5_read_password.rst.txt
index bc13db558e20..877fe6e6f762 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_read_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_read_password.rst.txt
@@ -29,7 +29,8 @@ krb5_read_password -  Read a password from keyboard input.
 
 
 :return:
-         -  Error in reading or verifying the password Kerberos error codes 
+         -  Error in reading or verifying the password 
+         -  Kerberos error codes 
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_realm_compare.txt b/doc/html/_sources/appdev/refs/api/krb5_realm_compare.rst.txt
index f9df1b029aa2..f9df1b029aa2 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_realm_compare.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_realm_compare.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_recvauth.txt b/doc/html/_sources/appdev/refs/api/krb5_recvauth.rst.txt
index c9bcaa870e35..c9bcaa870e35 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_recvauth.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_recvauth.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_recvauth_version.txt b/doc/html/_sources/appdev/refs/api/krb5_recvauth_version.rst.txt
index 6d3e446c5caf..6d3e446c5caf 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_recvauth_version.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_recvauth_version.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_get_challenge.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_get_challenge.rst.txt
index ae1edc9a4656..ae1edc9a4656 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_get_challenge.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_get_challenge.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_list_questions.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_list_questions.rst.txt
index d1efd0148522..d1efd0148522 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_list_questions.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_list_questions.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_challenge_free.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_challenge_free.rst.txt
index fb4863ea1bb3..fb4863ea1bb3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_challenge_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_challenge_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_get_challenge.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_get_challenge.rst.txt
index 4fd609e980b6..4fd609e980b6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_get_challenge.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_get_challenge.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_set_answer.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_set_answer.rst.txt
index 0535a206aa19..0535a206aa19 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_otp_set_answer.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_otp_set_answer.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_challenge_free.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_challenge_free.rst.txt
index e7376aaf3852..e7376aaf3852 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_challenge_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_challenge_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_get_challenge.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_get_challenge.rst.txt
index a14588127aca..a14588127aca 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_get_challenge.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_get_challenge.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_set_answer.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_set_answer.rst.txt
index dc8fa57cc4a6..dc8fa57cc4a6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_set_answer.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_pkinit_set_answer.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_responder_set_answer.txt b/doc/html/_sources/appdev/refs/api/krb5_responder_set_answer.rst.txt
index c5b588aacbbb..c5b588aacbbb 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_responder_set_answer.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_responder_set_answer.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_salttype_to_string.txt b/doc/html/_sources/appdev/refs/api/krb5_salttype_to_string.rst.txt
index e0e44a6bfba5..e0e44a6bfba5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_salttype_to_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_salttype_to_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_sendauth.txt b/doc/html/_sources/appdev/refs/api/krb5_sendauth.rst.txt
index 29abeaf4a2f5..29abeaf4a2f5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_sendauth.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_sendauth.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_server_decrypt_ticket_keytab.txt b/doc/html/_sources/appdev/refs/api/krb5_server_decrypt_ticket_keytab.rst.txt
index 0ec0337159f2..0ec0337159f2 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_server_decrypt_ticket_keytab.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_server_decrypt_ticket_keytab.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_default_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_set_default_realm.rst.txt
index d9ac43d5efc3..d9ac43d5efc3 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_default_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_default_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_default_tgs_enctypes.txt b/doc/html/_sources/appdev/refs/api/krb5_set_default_tgs_enctypes.rst.txt
index 870ca63dc202..870ca63dc202 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_default_tgs_enctypes.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_default_tgs_enctypes.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_set_error_message.rst.txt
index 86bf9b7c7dde..86bf9b7c7dde 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_kdc_recv_hook.txt b/doc/html/_sources/appdev/refs/api/krb5_set_kdc_recv_hook.rst.txt
index 66a334a44b8c..66a334a44b8c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_kdc_recv_hook.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_kdc_recv_hook.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_kdc_send_hook.txt b/doc/html/_sources/appdev/refs/api/krb5_set_kdc_send_hook.rst.txt
index 7bffffb44616..7bffffb44616 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_kdc_send_hook.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_kdc_send_hook.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_password.txt b/doc/html/_sources/appdev/refs/api/krb5_set_password.rst.txt
index 0fefb2cea3e2..0fefb2cea3e2 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_password.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_password.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_password_using_ccache.txt b/doc/html/_sources/appdev/refs/api/krb5_set_password_using_ccache.rst.txt
index 24bf4be7edd6..24bf4be7edd6 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_password_using_ccache.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_password_using_ccache.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_principal_realm.txt b/doc/html/_sources/appdev/refs/api/krb5_set_principal_realm.rst.txt
index 0319b338aa78..0319b338aa78 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_principal_realm.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_principal_realm.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_real_time.txt b/doc/html/_sources/appdev/refs/api/krb5_set_real_time.rst.txt
index 18d7a6b5f913..18d7a6b5f913 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_real_time.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_real_time.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_trace_callback.txt b/doc/html/_sources/appdev/refs/api/krb5_set_trace_callback.rst.txt
index 4c31ddb61001..4c31ddb61001 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_trace_callback.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_trace_callback.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_set_trace_filename.txt b/doc/html/_sources/appdev/refs/api/krb5_set_trace_filename.rst.txt
index 6d75325a3489..6d75325a3489 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_set_trace_filename.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_set_trace_filename.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_sname_match.txt b/doc/html/_sources/appdev/refs/api/krb5_sname_match.rst.txt
index c37500068263..c37500068263 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_sname_match.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_sname_match.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_sname_to_principal.txt b/doc/html/_sources/appdev/refs/api/krb5_sname_to_principal.rst.txt
index 07b4849a91ab..07b4849a91ab 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_sname_to_principal.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_sname_to_principal.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_cksumtype.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_cksumtype.rst.txt
index 8ad07f795d83..8ad07f795d83 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_cksumtype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_cksumtype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_deltat.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_deltat.rst.txt
index 0f1b9584bfef..0f1b9584bfef 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_deltat.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_deltat.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_enctype.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_enctype.rst.txt
index 173251f6d98f..173251f6d98f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_enctype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_enctype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_key.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_key.rst.txt
index 3f44b9d5ab28..3f44b9d5ab28 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_key.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_key.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_salttype.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_salttype.rst.txt
index 36978f4b1bdc..36978f4b1bdc 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_salttype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_salttype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_string_to_timestamp.txt b/doc/html/_sources/appdev/refs/api/krb5_string_to_timestamp.rst.txt
index 11b6d1e976a9..11b6d1e976a9 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_string_to_timestamp.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_string_to_timestamp.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_timeofday.txt b/doc/html/_sources/appdev/refs/api/krb5_timeofday.rst.txt
index 0c38a97fe7fe..dc1c90290942 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_timeofday.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_timeofday.rst.txt
@@ -3,7 +3,7 @@ krb5_timeofday -  Retrieve the current time with context specific time offset ad
 
 ..
 
-.. c:function:: krb5_error_code krb5_timeofday(krb5_context context, register krb5_timestamp * timeret)
+.. c:function:: krb5_error_code krb5_timeofday(krb5_context context, krb5_timestamp * timeret)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_sfstring.txt b/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_sfstring.rst.txt
index 3750c45d010a..3750c45d010a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_sfstring.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_sfstring.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_string.txt b/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_string.rst.txt
index 1c4c71eb2e1e..1c4c71eb2e1e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_string.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_timestamp_to_string.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_free.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_free.rst.txt
index 623ed5be390b..623ed5be390b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_free.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_free.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get.rst.txt
index 4ff37fd13217..4ff37fd13217 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_creds.rst.txt
index 1f402aee8b9e..1f402aee8b9e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_times.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_times.rst.txt
index 09701f05717b..09701f05717b 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_times.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_get_times.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_init.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_init.rst.txt
index e61ee90f8af5..e61ee90f8af5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_step.txt b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_step.rst.txt
index 6cab1642b01e..6cab1642b01e 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_step.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_tkt_creds_step.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_unmarshal_credentials.rst.txt b/doc/html/_sources/appdev/refs/api/krb5_unmarshal_credentials.rst.txt
new file mode 100644
index 000000000000..d30905e156a4
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/api/krb5_unmarshal_credentials.rst.txt
@@ -0,0 +1,55 @@
+krb5_unmarshal_credentials -  Deserialize a krb5_creds object. 
+===============================================================
+
+..
+
+.. c:function:: krb5_error_code krb5_unmarshal_credentials(krb5_context context, const krb5_data * data, krb5_creds ** creds_out)
+
+..
+
+
+:param:
+
+	          **[in]** **context** - Library context
+
+	          **[in]** **data** - The serialized credentials
+
+	          **[out]** **creds_out** - The resulting creds object
+
+
+..
+
+
+:retval:
+         -   0   Success; otherwise - Kerberos error codes
+
+
+..
+
+
+
+
+
+
+
+Deserialize *data* to credentials in the format used by the FILE ccache format (vesion 4) and KCM ccache protocol.
+
+
+
+Use :c:func:`krb5_free_creds()` to free *creds_out* when it is no longer needed.
+
+
+
+
+
+
+
+
+
+
+..
+
+
+
+
+
diff --git a/doc/html/_sources/appdev/refs/api/krb5_unparse_name.txt b/doc/html/_sources/appdev/refs/api/krb5_unparse_name.rst.txt
index 11a434ad8f63..0f45313b9e56 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_unparse_name.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_unparse_name.rst.txt
@@ -3,7 +3,7 @@ krb5_unparse_name -  Convert a krb5_principal structure to a string representati
 
 ..
 
-.. c:function:: krb5_error_code krb5_unparse_name(krb5_context context, krb5_const_principal principal, register char ** name)
+.. c:function:: krb5_error_code krb5_unparse_name(krb5_context context, krb5_const_principal principal, char ** name)
 
 ..
 
diff --git a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_ext.txt b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_ext.rst.txt
index 61b13e1b88bd..61b13e1b88bd 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_ext.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_ext.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags.txt b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags.rst.txt
index 0cf41cf4ae87..0cf41cf4ae87 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags_ext.txt b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags_ext.rst.txt
index aa713bda494f..aa713bda494f 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags_ext.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_unparse_name_flags_ext.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_us_timeofday.txt b/doc/html/_sources/appdev/refs/api/krb5_us_timeofday.rst.txt
index ba4ef8084f2c..ba4ef8084f2c 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_us_timeofday.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_us_timeofday.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_use_enctype.txt b/doc/html/_sources/appdev/refs/api/krb5_use_enctype.rst.txt
index 10b3fa712482..10b3fa712482 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_use_enctype.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_use_enctype.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_verify_authdata_kdc_issued.txt b/doc/html/_sources/appdev/refs/api/krb5_verify_authdata_kdc_issued.rst.txt
index 30971392e3ec..30971392e3ec 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_verify_authdata_kdc_issued.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_verify_authdata_kdc_issued.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_verify_checksum.txt b/doc/html/_sources/appdev/refs/api/krb5_verify_checksum.rst.txt
index 0ddf63185d72..0ddf63185d72 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_verify_checksum.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_verify_checksum.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds.txt b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds.rst.txt
index 04185f342d69..04185f342d69 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_init.txt b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_init.rst.txt
index a55fd3aa5094..a55fd3aa5094 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_init.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_init.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_set_ap_req_nofail.txt b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_set_ap_req_nofail.rst.txt
index fc6ac022cbad..fc6ac022cbad 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_set_ap_req_nofail.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_verify_init_creds_opt_set_ap_req_nofail.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_vprepend_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_vprepend_error_message.rst.txt
index 7c493596028a..7c493596028a 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_vprepend_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_vprepend_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_vset_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_vset_error_message.rst.txt
index fcb4b6996f62..fcb4b6996f62 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_vset_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_vset_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_vwrap_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_vwrap_error_message.rst.txt
index 1e2a27e7eee5..1e2a27e7eee5 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_vwrap_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_vwrap_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/api/krb5_wrap_error_message.txt b/doc/html/_sources/appdev/refs/api/krb5_wrap_error_message.rst.txt
index b599ae78ff71..b599ae78ff71 100644
--- a/doc/html/_sources/appdev/refs/api/krb5_wrap_error_message.txt
+++ b/doc/html/_sources/appdev/refs/api/krb5_wrap_error_message.rst.txt
diff --git a/doc/html/_sources/appdev/refs/index.txt b/doc/html/_sources/appdev/refs/index.rst.txt
index 37a895f3bee4..37a895f3bee4 100644
--- a/doc/html/_sources/appdev/refs/index.txt
+++ b/doc/html/_sources/appdev/refs/index.rst.txt
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ADDRPORT.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ADDRPORT.rst.txt
index f2e324838c9d..ec4c2835fad4 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ADDRPORT.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ADDRPORT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-ADDRPORT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_CHAOS.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_CHAOS.rst.txt
index cbc6dae09f08..7285be14226e 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_CHAOS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_CHAOS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-CHAOS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_DDP.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_DDP.rst.txt
index a62d91fcec6a..bbf67c14577c 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_DDP.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_DDP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-DDP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET.rst.txt
index 10ed68a96b35..e40013b0cddc 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-INET-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET6.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET6.rst.txt
index c41a4666541a..f1c6c8521152 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET6.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_INET6.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-INET6-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IPPORT.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IPPORT.rst.txt
index 0cd4a20f36e5..09030d66e91f 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IPPORT.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IPPORT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-IPPORT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ISO.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ISO.rst.txt
index 0b3524455eb1..3feb1fb0ccce 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ISO.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_ISO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-ISO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IS_LOCAL.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IS_LOCAL.rst.txt
index de1bdc48f863..9f091b417dd8 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IS_LOCAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_IS_LOCAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-IS-LOCAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_NETBIOS.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_NETBIOS.rst.txt
index b8e4762d18d7..1c62e3d837cc 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_NETBIOS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_NETBIOS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-NETBIOS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_XNS.txt b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_XNS.rst.txt
index 8b861728f904..8c30dcddec41 100644
--- a/doc/html/_sources/appdev/refs/macros/ADDRTYPE_XNS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ADDRTYPE_XNS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ADDRTYPE-XNS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AD_TYPE_EXTERNAL.txt b/doc/html/_sources/appdev/refs/macros/AD_TYPE_EXTERNAL.rst.txt
index 69d9f08c0ada..eacafc20ae83 100644
--- a/doc/html/_sources/appdev/refs/macros/AD_TYPE_EXTERNAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/AD_TYPE_EXTERNAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AD-TYPE-EXTERNAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AD_TYPE_FIELD_TYPE_MASK.txt b/doc/html/_sources/appdev/refs/macros/AD_TYPE_FIELD_TYPE_MASK.rst.txt
index a1fb2688bae9..fefb9843ef34 100644
--- a/doc/html/_sources/appdev/refs/macros/AD_TYPE_FIELD_TYPE_MASK.txt
+++ b/doc/html/_sources/appdev/refs/macros/AD_TYPE_FIELD_TYPE_MASK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AD-TYPE-FIELD-TYPE-MASK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AD_TYPE_REGISTERED.txt b/doc/html/_sources/appdev/refs/macros/AD_TYPE_REGISTERED.rst.txt
index 465c3188fab2..4907e15969a2 100644
--- a/doc/html/_sources/appdev/refs/macros/AD_TYPE_REGISTERED.txt
+++ b/doc/html/_sources/appdev/refs/macros/AD_TYPE_REGISTERED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AD-TYPE-REGISTERED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AD_TYPE_RESERVED.txt b/doc/html/_sources/appdev/refs/macros/AD_TYPE_RESERVED.rst.txt
index ea1e6996c996..5ae5ea33df02 100644
--- a/doc/html/_sources/appdev/refs/macros/AD_TYPE_RESERVED.txt
+++ b/doc/html/_sources/appdev/refs/macros/AD_TYPE_RESERVED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AD-TYPE-RESERVED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_ETYPE_NEGOTIATION.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_ETYPE_NEGOTIATION.rst.txt
index 5258fc9af9a5..4bea16d07f7d 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_ETYPE_NEGOTIATION.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_ETYPE_NEGOTIATION.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-ETYPE-NEGOTIATION-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_MUTUAL_REQUIRED.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_MUTUAL_REQUIRED.rst.txt
index fc51787d08f9..b3e6e592968d 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_MUTUAL_REQUIRED.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_MUTUAL_REQUIRED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-MUTUAL-REQUIRED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_RESERVED.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_RESERVED.rst.txt
index 101a5a85a38a..7961b63c08c5 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_RESERVED.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_RESERVED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-RESERVED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SESSION_KEY.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SESSION_KEY.rst.txt
index 76340ceaa0e6..1742a2ff4be0 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SESSION_KEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SESSION_KEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-USE-SESSION-KEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SUBKEY.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SUBKEY.rst.txt
index 1e7e757f967d..77bf41d92e4b 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SUBKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_USE_SUBKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-USE-SUBKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/AP_OPTS_WIRE_MASK.txt b/doc/html/_sources/appdev/refs/macros/AP_OPTS_WIRE_MASK.rst.txt
index c801afd5b9ae..36328d5593cd 100644
--- a/doc/html/_sources/appdev/refs/macros/AP_OPTS_WIRE_MASK.txt
+++ b/doc/html/_sources/appdev/refs/macros/AP_OPTS_WIRE_MASK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _AP-OPTS-WIRE-MASK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA128.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA128.rst.txt
index 302962cff7f2..1a61f15456a3 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA128.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA128.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-CMAC-CAMELLIA128-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA256.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA256.rst.txt
index 979f06a6aefb..91f2c1662c2c 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA256.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA256.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-CMAC-CAMELLIA256-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CRC32.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CRC32.rst.txt
index cf5c90c29693..6d0c4a312908 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CRC32.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_CRC32.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-CRC32-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_DESCBC.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_DESCBC.rst.txt
index 2d42028cf757..830ddb8848e2 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_DESCBC.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_DESCBC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-DESCBC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_MD5_ARCFOUR.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_MD5_ARCFOUR.rst.txt
index 89bf8180eefc..9163bd3646d0 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_MD5_ARCFOUR.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_MD5_ARCFOUR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-MD5-ARCFOUR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES128.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES128.rst.txt
index 57ad067ad761..5d28bbe08bce 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES128.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES128.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-SHA1-96-AES128-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES256.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES256.rst.txt
index f48d8f7ab392..71ba018c3cdf 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES256.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES256.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-SHA1-96-AES256-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_DES3.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_DES3.rst.txt
index 1063b6791a94..c6c76f2ab909 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_DES3.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_DES3.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-SHA1-DES3-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA256_128_AES128.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA256_128_AES128.rst.txt
index 028e23d78488..77f956e034b7 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA256_128_AES128.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA256_128_AES128.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-SHA256-128-AES128-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA384_192_AES256.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA384_192_AES256.rst.txt
index 06307c78dbc7..b95628d58c68 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA384_192_AES256.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_HMAC_SHA384_192_AES256.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-HMAC-SHA384-192-AES256-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_MD5_HMAC_ARCFOUR.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_MD5_HMAC_ARCFOUR.rst.txt
index 10590868ff49..97d84fe8a56a 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_MD5_HMAC_ARCFOUR.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_MD5_HMAC_ARCFOUR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-MD5-HMAC-ARCFOUR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_NIST_SHA.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_NIST_SHA.rst.txt
index 5e2194451b0e..3524028ec01b 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_NIST_SHA.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_NIST_SHA.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-NIST-SHA-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4.rst.txt
index 7f5e2df5b7ac..02a4248b8186 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-RSA-MD4-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4_DES.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4_DES.rst.txt
index 580624e72415..7e5cc058cb09 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4_DES.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD4_DES.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-RSA-MD4-DES-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5.rst.txt
index e1aadebbf2b1..e94f0b458202 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-RSA-MD5-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5_DES.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5_DES.rst.txt
index 251a1fc159f3..87c321f5033f 100644
--- a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5_DES.txt
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_RSA_MD5_DES.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _CKSUMTYPE-RSA-MD5-DES-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_SHA1.rst.txt b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_SHA1.rst.txt
new file mode 100644
index 000000000000..a0f24bd5425a
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/CKSUMTYPE_SHA1.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _CKSUMTYPE-SHA1-data:
+
+CKSUMTYPE_SHA1
+==============
+
+..
+.. data:: CKSUMTYPE_SHA1
+..
+
+RFC 3961.
+
+
+
+===================== ======================
+``CKSUMTYPE_SHA1``       ``0x000e``
+===================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA1_96.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA1_96.rst.txt
index b41f106726df..b66ae72be1c9 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA1_96.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA1_96.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-AES128-CTS-HMAC-SHA1-96-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA256_128.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA256_128.rst.txt
index b0881224d0ec..3f83a1bf6abe 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA256_128.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA256_128.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-AES128-CTS-HMAC-SHA256-128-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA1_96.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA1_96.rst.txt
index 52773eb3ee28..4d216964da4b 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA1_96.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA1_96.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-AES256-CTS-HMAC-SHA1-96-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA384_192.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA384_192.rst.txt
index 1f7bbf729ff4..76c8e4b73482 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA384_192.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA384_192.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-AES256-CTS-HMAC-SHA384-192-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC.rst.txt
index 272126505f90..54200453fc23 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-ARCFOUR-HMAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC_EXP.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC_EXP.rst.txt
index fa3b8c3b9748..140c34127b84 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC_EXP.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC_EXP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-ARCFOUR-HMAC-EXP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA128_CTS_CMAC.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA128_CTS_CMAC.rst.txt
index 553578a25c66..e08e8e3f324c 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA128_CTS_CMAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA128_CTS_CMAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-CAMELLIA128-CTS-CMAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA256_CTS_CMAC.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA256_CTS_CMAC.rst.txt
index 2ad90d395653..7f7d64c89299 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA256_CTS_CMAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_CAMELLIA256_CTS_CMAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-CAMELLIA256-CTS-CMAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_ENV.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_ENV.rst.txt
index d75692ec5343..62358d2f4f5e 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_ENV.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_ENV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES3-CBC-ENV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_RAW.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_RAW.rst.txt
index 3070f17b13e5..1f32313380ba 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_RAW.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_RAW.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES3-CBC-RAW-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA.rst.txt
index 62c8ca5af5fe..3d14182b8002 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES3-CBC-SHA-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA1.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA1.rst.txt
index 9ad6330da134..6ad9a1850839 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA1.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA1.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES3-CBC-SHA1-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_CRC.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_CRC.rst.txt
index 63bb07eec06c..a442821ba171 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_CRC.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_CRC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES-CBC-CRC-data:
 
@@ -9,7 +9,6 @@ ENCTYPE_DES_CBC_CRC
 .. data:: ENCTYPE_DES_CBC_CRC
 ..
 
-DES cbc mode with CRC-32.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD4.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD4.rst.txt
index 1e477a93c1d4..2b227deb8a59 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD4.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD4.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES-CBC-MD4-data:
 
@@ -9,7 +9,6 @@ ENCTYPE_DES_CBC_MD4
 .. data:: ENCTYPE_DES_CBC_MD4
 ..
 
-DES cbc mode with RSA-MD4.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD5.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD5.rst.txt
index 87c1c6043569..d4edca906e18 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD5.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_MD5.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES-CBC-MD5-data:
 
@@ -9,7 +9,6 @@ ENCTYPE_DES_CBC_MD5
 .. data:: ENCTYPE_DES_CBC_MD5
 ..
 
-DES cbc mode with RSA-MD5.
 
 
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_RAW.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_RAW.rst.txt
index d03eac2f21d8..e3de8120618a 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_RAW.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_CBC_RAW.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES-CBC-RAW-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_HMAC_SHA1.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_HMAC_SHA1.rst.txt
index d2f325f6cf42..9494faed89da 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_HMAC_SHA1.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DES_HMAC_SHA1.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DES-HMAC-SHA1-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DSA_SHA1_CMS.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DSA_SHA1_CMS.rst.txt
index 0f1ab60c248c..fca77e48c770 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_DSA_SHA1_CMS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_DSA_SHA1_CMS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-DSA-SHA1-CMS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_MD5_RSA_CMS.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_MD5_RSA_CMS.rst.txt
index 94c38809ca64..5d4cc6b55985 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_MD5_RSA_CMS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_MD5_RSA_CMS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-MD5-RSA-CMS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_NULL.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_NULL.rst.txt
index 241698f01907..1a62c065c2e2 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_NULL.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_NULL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-NULL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RC2_CBC_ENV.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RC2_CBC_ENV.rst.txt
index 7da526090fd4..3dc732bb0d5f 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RC2_CBC_ENV.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RC2_CBC_ENV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-RC2-CBC-ENV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ENV.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ENV.rst.txt
index 7b58fca97258..0f0657160045 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ENV.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ENV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-RSA-ENV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ES_OAEP_ENV.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ES_OAEP_ENV.rst.txt
index d51908a73e25..1d7cfc0d7c1d 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ES_OAEP_ENV.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_RSA_ES_OAEP_ENV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-RSA-ES-OAEP-ENV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_SHA1_RSA_CMS.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_SHA1_RSA_CMS.rst.txt
index 6b5971b9bdcc..a8cfe754d746 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_SHA1_RSA_CMS.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_SHA1_RSA_CMS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-SHA1-RSA-CMS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/ENCTYPE_UNKNOWN.txt b/doc/html/_sources/appdev/refs/macros/ENCTYPE_UNKNOWN.rst.txt
index f0c034c17d7d..44f868795574 100644
--- a/doc/html/_sources/appdev/refs/macros/ENCTYPE_UNKNOWN.txt
+++ b/doc/html/_sources/appdev/refs/macros/ENCTYPE_UNKNOWN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _ENCTYPE-UNKNOWN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_ALLOW_POSTDATE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_ALLOW_POSTDATE.rst.txt
index ea6e8bffcee2..64508eebc898 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_ALLOW_POSTDATE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_ALLOW_POSTDATE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-ALLOW-POSTDATE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_CANONICALIZE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_CANONICALIZE.rst.txt
index a23b4ef3f388..05f20bdce615 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_CANONICALIZE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_CANONICALIZE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-CANONICALIZE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_CNAME_IN_ADDL_TKT.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_CNAME_IN_ADDL_TKT.rst.txt
index 6e456a0d26b4..bf9a9717c246 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_CNAME_IN_ADDL_TKT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_CNAME_IN_ADDL_TKT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-CNAME-IN-ADDL-TKT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_DISABLE_TRANSITED_CHECK.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_DISABLE_TRANSITED_CHECK.rst.txt
index 55072aefeb49..c0ac52944079 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_DISABLE_TRANSITED_CHECK.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_DISABLE_TRANSITED_CHECK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-DISABLE-TRANSITED-CHECK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_ENC_TKT_IN_SKEY.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_ENC_TKT_IN_SKEY.rst.txt
index 3baaab2b301c..ca72eccdef2d 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_ENC_TKT_IN_SKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_ENC_TKT_IN_SKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-ENC-TKT-IN-SKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDABLE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDABLE.rst.txt
index abe8f2653f7a..171ea0020a7c 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-FORWARDABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDED.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDED.rst.txt
index ab4e0ef0728f..ddfd30c8823e 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_FORWARDED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-FORWARDED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_POSTDATED.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_POSTDATED.rst.txt
index f7858cfc85c0..a6af6435103f 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_POSTDATED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_POSTDATED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-POSTDATED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXIABLE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXIABLE.rst.txt
index 82925cd400a1..5a87454761b2 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXIABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXIABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-PROXIABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXY.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXY.rst.txt
index d1c99c86d267..64c4f0ae33f4 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_PROXY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-PROXY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEW.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEW.rst.txt
index 8c68ee690c7f..23e48761ea36 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEW.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEW.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-RENEW-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE.rst.txt
index b757c8703cb9..d7f13ca530cc 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-RENEWABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE_OK.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE_OK.rst.txt
index 405bec01396a..0d082e1ab6bf 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE_OK.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_RENEWABLE_OK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-RENEWABLE-OK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_REQUEST_ANONYMOUS.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_REQUEST_ANONYMOUS.rst.txt
index 29d22a42e72a..7a14ec6eb1d2 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_REQUEST_ANONYMOUS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_REQUEST_ANONYMOUS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-REQUEST-ANONYMOUS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_OPT_VALIDATE.txt b/doc/html/_sources/appdev/refs/macros/KDC_OPT_VALIDATE.rst.txt
index c15e83c4889c..666beccbaff3 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_OPT_VALIDATE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_OPT_VALIDATE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-OPT-VALIDATE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KDC_TKT_COMMON_MASK.txt b/doc/html/_sources/appdev/refs/macros/KDC_TKT_COMMON_MASK.rst.txt
index ccb5d309402c..e2cb96038c58 100644
--- a/doc/html/_sources/appdev/refs/macros/KDC_TKT_COMMON_MASK.txt
+++ b/doc/html/_sources/appdev/refs/macros/KDC_TKT_COMMON_MASK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KDC-TKT-COMMON-MASK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_ALTAUTH_ATT_CHALLENGE_RESPONSE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_ALTAUTH_ATT_CHALLENGE_RESPONSE.rst.txt
index 894c4f8b2229..ddc0ea0e7cdc 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_ALTAUTH_ATT_CHALLENGE_RESPONSE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_ALTAUTH_ATT_CHALLENGE_RESPONSE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-ALTAUTH-ATT-CHALLENGE-RESPONSE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_PRINCSTR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_PRINCSTR.rst.txt
index 85682d1a27e7..1d1644e3ad05 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_PRINCSTR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_PRINCSTR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-ANONYMOUS-PRINCSTR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_REALMSTR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_REALMSTR.rst.txt
index 9d8015dbc113..e9ab94d0765a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_REALMSTR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_ANONYMOUS_REALMSTR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-ANONYMOUS-REALMSTR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AP_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AP_REP.rst.txt
index 3d1099f926ec..4e50adf48475 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AP_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AP_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AP-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AP_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AP_REQ.rst.txt
index 487a607c971b..e92d37ea0f5d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AP_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AP_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AP-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AS_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AS_REP.rst.txt
index c9f7ea1eb054..69eb704144b6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AS_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AS_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AS-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AS_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AS_REQ.rst.txt
index 9a5ca6f15dd8..8550106328fd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AS_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AS_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AS-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AND_OR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AND_OR.rst.txt
index 805b8bd62095..a1abcbd28407 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AND_OR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AND_OR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-AND-OR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AP_OPTIONS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AP_OPTIONS.rst.txt
new file mode 100644
index 000000000000..879702525e55
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AP_OPTIONS.rst.txt
@@ -0,0 +1,17 @@
+.. highlight:: c
+
+.. _KRB5-AUTHDATA-AP-OPTIONS-data:
+
+KRB5_AUTHDATA_AP_OPTIONS
+========================
+
+..
+.. data:: KRB5_AUTHDATA_AP_OPTIONS
+..
+
+
+
+
+=============================== ======================
+``KRB5_AUTHDATA_AP_OPTIONS``       ``143``
+=============================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AUTH_INDICATOR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AUTH_INDICATOR.rst.txt
index 304c2b2ec772..ae1178ea6aba 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AUTH_INDICATOR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_AUTH_INDICATOR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-AUTH-INDICATOR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_CAMMAC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_CAMMAC.rst.txt
index 213947a160ce..e6a239eaac7a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_CAMMAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_CAMMAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-CAMMAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_ETYPE_NEGOTIATION.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_ETYPE_NEGOTIATION.rst.txt
index 0f454844fde4..04621391b69c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_ETYPE_NEGOTIATION.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_ETYPE_NEGOTIATION.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-ETYPE-NEGOTIATION-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_FX_ARMOR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_FX_ARMOR.rst.txt
index 3661af5acd5e..1982e8356014 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_FX_ARMOR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_FX_ARMOR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-FX-ARMOR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_IF_RELEVANT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_IF_RELEVANT.rst.txt
index eb773f81bfa0..ff0b24399ed4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_IF_RELEVANT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_IF_RELEVANT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-IF-RELEVANT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_INITIAL_VERIFIED_CAS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_INITIAL_VERIFIED_CAS.rst.txt
index 8ddb686a1716..5e76101c2e09 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_INITIAL_VERIFIED_CAS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_INITIAL_VERIFIED_CAS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-INITIAL-VERIFIED-CAS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_KDC_ISSUED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_KDC_ISSUED.rst.txt
index b63e83d69b51..e566040c3811 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_KDC_ISSUED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_KDC_ISSUED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-KDC-ISSUED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_MANDATORY_FOR_KDC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_MANDATORY_FOR_KDC.rst.txt
index 8112bf0618b6..50eacee7bd6e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_MANDATORY_FOR_KDC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_MANDATORY_FOR_KDC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-MANDATORY-FOR-KDC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_OSF_DCE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_OSF_DCE.rst.txt
index ffd04482456b..a545b9facd69 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_OSF_DCE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_OSF_DCE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-OSF-DCE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SESAME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SESAME.rst.txt
index 2857cfe70f04..c21e3a11d551 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SESAME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SESAME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-SESAME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SIGNTICKET.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SIGNTICKET.rst.txt
index c74afcb69acb..cff5f6f7efcd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SIGNTICKET.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_SIGNTICKET.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-SIGNTICKET-data:
 
@@ -9,7 +9,6 @@ KRB5_AUTHDATA_SIGNTICKET
 .. data:: KRB5_AUTHDATA_SIGNTICKET
 ..
 
-formerly 142 in krb5 1.8
 
 
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_WIN2K_PAC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_WIN2K_PAC.rst.txt
index e6417b8bbdf1..b7ecde0bc933 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_WIN2K_PAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTHDATA_WIN2K_PAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTHDATA-WIN2K-PAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_SEQUENCE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_SEQUENCE.rst.txt
index 700a704d6e79..b0e214c15a5e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_SEQUENCE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_SEQUENCE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-DO-SEQUENCE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_TIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_TIME.rst.txt
index 14e6e6d1601d..09815b7bd28a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_TIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_TIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-DO-TIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR.rst.txt
index e500f7d1ab3b..16a15cff2720 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-GENERATE-LOCAL-ADDR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR.rst.txt
index a7ae9ec5659f..b74824f0fe72 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-GENERATE-LOCAL-FULL-ADDR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR.rst.txt
index 7887a5d5778e..d8ee93bd350d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-GENERATE-REMOTE-ADDR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR.rst.txt
index 9b90467ef0bf..a70428abebee 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-GENERATE-REMOTE-FULL-ADDR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_PERMIT_ALL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_PERMIT_ALL.rst.txt
index 09e1b684a86d..7ed17e797851 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_PERMIT_ALL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_PERMIT_ALL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-PERMIT-ALL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_SEQUENCE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_SEQUENCE.rst.txt
index 6e7e9c4fa50e..d9e67d663f17 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_SEQUENCE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_SEQUENCE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-RET-SEQUENCE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_TIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_TIME.rst.txt
index 0d9428028c7c..bebc83d92edd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_TIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_TIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-RET-TIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_USE_SUBKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_USE_SUBKEY.rst.txt
index 63f6b0923606..481e75578486 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_USE_SUBKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_AUTH_CONTEXT_USE_SUBKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-AUTH-CONTEXT-USE-SUBKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRED.rst.txt
index 948520a46dcb..f4cb55e759a0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_CHECKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_CHECKSUM.rst.txt
index d6caedfc15bf..f882f79b6313 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_CHECKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_CHECKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-CHECKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_DATA.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_DATA.rst.txt
index 7adb02492baa..2dd2ea41f8e9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_DATA.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_DATA.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-DATA-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_EMPTY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_EMPTY.rst.txt
index 305153353ac7..dab70ced68c6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_EMPTY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_EMPTY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-EMPTY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_HEADER.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_HEADER.rst.txt
index 4faac433df5a..a3263c24a9b9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_HEADER.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_HEADER.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-HEADER-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_PADDING.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_PADDING.rst.txt
index 9fc17abcc9a0..44d507289cb5 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_PADDING.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_PADDING.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-PADDING-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_SIGN_ONLY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_SIGN_ONLY.rst.txt
index 52f206aa0f6b..a8b9f8a8e480 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_SIGN_ONLY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_SIGN_ONLY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-SIGN-ONLY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_STREAM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_STREAM.rst.txt
index d2fdc66f6804..e58f68255c70 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_STREAM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_STREAM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-STREAM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_TRAILER.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_TRAILER.rst.txt
index dfb858fe7654..bf78ea02d6c8 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_TRAILER.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CRYPTO_TYPE_TRAILER.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CRYPTO-TYPE-TRAILER-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_CYBERSAFE_SECUREID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_CYBERSAFE_SECUREID.rst.txt
index 312cf55a6423..0b79861b38ab 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_CYBERSAFE_SECUREID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_CYBERSAFE_SECUREID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-CYBERSAFE-SECUREID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_DOMAIN_X500_COMPRESS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_DOMAIN_X500_COMPRESS.rst.txt
index 160a4ebf683e..7bf71f8f8b8f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_DOMAIN_X500_COMPRESS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_DOMAIN_X500_COMPRESS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-DOMAIN-X500-COMPRESS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_ENCPADATA_REQ_ENC_PA_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_ENCPADATA_REQ_ENC_PA_REP.rst.txt
index 78d599628444..fe828898b3d1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_ENCPADATA_REQ_ENC_PA_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_ENCPADATA_REQ_ENC_PA_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-ENCPADATA-REQ-ENC-PA-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_ERROR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_ERROR.rst.txt
index d4fe6d3160bc..901f94520492 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_ERROR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_ERROR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-ERROR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_FAST_REQUIRED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_FAST_REQUIRED.rst.txt
index 6f5cd0935363..936423d2c5ea 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_FAST_REQUIRED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_FAST_REQUIRED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-FAST-REQUIRED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CACHED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CACHED.rst.txt
index 533a1af82833..df1e7e5f24bd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CACHED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CACHED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-CACHED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CANONICALIZE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CANONICALIZE.rst.txt
index 13aac0455469..93ea301ba393 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CANONICALIZE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CANONICALIZE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-CANONICALIZE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CONSTRAINED_DELEGATION.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CONSTRAINED_DELEGATION.rst.txt
index 6105e9003971..3a3ed03a7050 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_CONSTRAINED_DELEGATION.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_CONSTRAINED_DELEGATION.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-CONSTRAINED-DELEGATION-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_FORWARDABLE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_FORWARDABLE.rst.txt
index ebb67ef305c4..0fbe57a9f353 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_FORWARDABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_FORWARDABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-FORWARDABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_STORE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_STORE.rst.txt
index 0f3f5f7cb626..1640bc299485 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_STORE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_STORE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-NO-STORE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_TRANSIT_CHECK.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_TRANSIT_CHECK.rst.txt
index dadc90e3fcd5..da1b5cd7bb96 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_TRANSIT_CHECK.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_NO_TRANSIT_CHECK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-NO-TRANSIT-CHECK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GC_USER_USER.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GC_USER_USER.rst.txt
index 04cb962ddd5b..2fc073f8da10 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GC_USER_USER.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GC_USER_USER.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GC-USER-USER-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST.rst.txt
index 21968e27efde..d0ae5fb98478 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-ADDRESS-LIST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ANONYMOUS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ANONYMOUS.rst.txt
index f8890b061ce9..2f4281ee7f46 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ANONYMOUS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ANONYMOUS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-ANONYMOUS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CANONICALIZE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CANONICALIZE.rst.txt
index e00d52b4902e..921c873044aa 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CANONICALIZE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CANONICALIZE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-CANONICALIZE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT.rst.txt
index 8469245f4e49..5182abf85c1d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-CHG-PWD-PRMPT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST.rst.txt
index f85ce2dc8559..975417affeb1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-ETYPE-LIST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_FORWARDABLE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_FORWARDABLE.rst.txt
index c66c6f1d5a61..8946b555bc60 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_FORWARDABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_FORWARDABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-FORWARDABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST.rst.txt
index 50d4b152bcd1..023783c61926 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-PREAUTH-LIST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PROXIABLE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PROXIABLE.rst.txt
index ee787a57d27f..5cb3217f4a97 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PROXIABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PROXIABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-PROXIABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE.rst.txt
index 3d240fd7b17d..342ad6fc01f4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-RENEW-LIFE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_SALT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_SALT.rst.txt
index 00f83f63e081..f3854eb08b18 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_SALT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_SALT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-SALT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_TKT_LIFE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_TKT_LIFE.rst.txt
index a8dc2cb76885..9f719b86cfc4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_TKT_LIFE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_TKT_LIFE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-GET-INIT-CREDS-OPT-TKT-LIFE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_KDC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_KDC.rst.txt
index b6790a315255..7d2ecf0aeee0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_KDC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_KDC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INIT-CONTEXT-KDC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_SECURE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_SECURE.rst.txt
index 328f19325a84..299b48f8d426 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_SECURE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CONTEXT_SECURE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INIT-CONTEXT-SECURE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CREDS_STEP_FLAG_CONTINUE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CREDS_STEP_FLAG_CONTINUE.rst.txt
index 848ad8696c70..7981dc0fc9b8 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CREDS_STEP_FLAG_CONTINUE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INIT_CREDS_STEP_FLAG_CONTINUE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INIT-CREDS-STEP-FLAG-CONTINUE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MAX.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MAX.rst.txt
index 7530fe567539..ac18b5976572 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MAX.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MAX.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INT16-MAX-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MIN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MIN.rst.txt
index 7a3502e62a8f..1bcfaa825922 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MIN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INT16_MIN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INT16-MIN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MAX.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MAX.rst.txt
index 8f06e650e59e..a041c979567f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MAX.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MAX.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INT32-MAX-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MIN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MIN.rst.txt
index c86de496a8ec..20192101e86c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MIN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_INT32_MIN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-INT32-MIN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_ITE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_ITE.rst.txt
index 9691367c6698..efd512414fa8 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_ITE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_ITE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AD-ITE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_KDCISSUED_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_KDCISSUED_CKSUM.rst.txt
index 24a451a98e24..f2cdd0710c66 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_KDCISSUED_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_KDCISSUED_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AD-KDCISSUED-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_MTE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_MTE.rst.txt
index 2ae9c9a6902a..0cab9a2dc99a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_MTE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_MTE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AD-MTE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_SIGNEDPATH.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_SIGNEDPATH.rst.txt
index 727007f8eead..fada88e0d6b0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_SIGNEDPATH.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AD_SIGNEDPATH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AD-SIGNEDPATH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_CKSUM.rst.txt
index 7632e560d004..2f909eab6a2e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-APP-DATA-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_ENCRYPT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_ENCRYPT.rst.txt
index c85ca0351649..2b3e840b6641 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_ENCRYPT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_ENCRYPT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-APP-DATA-ENCRYPT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REP_ENCPART.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REP_ENCPART.rst.txt
index ff605d68cf08..bab584ff14fb 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REP_ENCPART.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REP_ENCPART.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AP-REP-ENCPART-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH.rst.txt
index 9e5abc0416aa..83fe216ef9b3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AP-REQ-AUTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM.rst.txt
index c7524db0d9c8..54d18a9dbd47 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AP-REQ-AUTH-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REP_ENCPART.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REP_ENCPART.rst.txt
index 9dc39de2f27a..d666d88c853b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REP_ENCPART.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REP_ENCPART.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AS-REP-ENCPART-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ.rst.txt
index 937a6564785c..0626b0ae65dd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AS-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS.rst.txt
index f13a2c719c92..6552938f4053 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-AS-REQ-PA-ENC-TS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_CAMMAC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_CAMMAC.rst.txt
index 2f04a3d68e06..0f7c7b121c64 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_CAMMAC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_CAMMAC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-CAMMAC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT.rst.txt
index 4ee4720394cb..1f27210cd366 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-ENC-CHALLENGE-CLIENT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_KDC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_KDC.rst.txt
index fdb81df795e0..ec53ab1a50ab 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_KDC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_KDC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-ENC-CHALLENGE-KDC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_ENC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_ENC.rst.txt
index a99f966ac8ea..0936f56a3752 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_ENC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_ENC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-FAST-ENC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_FINISHED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_FINISHED.rst.txt
index a407c94e6dd1..e66fd0f46285 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_FINISHED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_FINISHED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-FAST-FINISHED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REP.rst.txt
index 4f79179ac8c5..076714bc8c06 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-FAST-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REQ_CHKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REQ_CHKSUM.rst.txt
index dca0e2d39555..257d006b721f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REQ_CHKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REQ_CHKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-FAST-REQ-CHKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_MIC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_MIC.rst.txt
index 15d70a94e716..c1ae9317103d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_MIC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_MIC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-GSS-TOK-MIC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG.rst.txt
index 9ef4dd199f8f..35a1ba74997a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-GSS-TOK-WRAP-INTEG-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV.rst.txt
index 690f05059b7f..c3df9b360d62 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-GSS-TOK-WRAP-PRIV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_IAKERB_FINISHED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_IAKERB_FINISHED.rst.txt
index 66285a2bed7f..e17ba0b77454 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_IAKERB_FINISHED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_IAKERB_FINISHED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-IAKERB-FINISHED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KDC_REP_TICKET.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KDC_REP_TICKET.rst.txt
index f07479b60f10..9203b56fb52f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KDC_REP_TICKET.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KDC_REP_TICKET.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-KDC-REP-TICKET-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_CRED_ENCPART.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_CRED_ENCPART.rst.txt
index 1a4a82275b16..823c2ead1155 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_CRED_ENCPART.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_CRED_ENCPART.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-KRB-CRED-ENCPART-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_ERROR_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_ERROR_CKSUM.rst.txt
index 8d573ce1ea15..8986ac08255e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_ERROR_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_ERROR_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-KRB-ERROR-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_PRIV_ENCPART.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_PRIV_ENCPART.rst.txt
index 1270ce80d8b5..696ab74b1fc7 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_PRIV_ENCPART.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_PRIV_ENCPART.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-KRB-PRIV-ENCPART-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_SAFE_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_SAFE_CKSUM.rst.txt
index aaa1eca2420e..07493e66a885 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_SAFE_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_KRB_SAFE_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-KRB-SAFE-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_AS_FRESHNESS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_AS_FRESHNESS.rst.txt
new file mode 100644
index 000000000000..66e2962739dd
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_AS_FRESHNESS.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-KEYUSAGE-PA-AS-FRESHNESS-data:
+
+KRB5_KEYUSAGE_PA_AS_FRESHNESS
+=============================
+
+..
+.. data:: KRB5_KEYUSAGE_PA_AS_FRESHNESS
+..
+
+Used for freshness tokens.
+
+
+
+==================================== ======================
+``KRB5_KEYUSAGE_PA_AS_FRESHNESS``       ``514``
+==================================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_FX_COOKIE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_FX_COOKIE.rst.txt
index 93e4f9cef263..709c8c3942ca 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_FX_COOKIE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_FX_COOKIE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-FX-COOKIE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_OTP_REQUEST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_OTP_REQUEST.rst.txt
index 2c967c2d15b0..cfc6946db23f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_OTP_REQUEST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_OTP_REQUEST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-OTP-REQUEST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_PKINIT_KX.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_PKINIT_KX.rst.txt
index dc31f8f96d1f..a0c6192164e6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_PKINIT_KX.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_PKINIT_KX.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-PKINIT-KX-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.rst.txt
index 7debadac7b7e..0bcb60a45e58 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-S4U-X509-USER-REPLY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REQUEST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REQUEST.rst.txt
index e8db461a11d1..d85ad328ec52 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REQUEST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REQUEST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-S4U-X509-USER-REQUEST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.rst.txt
index b19f78a7122f..eff8ef82d046 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-SAM-CHALLENGE-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.rst.txt
index d4cccc09595d..ca5f67cf9484 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-SAM-CHALLENGE-TRACKID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_RESPONSE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_RESPONSE.rst.txt
index af816e875d58..96863b9206d0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_RESPONSE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_RESPONSE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-PA-SAM-RESPONSE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_SPAKE.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_SPAKE.rst.txt
new file mode 100644
index 000000000000..db6ccb67c31f
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_SPAKE.rst.txt
@@ -0,0 +1,17 @@
+.. highlight:: c
+
+.. _KRB5-KEYUSAGE-SPAKE-data:
+
+KRB5_KEYUSAGE_SPAKE
+===================
+
+..
+.. data:: KRB5_KEYUSAGE_SPAKE
+..
+
+
+
+
+========================== ======================
+``KRB5_KEYUSAGE_SPAKE``       ``65``
+========================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.rst.txt
index 17a981264e27..56151c1b0f9d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REP-ENCPART-SESSKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.rst.txt
index 43637589a78c..ee0548c4c752 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REP-ENCPART-SUBKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.rst.txt
index ed977eb2610c..dc93ba77d4c4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REQ-AD-SESSKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SUBKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SUBKEY.rst.txt
index 323ca1a855d6..c48b86431d49 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SUBKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SUBKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REQ-AD-SUBKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH.rst.txt
index 06f082b9f4c2..d50140f2b452 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REQ-AUTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM.rst.txt
index b57d4c156663..a9245b4c0ddc 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KEYUSAGE-TGS-REQ-AUTH-CKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_ACCESSDENIED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_ACCESSDENIED.rst.txt
index d6f6c57383f0..56d44af25f8d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_ACCESSDENIED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_ACCESSDENIED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-ACCESSDENIED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_AUTHERROR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_AUTHERROR.rst.txt
index 7950d0db6fc2..356208ae1531 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_AUTHERROR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_AUTHERROR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-AUTHERROR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_BAD_VERSION.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_BAD_VERSION.rst.txt
index 9d934fae510f..7c6d0908cc68 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_BAD_VERSION.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_BAD_VERSION.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-BAD-VERSION-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_HARDERROR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_HARDERROR.rst.txt
index 7b923360c4a1..dbdb777e6b57 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_HARDERROR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_HARDERROR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-HARDERROR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_INITIAL_FLAG_NEEDED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_INITIAL_FLAG_NEEDED.rst.txt
index c39cb7327e85..e4385673eccd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_INITIAL_FLAG_NEEDED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_INITIAL_FLAG_NEEDED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-INITIAL-FLAG-NEEDED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_MALFORMED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_MALFORMED.rst.txt
index c0ecafcdc5fa..8aa3a90c14d1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_MALFORMED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_MALFORMED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-MALFORMED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SOFTERROR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SOFTERROR.rst.txt
index be8885a05b36..2d1cb307c9c5 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SOFTERROR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SOFTERROR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-SOFTERROR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SUCCESS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SUCCESS.rst.txt
index 8e7022c4602c..6cad3cf7a99b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SUCCESS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_KPASSWD_SUCCESS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-KPASSWD-SUCCESS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_ACCT_EXPTIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_ACCT_EXPTIME.rst.txt
index 7c131210c04c..3f33bd03ae57 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_ACCT_EXPTIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_ACCT_EXPTIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-ACCT-EXPTIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_INITIAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_INITIAL.rst.txt
index ad376c922342..5d90c8ef6957 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_INITIAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_INITIAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-LAST-INITIAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_RENEWAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_RENEWAL.rst.txt
index 2a59db27fc2d..f785496972f2 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_RENEWAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_RENEWAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-LAST-RENEWAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_REQ.rst.txt
index bc6778730fe6..2b98c98504a2 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-LAST-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT.rst.txt
index cd583bd1bc5c..4a7b5b1e5286 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-LAST-TGT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT_ISSUED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT_ISSUED.rst.txt
index 477ef5beca69..646b61a36078 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT_ISSUED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT_ISSUED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-LAST-TGT-ISSUED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_PW_EXPTIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_PW_EXPTIME.rst.txt
index 2d2e5edca851..f88a1c7891c1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_PW_EXPTIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ALL_PW_EXPTIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ALL-PW-EXPTIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_NONE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_NONE.rst.txt
index 82a38fe6dc52..1a816fed0c8f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_NONE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_NONE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-NONE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_ACCT_EXPTIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_ACCT_EXPTIME.rst.txt
index 54c45773378e..842f1d786ecf 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_ACCT_EXPTIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_ACCT_EXPTIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-ACCT-EXPTIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_INITIAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_INITIAL.rst.txt
index 30e6c5eec7ee..c79efccad51d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_INITIAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_INITIAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-LAST-INITIAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_RENEWAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_RENEWAL.rst.txt
index 2561dcafc4c7..dd9f70ece6c4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_RENEWAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_RENEWAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-LAST-RENEWAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_REQ.rst.txt
index 2e0261dfe901..da5023383ab9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-LAST-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT.rst.txt
index a977cd352a10..f57c54738e23 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-LAST-TGT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT_ISSUED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT_ISSUED.rst.txt
index 82e67afbb16a..44702a413659 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT_ISSUED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT_ISSUED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-LAST-TGT-ISSUED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_PW_EXPTIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_PW_EXPTIME.rst.txt
index 401735768248..4710a605d32a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_PW_EXPTIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_LRQ_ONE_PW_EXPTIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-LRQ-ONE-PW-EXPTIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENTERPRISE_PRINCIPAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENTERPRISE_PRINCIPAL.rst.txt
index c6f5197cff36..3511088c3eb7 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENTERPRISE_PRINCIPAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENTERPRISE_PRINCIPAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-ENTERPRISE-PRINCIPAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENT_PRINCIPAL_AND_ID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENT_PRINCIPAL_AND_ID.rst.txt
index 561bd0f27d6e..28f7eb390885 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENT_PRINCIPAL_AND_ID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_ENT_PRINCIPAL_AND_ID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-ENT-PRINCIPAL-AND-ID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL.rst.txt
index 431dbfb4aa47..80801f6dc097 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-MS-PRINCIPAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL_AND_ID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL_AND_ID.rst.txt
index 0f795450ab86..7388c64a4ab5 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL_AND_ID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL_AND_ID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-MS-PRINCIPAL-AND-ID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_PRINCIPAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_PRINCIPAL.rst.txt
index cc4a6d24c655..49309a520b2d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_PRINCIPAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_PRINCIPAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-PRINCIPAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SMTP_NAME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SMTP_NAME.rst.txt
index 000c7d0c209f..1d4113358bce 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SMTP_NAME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SMTP_NAME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-SMTP-NAME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_HST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_HST.rst.txt
index 2304b24f6c27..7a96e40022f0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_HST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_HST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-SRV-HST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_INST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_INST.rst.txt
index 24fafca707bf..8beee8177962 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_INST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_INST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-SRV-INST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_XHST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_XHST.rst.txt
index 2a1a7486352e..03e0f0d7ce29 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_XHST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_SRV_XHST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-SRV-XHST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_UID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_UID.rst.txt
index b7b0b3681107..76f278c56841 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_UID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_UID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-UID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_UNKNOWN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_UNKNOWN.rst.txt
index 8c1ed2c8e12b..04636d46406b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_UNKNOWN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_UNKNOWN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-UNKNOWN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_WELLKNOWN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_WELLKNOWN.rst.txt
index 785327882673..2d7c1b9b91be 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_WELLKNOWN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_WELLKNOWN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-WELLKNOWN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_NT_X500_PRINCIPAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_NT_X500_PRINCIPAL.rst.txt
index 81ac0ea7558e..fdd994c6e2a7 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_NT_X500_PRINCIPAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_NT_X500_PRINCIPAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-NT-X500-PRINCIPAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_ATTRIBUTES_INFO.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_ATTRIBUTES_INFO.rst.txt
new file mode 100644
index 000000000000..da248a8d2f9e
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_ATTRIBUTES_INFO.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-ATTRIBUTES-INFO-data:
+
+KRB5_PAC_ATTRIBUTES_INFO
+========================
+
+..
+.. data:: KRB5_PAC_ATTRIBUTES_INFO
+..
+
+PAC attributes.
+
+
+
+=============================== ======================
+``KRB5_PAC_ATTRIBUTES_INFO``       ``17``
+=============================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_CLAIMS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_CLAIMS.rst.txt
new file mode 100644
index 000000000000..4e94048646f7
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_CLAIMS.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-CLIENT-CLAIMS-data:
+
+KRB5_PAC_CLIENT_CLAIMS
+======================
+
+..
+.. data:: KRB5_PAC_CLIENT_CLAIMS
+..
+
+Client claims information.
+
+
+
+============================= ======================
+``KRB5_PAC_CLIENT_CLAIMS``       ``13``
+============================= ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_INFO.rst.txt
index 14dea5bdc6c4..846e21d023d3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CLIENT_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-CLIENT-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CREDENTIALS_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CREDENTIALS_INFO.rst.txt
index 82435826e369..ae454f0ef163 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CREDENTIALS_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_CREDENTIALS_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-CREDENTIALS-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DELEGATION_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DELEGATION_INFO.rst.txt
index 03f5eb082d75..6c93933bd756 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DELEGATION_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DELEGATION_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-DELEGATION-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_CLAIMS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_CLAIMS.rst.txt
new file mode 100644
index 000000000000..36659dee703d
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_CLAIMS.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-DEVICE-CLAIMS-data:
+
+KRB5_PAC_DEVICE_CLAIMS
+======================
+
+..
+.. data:: KRB5_PAC_DEVICE_CLAIMS
+..
+
+Device claims information.
+
+
+
+============================= ======================
+``KRB5_PAC_DEVICE_CLAIMS``       ``15``
+============================= ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_INFO.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_INFO.rst.txt
new file mode 100644
index 000000000000..d7e8812731a2
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_DEVICE_INFO.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-DEVICE-INFO-data:
+
+KRB5_PAC_DEVICE_INFO
+====================
+
+..
+.. data:: KRB5_PAC_DEVICE_INFO
+..
+
+Device information.
+
+
+
+=========================== ======================
+``KRB5_PAC_DEVICE_INFO``       ``14``
+=========================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_FULL_CHECKSUM.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_FULL_CHECKSUM.rst.txt
new file mode 100644
index 000000000000..c9512888ac89
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_FULL_CHECKSUM.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-FULL-CHECKSUM-data:
+
+KRB5_PAC_FULL_CHECKSUM
+======================
+
+..
+.. data:: KRB5_PAC_FULL_CHECKSUM
+..
+
+KDC full checksum.
+
+
+
+============================= ======================
+``KRB5_PAC_FULL_CHECKSUM``       ``19``
+============================= ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_LOGON_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_LOGON_INFO.rst.txt
index fda4381ebf33..83424eb45dac 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_LOGON_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_LOGON_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-LOGON-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_PRIVSVR_CHECKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_PRIVSVR_CHECKSUM.rst.txt
index 6113176fc359..75e1e667271a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_PRIVSVR_CHECKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_PRIVSVR_CHECKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-PRIVSVR-CHECKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_REQUESTOR.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_REQUESTOR.rst.txt
new file mode 100644
index 000000000000..4bffb7f0bc1a
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_REQUESTOR.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-REQUESTOR-data:
+
+KRB5_PAC_REQUESTOR
+==================
+
+..
+.. data:: KRB5_PAC_REQUESTOR
+..
+
+PAC requestor SID.
+
+
+
+========================= ======================
+``KRB5_PAC_REQUESTOR``       ``18``
+========================= ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_SERVER_CHECKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_SERVER_CHECKSUM.rst.txt
index 610d63fe7dee..1f094041a11f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_SERVER_CHECKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_SERVER_CHECKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-SERVER-CHECKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_TICKET_CHECKSUM.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_TICKET_CHECKSUM.rst.txt
new file mode 100644
index 000000000000..9ab24b14d5b3
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_TICKET_CHECKSUM.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PAC-TICKET-CHECKSUM-data:
+
+KRB5_PAC_TICKET_CHECKSUM
+========================
+
+..
+.. data:: KRB5_PAC_TICKET_CHECKSUM
+..
+
+Ticket checksum.
+
+
+
+=============================== ======================
+``KRB5_PAC_TICKET_CHECKSUM``       ``16``
+=============================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_UPN_DNS_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_UPN_DNS_INFO.rst.txt
index 4f160ed284fb..08a5cbd1cbd2 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PAC_UPN_DNS_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PAC_UPN_DNS_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PAC-UPN-DNS-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AFS3_SALT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AFS3_SALT.rst.txt
index 63c6056fbdbb..f2609c6838f3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AFS3_SALT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AFS3_SALT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-AFS3-SALT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AP_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AP_REQ.rst.txt
index f3546c57da51..32b4d2ffa7bb 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AP_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AP_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-AP-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_CHECKSUM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_CHECKSUM.rst.txt
index d36ef365304a..d0487a01b80e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_CHECKSUM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_CHECKSUM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-AS-CHECKSUM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_FRESHNESS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_FRESHNESS.rst.txt
new file mode 100644
index 000000000000..084b39dbf16c
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_AS_FRESHNESS.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PADATA-AS-FRESHNESS-data:
+
+KRB5_PADATA_AS_FRESHNESS
+========================
+
+..
+.. data:: KRB5_PADATA_AS_FRESHNESS
+..
+
+RFC 8070.
+
+
+
+=============================== ======================
+``KRB5_PADATA_AS_FRESHNESS``       ``150``
+=============================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENCRYPTED_CHALLENGE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENCRYPTED_CHALLENGE.rst.txt
index 1d74dcfdf972..f0efc2e5847e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENCRYPTED_CHALLENGE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENCRYPTED_CHALLENGE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ENCRYPTED-CHALLENGE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_SANDIA_SECURID.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_SANDIA_SECURID.rst.txt
index 30602bb0720b..9aaec10e3972 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_SANDIA_SECURID.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_SANDIA_SECURID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ENC-SANDIA-SECURID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_TIMESTAMP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_TIMESTAMP.rst.txt
index 495695d72af6..d40145f12d57 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_TIMESTAMP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_TIMESTAMP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ENC-TIMESTAMP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_UNIX_TIME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_UNIX_TIME.rst.txt
index d7ae89386d69..755a84e9f247 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_UNIX_TIME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ENC_UNIX_TIME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ENC-UNIX-TIME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO.rst.txt
index 09591ad598ec..4341a5265e00 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ETYPE-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO2.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO2.rst.txt
index 533bb627aa19..3335112a97ef 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO2.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO2.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-ETYPE-INFO2-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FOR_USER.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FOR_USER.rst.txt
index cf65890b1e7c..cb914247746c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FOR_USER.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FOR_USER.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-FOR-USER-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_COOKIE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_COOKIE.rst.txt
index bf0c14b42d2c..f83907418848 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_COOKIE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_COOKIE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-FX-COOKIE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_ERROR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_ERROR.rst.txt
index e68b7eb4a727..93cf047a89cc 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_ERROR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_ERROR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-FX-ERROR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_FAST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_FAST.rst.txt
index c60d2eb34e48..67ce1d8d3ab3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_FAST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_FX_FAST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-FX-FAST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_GET_FROM_TYPED_DATA.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_GET_FROM_TYPED_DATA.rst.txt
index ac2effe74c22..75e7a8662227 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_GET_FROM_TYPED_DATA.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_GET_FROM_TYPED_DATA.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-GET-FROM-TYPED-DATA-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_NONE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_NONE.rst.txt
index c3b5842e47ea..f1c0d44e9287 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_NONE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_NONE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-NONE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OSF_DCE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OSF_DCE.rst.txt
index 79c8362b546e..2f83465c8eb0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OSF_DCE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OSF_DCE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-OSF-DCE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_CHALLENGE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_CHALLENGE.rst.txt
index 480ec9b030f1..cfff48c67114 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_CHALLENGE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_CHALLENGE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-OTP-CHALLENGE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_PIN_CHANGE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_PIN_CHANGE.rst.txt
index 677be0348211..35a4b16397a6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_PIN_CHANGE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_PIN_CHANGE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-OTP-PIN-CHANGE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_REQUEST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_REQUEST.rst.txt
index 498606ee7859..90ba56e1d02c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_REQUEST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_OTP_REQUEST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-OTP-REQUEST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_OPTIONS.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_OPTIONS.rst.txt
new file mode 100644
index 000000000000..46722ce69c9f
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_OPTIONS.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PADATA-PAC-OPTIONS-data:
+
+KRB5_PADATA_PAC_OPTIONS
+=======================
+
+..
+.. data:: KRB5_PADATA_PAC_OPTIONS
+..
+
+MS-KILE and MS-SFU.
+
+
+
+============================== ======================
+``KRB5_PADATA_PAC_OPTIONS``       ``167``
+============================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_REQUEST.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_REQUEST.rst.txt
index d8b737fcbc42..5147ce986be3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_REQUEST.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PAC_REQUEST.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PAC-REQUEST-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PKINIT_KX.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PKINIT_KX.rst.txt
index 29e6724dc0e5..719307459dd4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PKINIT_KX.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PKINIT_KX.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PKINIT-KX-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP.rst.txt
index aff8309fd874..5d7be82477b0 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PK-AS-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP_OLD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP_OLD.rst.txt
index 6ca18425b19d..1f782d2d003b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP_OLD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REP_OLD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PK-AS-REP-OLD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ.rst.txt
index 805bc50eeec9..a291aa362453 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PK-AS-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ_OLD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ_OLD.rst.txt
index 30e144d879f3..b3454c5f5217 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ_OLD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ_OLD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PK-AS-REQ-OLD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PW_SALT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PW_SALT.rst.txt
index 2548753e4ecc..9a006da75b38 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PW_SALT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_PW_SALT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-PW-SALT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_IDP_OAUTH2.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_IDP_OAUTH2.rst.txt
new file mode 100644
index 000000000000..b88f79163afd
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_IDP_OAUTH2.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PADATA-REDHAT-IDP-OAUTH2-data:
+
+KRB5_PADATA_REDHAT_IDP_OAUTH2
+=============================
+
+..
+.. data:: KRB5_PADATA_REDHAT_IDP_OAUTH2
+..
+
+Red Hat IdP mechanism.
+
+
+
+==================================== ======================
+``KRB5_PADATA_REDHAT_IDP_OAUTH2``       ``152``
+==================================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_PASSKEY.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_PASSKEY.rst.txt
new file mode 100644
index 000000000000..76cb77b8875b
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REDHAT_PASSKEY.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PADATA-REDHAT-PASSKEY-data:
+
+KRB5_PADATA_REDHAT_PASSKEY
+==========================
+
+..
+.. data:: KRB5_PADATA_REDHAT_PASSKEY
+..
+
+Red Hat Passkey mechanism.
+
+
+
+================================= ======================
+``KRB5_PADATA_REDHAT_PASSKEY``       ``153``
+================================= ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REFERRAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REFERRAL.rst.txt
index 28c3a539095a..eb2c571e11a9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REFERRAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_REFERRAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-REFERRAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_S4U_X509_USER.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_S4U_X509_USER.rst.txt
index e06330de1faf..566ed4dcd222 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_S4U_X509_USER.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_S4U_X509_USER.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-S4U-X509-USER-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE.rst.txt
index 016d36b3dafa..fd1dc607eba4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SAM-CHALLENGE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE_2.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE_2.rst.txt
index 533ea06cd6ad..9d77eb76809d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE_2.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE_2.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SAM-CHALLENGE-2-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_REDIRECT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_REDIRECT.rst.txt
index e69387d18de8..93fbeac2997b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_REDIRECT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_REDIRECT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SAM-REDIRECT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE.rst.txt
index e94d0479b24b..14a18d481a2c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SAM-RESPONSE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE_2.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE_2.rst.txt
index 6621613b2fbe..265c60b1a705 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE_2.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE_2.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SAM-RESPONSE-2-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SESAME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SESAME.rst.txt
index 63019eee673b..f653d8ea6866 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SESAME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SESAME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SESAME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SPAKE.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SPAKE.rst.txt
new file mode 100644
index 000000000000..16887a6c5501
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SPAKE.rst.txt
@@ -0,0 +1,17 @@
+.. highlight:: c
+
+.. _KRB5-PADATA-SPAKE-data:
+
+KRB5_PADATA_SPAKE
+=================
+
+..
+.. data:: KRB5_PADATA_SPAKE
+..
+
+
+
+
+======================== ======================
+``KRB5_PADATA_SPAKE``       ``151``
+======================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SVR_REFERRAL_INFO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SVR_REFERRAL_INFO.rst.txt
index e58a172e9aac..c3897c3db34d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SVR_REFERRAL_INFO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_SVR_REFERRAL_INFO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-SVR-REFERRAL-INFO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_TGS_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_TGS_REQ.rst.txt
index e888f5babc5b..75f5a26e49d2 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_TGS_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_TGS_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-TGS-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_USE_SPECIFIED_KVNO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_USE_SPECIFIED_KVNO.rst.txt
index 5ee21d234c38..159c30267480 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_USE_SPECIFIED_KVNO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PADATA_USE_SPECIFIED_KVNO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PADATA-USE-SPECIFIED-KVNO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_CASEFOLD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_CASEFOLD.rst.txt
index bd42eeb9404f..63c43ba74a38 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_CASEFOLD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_CASEFOLD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-COMPARE-CASEFOLD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_ENTERPRISE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_ENTERPRISE.rst.txt
index 3341d4303f38..121f82640863 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_ENTERPRISE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_ENTERPRISE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-COMPARE-ENTERPRISE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_IGNORE_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_IGNORE_REALM.rst.txt
index 39b443ffa7ed..fdbe0dd91478 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_IGNORE_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_IGNORE_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-COMPARE-IGNORE-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_UTF8.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_UTF8.rst.txt
index 78bc4b09541c..9e0f76bc3a63 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_UTF8.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_UTF8.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-COMPARE-UTF8-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_ENTERPRISE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_ENTERPRISE.rst.txt
index df6de6c5482e..5b5df427b942 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_ENTERPRISE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_ENTERPRISE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-PARSE-ENTERPRISE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_IGNORE_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_IGNORE_REALM.rst.txt
index d6a3995646cf..786cfce6f2d3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_IGNORE_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_IGNORE_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-PARSE-IGNORE-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_DEF_REALM.rst.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_DEF_REALM.rst.txt
new file mode 100644
index 000000000000..c07956ce9d9a
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_DEF_REALM.rst.txt
@@ -0,0 +1,18 @@
+.. highlight:: c
+
+.. _KRB5-PRINCIPAL-PARSE-NO-DEF-REALM-data:
+
+KRB5_PRINCIPAL_PARSE_NO_DEF_REALM
+=================================
+
+..
+.. data:: KRB5_PRINCIPAL_PARSE_NO_DEF_REALM
+..
+
+Don't add default realm.
+
+
+
+======================================== ======================
+``KRB5_PRINCIPAL_PARSE_NO_DEF_REALM``       ``0x10``
+======================================== ======================
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_REALM.rst.txt
index ecd822628fbb..6d241738fae8 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-PARSE-NO-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.rst.txt
index 022e16114dd9..ec3c424809e9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-PARSE-REQUIRE-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_DISPLAY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_DISPLAY.rst.txt
index d15af8bf0744..2a648a23829c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_DISPLAY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_DISPLAY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-UNPARSE-DISPLAY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_NO_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_NO_REALM.rst.txt
index 1f8bb517df19..277b53effe2d 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_NO_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_NO_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-UNPARSE-NO-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_SHORT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_SHORT.rst.txt
index c6404018e273..08aeb625f7d9 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_SHORT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_SHORT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRINCIPAL-UNPARSE-SHORT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PRIV.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PRIV.rst.txt
index aaa2dbc97b8e..a55392c08cc2 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PRIV.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PRIV.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PRIV-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD.rst.txt
index 115bae171dad..6af358ff41de 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PROMPT-TYPE-NEW-PASSWORD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN.rst.txt
index 170fa58e864e..bd9e9233f19f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PROMPT-TYPE-NEW-PASSWORD-AGAIN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PASSWORD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PASSWORD.rst.txt
index 37e3243855e2..135a56526f30 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PASSWORD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PASSWORD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PROMPT-TYPE-PASSWORD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PREAUTH.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PREAUTH.rst.txt
index 5d577cc1e5fe..11b64feb6502 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PREAUTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PROMPT_TYPE_PREAUTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PROMPT-TYPE-PREAUTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_PVNO.txt b/doc/html/_sources/appdev/refs/macros/KRB5_PVNO.rst.txt
index fe2f903f648f..7bdda5d9f157 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_PVNO.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_PVNO.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-PVNO-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_REALM_BRANCH_CHAR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_REALM_BRANCH_CHAR.rst.txt
index 15478f05c477..96c3e58fe478 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_REALM_BRANCH_CHAR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_REALM_BRANCH_CHAR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-REALM-BRANCH-CHAR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_BADAUTHVERS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_BADAUTHVERS.rst.txt
index c3c2dfa1c7f4..c76664411eb6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_BADAUTHVERS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_BADAUTHVERS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RECVAUTH-BADAUTHVERS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_SKIP_VERSION.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_SKIP_VERSION.rst.txt
index e833faa96861..63fd124dea40 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_SKIP_VERSION.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RECVAUTH_SKIP_VERSION.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RECVAUTH-SKIP-VERSION-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_REFERRAL_REALM.txt b/doc/html/_sources/appdev/refs/macros/KRB5_REFERRAL_REALM.rst.txt
index f8620181475e..f5a65b1e6e47 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_REFERRAL_REALM.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_REFERRAL_REALM.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-REFERRAL-REALM-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_PIN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_PIN.rst.txt
index b9dc93702425..413b6349d345 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_PIN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_PIN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FLAGS-COLLECT-PIN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_TOKEN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_TOKEN.rst.txt
index ced944330ae6..1a78999fed31 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_TOKEN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_TOKEN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FLAGS-COLLECT-TOKEN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_NEXTOTP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_NEXTOTP.rst.txt
index b3e9204dbad5..26e230a09861 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_NEXTOTP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_NEXTOTP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FLAGS-NEXTOTP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_SEPARATE_PIN.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_SEPARATE_PIN.rst.txt
index f43d49d290f4..ddd3d488f5a4 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_SEPARATE_PIN.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_SEPARATE_PIN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FLAGS-SEPARATE-PIN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC.rst.txt
index 58a97cf928e4..96beff5f01cb 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FORMAT-ALPHANUMERIC-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_DECIMAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_DECIMAL.rst.txt
index bfafd2f41136..115445581c44 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_DECIMAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_DECIMAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FORMAT-DECIMAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL.rst.txt
index eaf925b73f5e..77ecfb119e56 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-OTP-FORMAT-HEXADECIMAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_COUNT_LOW.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_COUNT_LOW.rst.txt
index a034d3c4f0e0..99aa5478e8b1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_COUNT_LOW.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_COUNT_LOW.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-PKINIT-FLAGS-TOKEN-USER-PIN-COUNT-LOW-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_FINAL_TRY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_FINAL_TRY.rst.txt
index 59d01bda7289..ecf2ca0d7528 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_FINAL_TRY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_FINAL_TRY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-PKINIT-FLAGS-TOKEN-USER-PIN-FINAL-TRY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_LOCKED.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_LOCKED.rst.txt
index 00e31260ee10..3974c52f89ae 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_LOCKED.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_LOCKED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-PKINIT-FLAGS-TOKEN-USER-PIN-LOCKED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_OTP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_OTP.rst.txt
index cb63b5e1fe87..367dd3219cdf 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_OTP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_OTP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-QUESTION-OTP-data:
 
@@ -12,48 +12,34 @@ KRB5_RESPONDER_QUESTION_OTP
 OTP responder question.
 
 The OTP responder question is asked when the KDC indicates that an OTP value is required in order to complete the authentication. The JSON format of the challenge is:
+::
+
+    {
+      "service": <string (optional)>,
+      "tokenInfo": [
+        {
+          "flags":     <number>,
+          "vendor":    <string (optional)>,
+          "challenge": <string (optional)>,
+          "length":    <number (optional)>,
+          "format":    <number (optional)>,
+          "tokenID":   <string (optional)>,
+          "algID":     <string (optional)>,
+        },
+        ...
+      ]
+    }
 
-*{*
- 
-*"service": <string (optional)>,*
- 
-*"tokenInfo": [*
- 
-*{*
- 
-*"flags": <number>,*
- 
-*"vendor": <string (optional)>,*
- 
-*"challenge": <string (optional)>,*
- 
-*"length": <number (optional)>,*
- 
-*"format": <number (optional)>,*
- 
-*"tokenID": <string (optional)>,*
- 
-*"algID": <string (optional)>,*
- 
-*},*
- 
-*...*
- 
-*]*
- 
-*}*
 
 The answer to the question MUST be JSON formatted:
+::
+
+    {
+      "tokeninfo": <number>,
+      "value":     <string (optional)>,
+      "pin":       <string (optional)>,
+    }
 
-*{*
- 
-*"tokeninfo": <number>,*
- 
-*"value": <string (optional)>,*
- 
-*"pin": <string (optional)>,*
- 
-*}*
 
 For more detail, please see RFC 6560.
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PASSWORD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PASSWORD.rst.txt
index 8606604ee683..342e459100c3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PASSWORD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PASSWORD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-QUESTION-PASSWORD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PKINIT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PKINIT.rst.txt
index 1602eb789f3e..b8b5b9ddda07 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PKINIT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PKINIT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-RESPONDER-QUESTION-PKINIT-data:
 
@@ -12,24 +12,22 @@ KRB5_RESPONDER_QUESTION_PKINIT
 PKINIT responder question.
 
 The PKINIT responder question is asked when the client needs a password that's being used to protect key information, and is formatted as a JSON object. A specific identity's flags value, if not zero, is the bitwise-OR of one or more of the KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_* flags defined below, and possibly other flags to be added later. Any resemblance to similarly-named CKF_* values in the PKCS#11 API should not be depended on.
+::
+
+    {
+        identity <string> : flags <number>,
+        ...
+    }
 
-*{*
- 
-*identity <string> : flags <number>,*
- 
-*...*
- 
-*}*
 
 The answer to the question MUST be JSON formatted:
+::
+
+    {
+        identity <string> : password <string>,
+        ...
+    }
 
-*{*
- 
-*identity <string> : password <string>,*
- 
-*...*
- 
-*}*
 
 
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_SAFE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_SAFE.rst.txt
index 519fd4a1bf9a..4210e4f474b6 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_SAFE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_SAFE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-SAFE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_MUST_PK_ENCRYPT_SAD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_MUST_PK_ENCRYPT_SAD.rst.txt
index a8b453c0ee98..e8c8c57007da 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_MUST_PK_ENCRYPT_SAD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_MUST_PK_ENCRYPT_SAD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-SAM-MUST-PK-ENCRYPT-SAD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_SEND_ENCRYPTED_SAD.txt b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_SEND_ENCRYPTED_SAD.rst.txt
index 64d43a4585ec..fcd56beaa3a1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_SEND_ENCRYPTED_SAD.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_SEND_ENCRYPTED_SAD.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-SAM-SEND-ENCRYPTED-SAD-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_USE_SAD_AS_KEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_USE_SAD_AS_KEY.rst.txt
index 21ac0666ebd3..beae65cde474 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_SAM_USE_SAD_AS_KEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_SAM_USE_SAD_AS_KEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-SAM-USE-SAD-AS-KEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_2ND_TKT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_2ND_TKT.rst.txt
index eae8cf46bbea..fb5e39b978e8 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_2ND_TKT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_2ND_TKT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-2ND-TKT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_AUTHDATA.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_AUTHDATA.rst.txt
index 2229332b4575..d78b84875d94 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_AUTHDATA.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_AUTHDATA.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-AUTHDATA-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS.rst.txt
index ec95c5fcb193..0fac98fc4ecc 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-FLAGS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS_EXACT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS_EXACT.rst.txt
index 8cef13ed6189..9e3480abe801 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS_EXACT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_FLAGS_EXACT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-FLAGS-EXACT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_IS_SKEY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_IS_SKEY.rst.txt
index 668500239a8b..98799934b1a3 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_IS_SKEY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_IS_SKEY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-IS-SKEY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_KTYPE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_KTYPE.rst.txt
index 31325a89b23e..e5bf18c4d59c 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_KTYPE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_KTYPE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-KTYPE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_SRV_NAMEONLY.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_SRV_NAMEONLY.rst.txt
index 4c7695fa7ef1..ca79db323e7e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_SRV_NAMEONLY.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_SRV_NAMEONLY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-SRV-NAMEONLY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES.rst.txt
index 7a16524429a3..628ee32e952e 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-TIMES-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES_EXACT.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES_EXACT.rst.txt
index 2453f93ddd35..9d0ffce62d6b 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES_EXACT.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_MATCH_TIMES_EXACT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-MATCH-TIMES-EXACT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_NOTICKET.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_NOTICKET.rst.txt
index a9008cf80ec7..76e9a01f428f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_NOTICKET.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_NOTICKET.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-NOTICKET-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_OPENCLOSE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_OPENCLOSE.rst.txt
index a7fb94327993..83d94560123f 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_OPENCLOSE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_OPENCLOSE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-OPENCLOSE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TC_SUPPORTED_KTYPES.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TC_SUPPORTED_KTYPES.rst.txt
index e1edae92416b..ecd203816bfd 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TC_SUPPORTED_KTYPES.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TC_SUPPORTED_KTYPES.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TC-SUPPORTED-KTYPES-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME.rst.txt
index 602b5c344c78..32b22b00fb32 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TGS-NAME-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME_SIZE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME_SIZE.rst.txt
index 931ebdbbfbf4..71adc91dae79 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME_SIZE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_NAME_SIZE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TGS-NAME-SIZE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REP.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REP.rst.txt
index 18cadb3e963d..f3dbfe87bc44 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TGS-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REQ.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REQ.rst.txt
index 132d9f5aab2a..1b5742275553 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REQ.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TGS_REQ.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TGS-REQ-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_TKT_CREDS_STEP_FLAG_CONTINUE.txt b/doc/html/_sources/appdev/refs/macros/KRB5_TKT_CREDS_STEP_FLAG_CONTINUE.rst.txt
index 28d376faa120..fa01e45ce771 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_TKT_CREDS_STEP_FLAG_CONTINUE.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_TKT_CREDS_STEP_FLAG_CONTINUE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-TKT-CREDS-STEP-FLAG-CONTINUE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL.txt b/doc/html/_sources/appdev/refs/macros/KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL.rst.txt
index a6a60c976ce8..1925137fe3d1 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-VERIFY-INIT-CREDS-OPT-AP-REQ-NOFAIL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/KRB5_WELLKNOWN_NAMESTR.txt b/doc/html/_sources/appdev/refs/macros/KRB5_WELLKNOWN_NAMESTR.rst.txt
index 430a3f09d782..6c24427e087a 100644
--- a/doc/html/_sources/appdev/refs/macros/KRB5_WELLKNOWN_NAMESTR.txt
+++ b/doc/html/_sources/appdev/refs/macros/KRB5_WELLKNOWN_NAMESTR.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _KRB5-WELLKNOWN-NAMESTR-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/LR_TYPE_INTERPRETATION_MASK.txt b/doc/html/_sources/appdev/refs/macros/LR_TYPE_INTERPRETATION_MASK.rst.txt
index c44baf694f11..47513d5639ff 100644
--- a/doc/html/_sources/appdev/refs/macros/LR_TYPE_INTERPRETATION_MASK.txt
+++ b/doc/html/_sources/appdev/refs/macros/LR_TYPE_INTERPRETATION_MASK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _LR-TYPE-INTERPRETATION-MASK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/LR_TYPE_THIS_SERVER_ONLY.txt b/doc/html/_sources/appdev/refs/macros/LR_TYPE_THIS_SERVER_ONLY.rst.txt
index 15e6dbf5bafb..4db68f9a5408 100644
--- a/doc/html/_sources/appdev/refs/macros/LR_TYPE_THIS_SERVER_ONLY.txt
+++ b/doc/html/_sources/appdev/refs/macros/LR_TYPE_THIS_SERVER_ONLY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _LR-TYPE-THIS-SERVER-ONLY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/MAX_KEYTAB_NAME_LEN.txt b/doc/html/_sources/appdev/refs/macros/MAX_KEYTAB_NAME_LEN.rst.txt
index 94bde20d14ec..ae0e1e2abc90 100644
--- a/doc/html/_sources/appdev/refs/macros/MAX_KEYTAB_NAME_LEN.txt
+++ b/doc/html/_sources/appdev/refs/macros/MAX_KEYTAB_NAME_LEN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _MAX-KEYTAB-NAME-LEN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/MSEC_DIRBIT.txt b/doc/html/_sources/appdev/refs/macros/MSEC_DIRBIT.rst.txt
index 9a4b07e6219a..e2686b0a93d8 100644
--- a/doc/html/_sources/appdev/refs/macros/MSEC_DIRBIT.txt
+++ b/doc/html/_sources/appdev/refs/macros/MSEC_DIRBIT.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _MSEC-DIRBIT-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/MSEC_VAL_MASK.txt b/doc/html/_sources/appdev/refs/macros/MSEC_VAL_MASK.rst.txt
index 7d60035f0457..23905a4e0a2e 100644
--- a/doc/html/_sources/appdev/refs/macros/MSEC_VAL_MASK.txt
+++ b/doc/html/_sources/appdev/refs/macros/MSEC_VAL_MASK.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _MSEC-VAL-MASK-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/SALT_TYPE_AFS_LENGTH.txt b/doc/html/_sources/appdev/refs/macros/SALT_TYPE_AFS_LENGTH.rst.txt
index c9db0acaf206..235b81f216c4 100644
--- a/doc/html/_sources/appdev/refs/macros/SALT_TYPE_AFS_LENGTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/SALT_TYPE_AFS_LENGTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _SALT-TYPE-AFS-LENGTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/SALT_TYPE_NO_LENGTH.txt b/doc/html/_sources/appdev/refs/macros/SALT_TYPE_NO_LENGTH.rst.txt
index 40252699b365..7cf62df50681 100644
--- a/doc/html/_sources/appdev/refs/macros/SALT_TYPE_NO_LENGTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/SALT_TYPE_NO_LENGTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _SALT-TYPE-NO-LENGTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/THREEPARAMOPEN.txt b/doc/html/_sources/appdev/refs/macros/THREEPARAMOPEN.rst.txt
index 284055232908..e61eb0ad6307 100644
--- a/doc/html/_sources/appdev/refs/macros/THREEPARAMOPEN.txt
+++ b/doc/html/_sources/appdev/refs/macros/THREEPARAMOPEN.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _THREEPARAMOPEN-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_ANONYMOUS.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_ANONYMOUS.rst.txt
index 0bc451737eca..696ca8093b70 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_ANONYMOUS.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_ANONYMOUS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-ANONYMOUS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_ENC_PA_REP.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_ENC_PA_REP.rst.txt
index 0acc6054a53e..b575553e913e 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_ENC_PA_REP.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_ENC_PA_REP.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-ENC-PA-REP-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDABLE.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDABLE.rst.txt
index 1566a8a96259..ede984cb68b8 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-FORWARDABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDED.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDED.rst.txt
index 35d6aa0839d0..0f3d490d6cdb 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDED.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_FORWARDED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-FORWARDED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_HW_AUTH.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_HW_AUTH.rst.txt
index ed238e235c7a..30baa34e5120 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_HW_AUTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_HW_AUTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-HW-AUTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_INITIAL.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_INITIAL.rst.txt
index b0041767bae2..6e3d8c318079 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_INITIAL.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_INITIAL.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-INITIAL-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_INVALID.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_INVALID.rst.txt
index efb9d5ac899f..8d4465bb2f09 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_INVALID.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_INVALID.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-INVALID-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_MAY_POSTDATE.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_MAY_POSTDATE.rst.txt
index bff936dfe4e5..935d05e77218 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_MAY_POSTDATE.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_MAY_POSTDATE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-MAY-POSTDATE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_OK_AS_DELEGATE.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_OK_AS_DELEGATE.rst.txt
index 690f55a59f66..bee1deb21e0a 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_OK_AS_DELEGATE.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_OK_AS_DELEGATE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-OK-AS-DELEGATE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_POSTDATED.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_POSTDATED.rst.txt
index 8c4635bb11e6..46a5cf674d3f 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_POSTDATED.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_POSTDATED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-POSTDATED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PRE_AUTH.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PRE_AUTH.rst.txt
index c64288a32784..69735bd1e1ad 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PRE_AUTH.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PRE_AUTH.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-PRE-AUTH-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXIABLE.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXIABLE.rst.txt
index 4df206b91d7e..c73a62d64560 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXIABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXIABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-PROXIABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXY.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXY.rst.txt
index fb75dd9bb76d..b749830ebf1a 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXY.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_PROXY.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-PROXY-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_RENEWABLE.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_RENEWABLE.rst.txt
index 8a1ad04b0bf7..5d87dc970913 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_RENEWABLE.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_RENEWABLE.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-RENEWABLE-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/TKT_FLG_TRANSIT_POLICY_CHECKED.txt b/doc/html/_sources/appdev/refs/macros/TKT_FLG_TRANSIT_POLICY_CHECKED.rst.txt
index 093975d82275..082a1f0996e1 100644
--- a/doc/html/_sources/appdev/refs/macros/TKT_FLG_TRANSIT_POLICY_CHECKED.txt
+++ b/doc/html/_sources/appdev/refs/macros/TKT_FLG_TRANSIT_POLICY_CHECKED.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _TKT-FLG-TRANSIT-POLICY-CHECKED-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/VALID_INT_BITS.txt b/doc/html/_sources/appdev/refs/macros/VALID_INT_BITS.rst.txt
index 280b58d9c316..0267d4215d25 100644
--- a/doc/html/_sources/appdev/refs/macros/VALID_INT_BITS.txt
+++ b/doc/html/_sources/appdev/refs/macros/VALID_INT_BITS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _VALID-INT-BITS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/VALID_UINT_BITS.txt b/doc/html/_sources/appdev/refs/macros/VALID_UINT_BITS.rst.txt
index 889aae985e60..efba9a80bb34 100644
--- a/doc/html/_sources/appdev/refs/macros/VALID_UINT_BITS.txt
+++ b/doc/html/_sources/appdev/refs/macros/VALID_UINT_BITS.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _VALID-UINT-BITS-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/index.txt b/doc/html/_sources/appdev/refs/macros/index.rst.txt
index e76747102576..45fe160d7fb1 100644
--- a/doc/html/_sources/appdev/refs/macros/index.txt
+++ b/doc/html/_sources/appdev/refs/macros/index.rst.txt
@@ -43,6 +43,7 @@ Public
    CKSUMTYPE_RSA_MD4_DES.rst
    CKSUMTYPE_RSA_MD5.rst
    CKSUMTYPE_RSA_MD5_DES.rst
+   CKSUMTYPE_SHA1.rst
    ENCTYPE_AES128_CTS_HMAC_SHA1_96.rst
    ENCTYPE_AES128_CTS_HMAC_SHA256_128.rst
    ENCTYPE_AES256_CTS_HMAC_SHA1_96.rst
@@ -92,6 +93,7 @@ Public
    KRB5_AS_REP.rst
    KRB5_AS_REQ.rst
    KRB5_AUTHDATA_AND_OR.rst
+   KRB5_AUTHDATA_AP_OPTIONS.rst
    KRB5_AUTHDATA_AUTH_INDICATOR.rst
    KRB5_AUTHDATA_CAMMAC.rst
    KRB5_AUTHDATA_ETYPE_NEGOTIATION.rst
@@ -181,6 +183,7 @@ Public
    KRB5_KEYUSAGE_KRB_ERROR_CKSUM.rst
    KRB5_KEYUSAGE_KRB_PRIV_ENCPART.rst
    KRB5_KEYUSAGE_KRB_SAFE_CKSUM.rst
+   KRB5_KEYUSAGE_PA_AS_FRESHNESS.rst
    KRB5_KEYUSAGE_PA_FX_COOKIE.rst
    KRB5_KEYUSAGE_PA_OTP_REQUEST.rst
    KRB5_KEYUSAGE_PA_PKINIT_KX.rst
@@ -189,6 +192,7 @@ Public
    KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.rst
    KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.rst
    KRB5_KEYUSAGE_PA_SAM_RESPONSE.rst
+   KRB5_KEYUSAGE_SPAKE.rst
    KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.rst
    KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.rst
    KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.rst
@@ -231,16 +235,24 @@ Public
    KRB5_NT_UNKNOWN.rst
    KRB5_NT_WELLKNOWN.rst
    KRB5_NT_X500_PRINCIPAL.rst
+   KRB5_PAC_ATTRIBUTES_INFO.rst
    KRB5_PAC_CLIENT_INFO.rst
+   KRB5_PAC_CLIENT_CLAIMS.rst
    KRB5_PAC_CREDENTIALS_INFO.rst
    KRB5_PAC_DELEGATION_INFO.rst
+   KRB5_PAC_DEVICE_CLAIMS.rst
+   KRB5_PAC_DEVICE_INFO.rst
    KRB5_PAC_LOGON_INFO.rst
    KRB5_PAC_PRIVSVR_CHECKSUM.rst
+   KRB5_PAC_REQUESTOR.rst
    KRB5_PAC_SERVER_CHECKSUM.rst
+   KRB5_PAC_TICKET_CHECKSUM.rst
    KRB5_PAC_UPN_DNS_INFO.rst
+   KRB5_PAC_FULL_CHECKSUM.rst
    KRB5_PADATA_AFS3_SALT.rst
    KRB5_PADATA_AP_REQ.rst
    KRB5_PADATA_AS_CHECKSUM.rst
+   KRB5_PADATA_AS_FRESHNESS.rst
    KRB5_PADATA_ENCRYPTED_CHALLENGE.rst
    KRB5_PADATA_ENC_SANDIA_SECURID.rst
    KRB5_PADATA_ENC_TIMESTAMP.rst
@@ -257,6 +269,7 @@ Public
    KRB5_PADATA_OTP_CHALLENGE.rst
    KRB5_PADATA_OTP_PIN_CHANGE.rst
    KRB5_PADATA_OTP_REQUEST.rst
+   KRB5_PADATA_PAC_OPTIONS.rst
    KRB5_PADATA_PAC_REQUEST.rst
    KRB5_PADATA_PKINIT_KX.rst
    KRB5_PADATA_PK_AS_REP.rst
@@ -272,6 +285,9 @@ Public
    KRB5_PADATA_SAM_RESPONSE.rst
    KRB5_PADATA_SAM_RESPONSE_2.rst
    KRB5_PADATA_SESAME.rst
+   KRB5_PADATA_SPAKE.rst
+   KRB5_PADATA_REDHAT_IDP_OAUTH2.rst
+   KRB5_PADATA_REDHAT_PASSKEY.rst
    KRB5_PADATA_SVR_REFERRAL_INFO.rst
    KRB5_PADATA_TGS_REQ.rst
    KRB5_PADATA_USE_SPECIFIED_KVNO.rst
@@ -281,6 +297,7 @@ Public
    KRB5_PRINCIPAL_COMPARE_UTF8.rst
    KRB5_PRINCIPAL_PARSE_ENTERPRISE.rst
    KRB5_PRINCIPAL_PARSE_IGNORE_REALM.rst
+   KRB5_PRINCIPAL_PARSE_NO_DEF_REALM.rst
    KRB5_PRINCIPAL_PARSE_NO_REALM.rst
    KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.rst
    KRB5_PRINCIPAL_UNPARSE_DISPLAY.rst
diff --git a/doc/html/_sources/appdev/refs/macros/krb524_convert_creds_kdc.txt b/doc/html/_sources/appdev/refs/macros/krb524_convert_creds_kdc.rst.txt
index 6fe88946eecd..9316160f7379 100644
--- a/doc/html/_sources/appdev/refs/macros/krb524_convert_creds_kdc.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb524_convert_creds_kdc.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb524-convert-creds-kdc-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb524_init_ets.txt b/doc/html/_sources/appdev/refs/macros/krb524_init_ets.rst.txt
index fdde042f22fd..dfb8e2024266 100644
--- a/doc/html/_sources/appdev/refs/macros/krb524_init_ets.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb524_init_ets.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb524-init-ets-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_const.txt b/doc/html/_sources/appdev/refs/macros/krb5_const.rst.txt
index 6e9a508d2d67..1baaa0968c9f 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_const.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_const.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-const-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_component.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_component.rst.txt
index 25178cd73ebe..dc6160b52bec 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_component.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_component.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-component-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_name.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_name.rst.txt
index 13a9fac3a223..31481305662e 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_name.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_name.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-name-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_realm.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_realm.rst.txt
index f9bef3a1f298..562a2675966b 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_realm.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_realm.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-realm-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm.rst.txt
index 37040c9a142a..dc05314afe77 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-set-realm-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_data.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_data.rst.txt
index 576e955e6b31..4ded1b3a8bfd 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_data.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-set-realm-data-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_length.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_length.rst.txt
index c4cba13c1dda..81ea192b5be5 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_length.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_set_realm_length.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-set-realm-length-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_size.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_size.rst.txt
index 1108a91e68db..251fad5daaaa 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_size.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_size.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-size-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_princ_type.txt b/doc/html/_sources/appdev/refs/macros/krb5_princ_type.rst.txt
index 394afd0fe8b4..a4ff8a4bd883 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_princ_type.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_princ_type.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-princ-type-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_roundup.txt b/doc/html/_sources/appdev/refs/macros/krb5_roundup.rst.txt
index 660d7b9014e0..db81d04b6dc3 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_roundup.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_roundup.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-roundup-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_x.txt b/doc/html/_sources/appdev/refs/macros/krb5_x.rst.txt
index 083d406b1349..eaf3f869b939 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_x.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_x.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-x-data:
 
diff --git a/doc/html/_sources/appdev/refs/macros/krb5_xc.txt b/doc/html/_sources/appdev/refs/macros/krb5_xc.rst.txt
index 5bfbfc90595f..4d452672afd6 100644
--- a/doc/html/_sources/appdev/refs/macros/krb5_xc.txt
+++ b/doc/html/_sources/appdev/refs/macros/krb5_xc.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-xc-data:
 
diff --git a/doc/html/_sources/appdev/refs/types/index.txt b/doc/html/_sources/appdev/refs/types/index.rst.txt
index dc414cfdebe1..d8d2a8f3cd2d 100644
--- a/doc/html/_sources/appdev/refs/types/index.txt
+++ b/doc/html/_sources/appdev/refs/types/index.rst.txt
@@ -62,7 +62,6 @@ Public
    krb5_preauthtype.rst
    krb5_principal.rst
    krb5_principal_data.rst
-   krb5_const_principal.rst
    krb5_prompt.rst
    krb5_prompt_type.rst
    krb5_prompter_fct.rst
diff --git a/doc/html/_sources/appdev/refs/types/krb5_address.txt b/doc/html/_sources/appdev/refs/types/krb5_address.rst.txt
index 1d65d712ab48..8753a28ecbe2 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_address.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_address.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-address-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_addrtype.txt b/doc/html/_sources/appdev/refs/types/krb5_addrtype.rst.txt
index d2dcbc85fb98..4c6191631b31 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_addrtype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_addrtype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-addrtype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ap_rep.txt b/doc/html/_sources/appdev/refs/types/krb5_ap_rep.rst.txt
index f05a1139fa0b..87005890db0d 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ap_rep.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ap_rep.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ap-rep-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ap_rep_enc_part.txt b/doc/html/_sources/appdev/refs/types/krb5_ap_rep_enc_part.rst.txt
index 73b7b1559fef..87d62a608cc2 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ap_rep_enc_part.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ap_rep_enc_part.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ap-rep-enc-part-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ap_req.txt b/doc/html/_sources/appdev/refs/types/krb5_ap_req.rst.txt
index 9806c1729fdf..425e224258d9 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ap_req.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ap_req.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ap-req-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_auth_context.txt b/doc/html/_sources/appdev/refs/types/krb5_auth_context.rst.txt
index 8266b6c6566f..e0f302c5c9a3 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_auth_context.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_auth_context.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-auth-context-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_authdata.txt b/doc/html/_sources/appdev/refs/types/krb5_authdata.rst.txt
index ef4d4c13d754..409c4df6a94e 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_authdata.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_authdata.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-authdata-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_authdatatype.txt b/doc/html/_sources/appdev/refs/types/krb5_authdatatype.rst.txt
index 933b168ebc42..01c23d971df7 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_authdatatype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_authdatatype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-authdatatype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_authenticator.txt b/doc/html/_sources/appdev/refs/types/krb5_authenticator.rst.txt
index a0601400c79f..fcff008af770 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_authenticator.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_authenticator.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-authenticator-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_boolean.txt b/doc/html/_sources/appdev/refs/types/krb5_boolean.rst.txt
index 6ee72b3ad2b9..f9be9b4197bc 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_boolean.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_boolean.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-boolean-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cc_cursor.txt b/doc/html/_sources/appdev/refs/types/krb5_cc_cursor.rst.txt
index a570794059dc..97da560d0dc7 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cc_cursor.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cc_cursor.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cc-cursor-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ccache.txt b/doc/html/_sources/appdev/refs/types/krb5_ccache.rst.txt
index 4c96cc8e66a0..86317f5fe30d 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ccache.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ccache.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ccache-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cccol_cursor.txt b/doc/html/_sources/appdev/refs/types/krb5_cccol_cursor.rst.txt
index 20ee4e0f691c..13095b1c1301 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cccol_cursor.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cccol_cursor.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cccol-cursor-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_checksum.txt b/doc/html/_sources/appdev/refs/types/krb5_checksum.rst.txt
index 0e970fd6be68..7695e5caab41 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_checksum.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_checksum.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-checksum-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cksumtype.txt b/doc/html/_sources/appdev/refs/types/krb5_cksumtype.rst.txt
index c901dfc406b8..52a757a44403 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cksumtype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cksumtype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cksumtype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_const_pointer.txt b/doc/html/_sources/appdev/refs/types/krb5_const_pointer.rst.txt
index 05da0826be59..7b70b4309b69 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_const_pointer.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_const_pointer.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-const-pointer-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_const_principal.txt b/doc/html/_sources/appdev/refs/types/krb5_const_principal.rst.txt
index b30d3f70c135..37131f6a2edd 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_const_principal.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_const_principal.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-const-principal-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_context.txt b/doc/html/_sources/appdev/refs/types/krb5_context.rst.txt
index 51bce12a9d09..8390b9cd9c97 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_context.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_context.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-context-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cred.txt b/doc/html/_sources/appdev/refs/types/krb5_cred.rst.txt
index 61f1691d4f46..e50279471973 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cred.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cred.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cred-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cred_enc_part.txt b/doc/html/_sources/appdev/refs/types/krb5_cred_enc_part.rst.txt
index eee6a8a3f3d2..ded108225944 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cred_enc_part.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cred_enc_part.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cred-enc-part-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cred_info.txt b/doc/html/_sources/appdev/refs/types/krb5_cred_info.rst.txt
index 20cb7998fb42..f32e5fef6e69 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cred_info.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cred_info.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cred-info-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_creds.txt b/doc/html/_sources/appdev/refs/types/krb5_creds.rst.txt
index caa91fd180c7..96f726d4b6bb 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_creds.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_creds.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-creds-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_crypto_iov.txt b/doc/html/_sources/appdev/refs/types/krb5_crypto_iov.rst.txt
index 7ede1928b608..e818b82f5222 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_crypto_iov.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_crypto_iov.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-crypto-iov-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_cryptotype.txt b/doc/html/_sources/appdev/refs/types/krb5_cryptotype.rst.txt
index 8cc46bfa6d73..1e49e35180d2 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_cryptotype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_cryptotype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-cryptotype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_data.txt b/doc/html/_sources/appdev/refs/types/krb5_data.rst.txt
index 7bc2c0ec2e43..f5c23c7b3508 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_deltat.txt b/doc/html/_sources/appdev/refs/types/krb5_deltat.rst.txt
index acc6193a04ff..bfefbe88cd36 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_deltat.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_deltat.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-deltat-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_enc_data.txt b/doc/html/_sources/appdev/refs/types/krb5_enc_data.rst.txt
index b5109f75c946..2f08142c7609 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_enc_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_enc_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-enc-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_enc_kdc_rep_part.txt b/doc/html/_sources/appdev/refs/types/krb5_enc_kdc_rep_part.rst.txt
index 1c5f129a690e..735c76e1e910 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_enc_kdc_rep_part.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_enc_kdc_rep_part.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-enc-kdc-rep-part-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_enc_tkt_part.txt b/doc/html/_sources/appdev/refs/types/krb5_enc_tkt_part.rst.txt
index 8079fb4ff456..fb29f3a63bf4 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_enc_tkt_part.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_enc_tkt_part.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-enc-tkt-part-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_encrypt_block.txt b/doc/html/_sources/appdev/refs/types/krb5_encrypt_block.rst.txt
index 5b83893cd0a8..22f7c2137116 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_encrypt_block.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_encrypt_block.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-encrypt-block-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_enctype.txt b/doc/html/_sources/appdev/refs/types/krb5_enctype.rst.txt
index bd1544548f50..c820bf8e3dbe 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_enctype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_enctype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-enctype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_error.txt b/doc/html/_sources/appdev/refs/types/krb5_error.rst.txt
index a160da5423d2..c2dfb07d2782 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_error.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_error.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-error-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_error_code.txt b/doc/html/_sources/appdev/refs/types/krb5_error_code.rst.txt
index 60a3b728e0f3..98755b39971b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_error_code.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_error_code.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-error-code-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.rst.txt b/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.rst.txt
new file mode 100644
index 000000000000..13b1f217bd64
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.rst.txt
@@ -0,0 +1,20 @@
+.. highlight:: c
+
+.. _krb5-expire-callback-func-struct:
+
+krb5_expire_callback_func
+=========================
+
+..
+.. c:type:: krb5_expire_callback_func
+..
+
+
+
+
+Declaration
+------------
+
+typedef void( \* krb5_expire_callback_func) (krb5_context context, void \*data, krb5_timestamp password_expiration, krb5_timestamp account_expiration, krb5_boolean is_last_req)
+
+
diff --git a/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.txt b/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.txt
deleted file mode 100644
index 81acfe2f5a75..000000000000
--- a/doc/html/_sources/appdev/refs/types/krb5_expire_callback_func.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-.. highlightlang:: c
-
-.. _krb5-expire-callback-func-struct:
-
-krb5_expire_callback_func
-=========================
-
-..
-.. c:type:: krb5_expire_callback_func
-..
-
-
-
-
-Declaration
-------------
-
-typedef void( \* krb5_expire_callback_func)(krb5_context context, void \*data, krb5_timestamp password_expiration, krb5_timestamp account_expiration, krb5_boolean is_last_req)
-
-
diff --git a/doc/html/_sources/appdev/refs/types/krb5_flags.txt b/doc/html/_sources/appdev/refs/types/krb5_flags.rst.txt
index 0efb2046ca40..398a5e95a1e6 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_flags.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_flags.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-flags-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_get_init_creds_opt.txt b/doc/html/_sources/appdev/refs/types/krb5_get_init_creds_opt.rst.txt
index 52e8e36a170b..a2ca42db6494 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_get_init_creds_opt.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_get_init_creds_opt.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-get-init-creds-opt-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_gic_opt_pa_data.txt b/doc/html/_sources/appdev/refs/types/krb5_gic_opt_pa_data.rst.txt
index 665e3cd05b55..fc303966e433 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_gic_opt_pa_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_gic_opt_pa_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-gic-opt-pa-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_init_creds_context.txt b/doc/html/_sources/appdev/refs/types/krb5_init_creds_context.rst.txt
index 73be70af14c0..22c4af36e2c9 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_init_creds_context.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_init_creds_context.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-init-creds-context-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_int16.txt b/doc/html/_sources/appdev/refs/types/krb5_int16.rst.txt
index 06ca8e603e66..9686c3065df9 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_int16.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_int16.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-int16-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_int32.txt b/doc/html/_sources/appdev/refs/types/krb5_int32.rst.txt
index b97596f42c7d..cab1a43fe073 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_int32.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_int32.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-int32-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_kdc_rep.txt b/doc/html/_sources/appdev/refs/types/krb5_kdc_rep.rst.txt
index 5071a8fa3e80..fb7c4bfa525b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_kdc_rep.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_kdc_rep.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-kdc-rep-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_kdc_req.txt b/doc/html/_sources/appdev/refs/types/krb5_kdc_req.rst.txt
index be8af1340dcb..12df057f0e73 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_kdc_req.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_kdc_req.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-kdc-req-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_key.txt b/doc/html/_sources/appdev/refs/types/krb5_key.rst.txt
index d662446ace7f..580d410736d4 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_key.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_key.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-key-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_keyblock.txt b/doc/html/_sources/appdev/refs/types/krb5_keyblock.rst.txt
index ee3ec76006cc..9dd414a933d4 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_keyblock.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_keyblock.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-keyblock-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_keytab.txt b/doc/html/_sources/appdev/refs/types/krb5_keytab.rst.txt
index c8b3e2601bc7..879a92b458e3 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_keytab.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_keytab.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-keytab-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_keytab_entry.txt b/doc/html/_sources/appdev/refs/types/krb5_keytab_entry.rst.txt
index 81c2be7f5a13..f8246f675470 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_keytab_entry.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_keytab_entry.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-keytab-entry-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_keyusage.txt b/doc/html/_sources/appdev/refs/types/krb5_keyusage.rst.txt
index 56885f787b07..6e2358f01d30 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_keyusage.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_keyusage.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-keyusage-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_kt_cursor.txt b/doc/html/_sources/appdev/refs/types/krb5_kt_cursor.rst.txt
index d08ea0039bbe..0b374624ecee 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_kt_cursor.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_kt_cursor.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-kt-cursor-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_kvno.txt b/doc/html/_sources/appdev/refs/types/krb5_kvno.rst.txt
index 324ce12ca636..ad766bb72e31 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_kvno.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_kvno.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-kvno-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_last_req_entry.txt b/doc/html/_sources/appdev/refs/types/krb5_last_req_entry.rst.txt
index d7e6378726a1..3a8555db03a2 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_last_req_entry.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_last_req_entry.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-last-req-entry-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_magic.txt b/doc/html/_sources/appdev/refs/types/krb5_magic.rst.txt
index 3be2051db242..7d3fc24cb7b8 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_magic.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_magic.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-magic-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_mk_req_checksum_func.txt b/doc/html/_sources/appdev/refs/types/krb5_mk_req_checksum_func.rst.txt
index a8f34c8b2dd1..fa0dd01c1e7b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_mk_req_checksum_func.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_mk_req_checksum_func.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-mk-req-checksum-func-struct:
 
@@ -16,6 +16,6 @@ Type of function used as a callback to generate checksum data for mk_req.
 Declaration
 ------------
 
-typedef krb5_error_code( \* krb5_mk_req_checksum_func)(krb5_context, krb5_auth_context, void \*, krb5_data \*\*)
+typedef krb5_error_code( \* krb5_mk_req_checksum_func) (krb5_context, krb5_auth_context, void \*, krb5_data \*\*)
 
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_msgtype.txt b/doc/html/_sources/appdev/refs/types/krb5_msgtype.rst.txt
index 5e93f24b77af..b1e08cd56632 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_msgtype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_msgtype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-msgtype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_octet.txt b/doc/html/_sources/appdev/refs/types/krb5_octet.rst.txt
index 3ec5e33ddc72..b6802e209045 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_octet.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_octet.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-octet-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pa_data.txt b/doc/html/_sources/appdev/refs/types/krb5_pa_data.rst.txt
index a594900e8718..7bc284c83401 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pa_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pa_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pa-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pa_pac_req.txt b/doc/html/_sources/appdev/refs/types/krb5_pa_pac_req.rst.txt
index e62edad75f6c..fd4428fd143d 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pa_pac_req.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pa_pac_req.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pa-pac-req-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pa_server_referral_data.txt b/doc/html/_sources/appdev/refs/types/krb5_pa_server_referral_data.rst.txt
index 59460d76c4e4..2fb466b70412 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pa_server_referral_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pa_server_referral_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pa-server-referral-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pa_svr_referral_data.txt b/doc/html/_sources/appdev/refs/types/krb5_pa_svr_referral_data.rst.txt
index ea31606e7403..c104078e7f4e 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pa_svr_referral_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pa_svr_referral_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pa-svr-referral-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pac.txt b/doc/html/_sources/appdev/refs/types/krb5_pac.rst.txt
index 9903e8e301e8..603733c902e1 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pac.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pac.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pac-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pointer.txt b/doc/html/_sources/appdev/refs/types/krb5_pointer.rst.txt
index ff1588a551b3..e9a9ddd3aa3c 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pointer.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pointer.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pointer-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_post_recv_fn.txt b/doc/html/_sources/appdev/refs/types/krb5_post_recv_fn.rst.txt
index ed37b017798d..c696072efc85 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_post_recv_fn.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_post_recv_fn.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-post-recv-fn-struct:
 
@@ -17,6 +17,6 @@ The hook function should use :c:func:`krb5_copy_data()` to construct the value f
 Declaration
 ------------
 
-typedef krb5_error_code( \* krb5_post_recv_fn)(krb5_context context, void \*data, krb5_error_code code, const krb5_data \*realm, const krb5_data \*message, const krb5_data \*reply, krb5_data \*\*new_reply_out)
+typedef krb5_error_code( \* krb5_post_recv_fn) (krb5_context context, void \*data, krb5_error_code code, const krb5_data \*realm, const krb5_data \*message, const krb5_data \*reply, krb5_data \*\*new_reply_out)
 
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pre_send_fn.txt b/doc/html/_sources/appdev/refs/types/krb5_pre_send_fn.rst.txt
index a0fa04fdcaaf..b84ede8141b1 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pre_send_fn.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pre_send_fn.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pre-send-fn-struct:
 
@@ -11,7 +11,7 @@ krb5_pre_send_fn
 
 Hook function for inspecting or modifying messages sent to KDCs.
 
-If the hook function sets *reply_out* , *message* will not be sent to the KDC, and the given reply will used instead.
+If the hook function sets *new_reply_out* , *message* will not be sent to the KDC, and the given reply will used instead.
 If the hook function sets *new_message_out* , the given message will be sent to the KDC in place of *message* .
 If the hook function returns successfully without setting either output, *message* will be sent to the KDC normally.
 The hook function should use :c:func:`krb5_copy_data()` to construct the value for *new_message_out* or *reply_out* , to ensure that it can be freed correctly by the library.
@@ -19,6 +19,6 @@ The hook function should use :c:func:`krb5_copy_data()` to construct the value f
 Declaration
 ------------
 
-typedef krb5_error_code( \* krb5_pre_send_fn)(krb5_context context, void \*data, const krb5_data \*realm, const krb5_data \*message, krb5_data \*\*new_message_out, krb5_data \*\*new_reply_out)
+typedef krb5_error_code( \* krb5_pre_send_fn) (krb5_context context, void \*data, const krb5_data \*realm, const krb5_data \*message, krb5_data \*\*new_message_out, krb5_data \*\*new_reply_out)
 
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_preauthtype.txt b/doc/html/_sources/appdev/refs/types/krb5_preauthtype.rst.txt
index 601c6dee329a..7cd8587550e3 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_preauthtype.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_preauthtype.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-preauthtype-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_principal.txt b/doc/html/_sources/appdev/refs/types/krb5_principal.rst.txt
index 38c2e9a65206..818b66f10d76 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_principal.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_principal.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-principal-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_principal_data.txt b/doc/html/_sources/appdev/refs/types/krb5_principal_data.rst.txt
index f094f9cc4e56..4dcf18294752 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_principal_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_principal_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-principal-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_prompt.txt b/doc/html/_sources/appdev/refs/types/krb5_prompt.rst.txt
index cfc16981d898..4d2e76b28a74 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_prompt.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_prompt.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-prompt-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_prompt_type.txt b/doc/html/_sources/appdev/refs/types/krb5_prompt_type.rst.txt
index 6495c65f5ceb..e36044c4660b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_prompt_type.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_prompt_type.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-prompt-type-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.rst.txt b/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.rst.txt
new file mode 100644
index 000000000000..99cdc95e54d4
--- /dev/null
+++ b/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.rst.txt
@@ -0,0 +1,21 @@
+.. highlight:: c
+
+.. _krb5-prompter-fct-struct:
+
+krb5_prompter_fct
+=================
+
+..
+.. c:type:: krb5_prompter_fct
+..
+
+Pointer to a prompter callback function.
+
+
+
+Declaration
+------------
+
+typedef krb5_error_code( \* krb5_prompter_fct) (krb5_context context, void \*data, const char \*name, const char \*banner, int num_prompts, krb5_prompt prompts[])
+
+
diff --git a/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.txt b/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.txt
deleted file mode 100644
index 66b8f6d23bf4..000000000000
--- a/doc/html/_sources/appdev/refs/types/krb5_prompter_fct.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-.. highlightlang:: c
-
-.. _krb5-prompter-fct-struct:
-
-krb5_prompter_fct
-=================
-
-..
-.. c:type:: krb5_prompter_fct
-..
-
-Pointer to a prompter callback function.
-
-
-
-Declaration
-------------
-
-typedef krb5_error_code( \* krb5_prompter_fct)(krb5_context context, void \*data, const char \*name, const char \*banner, int num_prompts, krb5_prompt prompts[])
-
-
diff --git a/doc/html/_sources/appdev/refs/types/krb5_pwd_data.txt b/doc/html/_sources/appdev/refs/types/krb5_pwd_data.rst.txt
index 67c03f76230d..75dffa5e8e9a 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_pwd_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_pwd_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-pwd-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_rcache.txt b/doc/html/_sources/appdev/refs/types/krb5_rcache.rst.txt
index 43f17fe12529..8d08c3a46fb0 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_rcache.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_rcache.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-rcache-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_replay_data.txt b/doc/html/_sources/appdev/refs/types/krb5_replay_data.rst.txt
index 0008fa68f196..63b098e43a47 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_replay_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_replay_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-replay-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_context.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_context.rst.txt
index 3a7eb217964b..a8b960dabecc 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_context.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_context.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-context-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_fn.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_fn.rst.txt
index 8fcd2e241c27..a66fa6c0ebe0 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_fn.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_fn.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-fn-struct:
 
@@ -16,6 +16,6 @@ If a required question is unanswered, the prompter may be called.
 Declaration
 ------------
 
-typedef krb5_error_code( \* krb5_responder_fn)(krb5_context ctx, void \*data, krb5_responder_context rctx)
+typedef krb5_error_code( \* krb5_responder_fn) (krb5_context ctx, void \*data, krb5_responder_context rctx)
 
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_otp_challenge.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_otp_challenge.rst.txt
index e46c7edf8924..f0d31407f16e 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_otp_challenge.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_otp_challenge.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-otp-challenge-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_otp_tokeninfo.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_otp_tokeninfo.rst.txt
index 8c5c4b8d28ae..3444b274fcac 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_otp_tokeninfo.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_otp_tokeninfo.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-otp-tokeninfo-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_challenge.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_challenge.rst.txt
index f309cfc6726d..dd1c4b17990e 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_challenge.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_challenge.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-pkinit-challenge-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_identity.txt b/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_identity.rst.txt
index 56f37226865c..3633adb8e64b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_identity.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_responder_pkinit_identity.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-responder-pkinit-identity-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_response.txt b/doc/html/_sources/appdev/refs/types/krb5_response.rst.txt
index 4876233a4d58..a9f3913bf702 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_response.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_response.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-response-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ticket.txt b/doc/html/_sources/appdev/refs/types/krb5_ticket.rst.txt
index 2a809d4e66d4..eb047b141a5d 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ticket.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ticket.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ticket-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ticket_times.txt b/doc/html/_sources/appdev/refs/types/krb5_ticket_times.rst.txt
index 57dab5d1b60b..c1f2096359a4 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ticket_times.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ticket_times.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ticket-times-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_timestamp.txt b/doc/html/_sources/appdev/refs/types/krb5_timestamp.rst.txt
index dc3e9eee79ab..4a13d6850f09 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_timestamp.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_timestamp.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-timestamp-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_tkt_authent.txt b/doc/html/_sources/appdev/refs/types/krb5_tkt_authent.rst.txt
index 307c63f1623a..00cc223d8850 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_tkt_authent.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_tkt_authent.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-tkt-authent-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_tkt_creds_context.txt b/doc/html/_sources/appdev/refs/types/krb5_tkt_creds_context.rst.txt
index 398d42f3bc94..95c9625f4c24 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_tkt_creds_context.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_tkt_creds_context.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-tkt-creds-context-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_trace_callback.txt b/doc/html/_sources/appdev/refs/types/krb5_trace_callback.rst.txt
index b3bff56b696a..f201ec18e8cc 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_trace_callback.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_trace_callback.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-trace-callback-struct:
 
@@ -15,6 +15,6 @@ krb5_trace_callback
 Declaration
 ------------
 
-typedef void( \* krb5_trace_callback)(krb5_context context, const krb5_trace_info \*info, void \*cb_data)
+typedef void( \* krb5_trace_callback) (krb5_context context, const krb5_trace_info \*info, void \*cb_data)
 
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_trace_info.txt b/doc/html/_sources/appdev/refs/types/krb5_trace_info.rst.txt
index 7f303b671d21..6636de60ea48 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_trace_info.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_trace_info.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-trace-info-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_transited.txt b/doc/html/_sources/appdev/refs/types/krb5_transited.rst.txt
index 596647984747..bb2705986436 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_transited.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_transited.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-transited-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_typed_data.txt b/doc/html/_sources/appdev/refs/types/krb5_typed_data.rst.txt
index e3555eba6984..2031f8590bdc 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_typed_data.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_typed_data.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-typed-data-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ui_2.txt b/doc/html/_sources/appdev/refs/types/krb5_ui_2.rst.txt
index ce9c205bdca8..ed07896f08dc 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ui_2.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ui_2.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ui-2-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_ui_4.txt b/doc/html/_sources/appdev/refs/types/krb5_ui_4.rst.txt
index b41ecb4b04ab..4e754133fc6b 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_ui_4.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_ui_4.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-ui-4-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/krb5_verify_init_creds_opt.txt b/doc/html/_sources/appdev/refs/types/krb5_verify_init_creds_opt.rst.txt
index eaefb198df36..2f3725d20d65 100644
--- a/doc/html/_sources/appdev/refs/types/krb5_verify_init_creds_opt.txt
+++ b/doc/html/_sources/appdev/refs/types/krb5_verify_init_creds_opt.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _krb5-verify-init-creds-opt-struct:
 
diff --git a/doc/html/_sources/appdev/refs/types/passwd_phrase_element.txt b/doc/html/_sources/appdev/refs/types/passwd_phrase_element.rst.txt
index c4738c5e9662..a0c6c08f9883 100644
--- a/doc/html/_sources/appdev/refs/types/passwd_phrase_element.txt
+++ b/doc/html/_sources/appdev/refs/types/passwd_phrase_element.rst.txt
@@ -1,4 +1,4 @@
-.. highlightlang:: c
+.. highlight:: c
 
 .. _passwd-phrase-element-struct:
 
diff --git a/doc/html/_sources/appdev/y2038.txt b/doc/html/_sources/appdev/y2038.rst.txt
index bc4122dad0a4..bc4122dad0a4 100644
--- a/doc/html/_sources/appdev/y2038.txt
+++ b/doc/html/_sources/appdev/y2038.rst.txt