diff --git a/doc/XMLreference.rst b/doc/XMLreference.rst index 72c93cfd..08449dbd 100644 --- a/doc/XMLreference.rst +++ b/doc/XMLreference.rst @@ -2163,9 +2163,10 @@ file. .. _asset-texture-content_type: :at:`content_type`: :at-val:`string, optional` - If the file attribute is specified, then this sets the `MIME `_ type of the file - to be loaded. Any filename extensions will be ignored. Currently ``image/png`` and ``image/vnd.mujoco.texture`` are - supported. + If the file attribute is specified, then this sets the + `Media Type `_ (formerly known as MIME types) of the + file to be loaded. Any filename extensions will be ignored. Currently ``image/png`` and ``image/vnd.mujoco.texture`` + are supported. .. _asset-texture-file: @@ -2352,9 +2353,10 @@ also known as terrain map, is a 2D matrix of elevation data. The data can be spe .. _asset-hfield-content_type: :at:`content_type`: :at-val: `string, optional` - If the file attribute is specified, then this sets the `MIME `_ type of the file - to be loaded. Any filename extensions will be overloaded. Currently ``image/png`` and ``image/vnd.mujoco.hfield`` - are supported. + If the file attribute is specified, then this sets the + `Media Type `_ (formerly known as MIME types) of the + file to be loaded. Any filename extensions will be overloaded. Currently ``image/png`` and + ``image/vnd.mujoco.hfield`` are supported. .. _asset-hfield-file: @@ -2524,9 +2526,10 @@ The full list of processing steps applied by the compiler to each mesh is as fol .. _asset-mesh-content_type: :at:`content_type`: :at-val:`string, optional` - If the file attribute is specified, then this sets the `MIME `_ type of the file - to be loaded. Any filename extensions will be overloaded. Currently ``model/vnd.mujoco.msh``, ``model/obj``, and - ``model/stl`` are supported. + If the file attribute is specified, then this sets the + `Media Type `_ (formerly known as MIME type) of the + file to be loaded. Any filename extensions will be overloaded. Currently ``model/vnd.mujoco.msh``, ``model/obj``, + and ``model/stl`` are supported. .. _asset-mesh-file: diff --git a/doc/changelog.rst b/doc/changelog.rst index 14d8a18e..62516aba 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -15,8 +15,8 @@ General :ref:`Cartesian actuator` forces are realizable by individual motors at the joints. See :ref:`CForceRange` for details. - Added an optional ``content_type`` attribute to hfield, texture, and mesh assets. This attribute supports a formatted - `MIME `_ string used to determine the type of the asset file without resorting to - pulling the type from the file extension. + `Media Type `_ (previously known as MIME type) string + used to determine the type of the asset file without resorting to pulling the type from the file extension. - Added analytic derivatives for quaternion :ref:`subtraction` and :ref:`integration` (rotation with an angular velocity). Derivatives are in the 3D tangent space. - Added :ref:`mjv_connector` which has identical functionality to :ref:`mjv_makeConnector`, but with more convenient