Change "MIME type" to "Media Type".

MIME type is the historic nomenclature for Media Type, see e.g. https://www.iana.org/assignments/media-types/media-types.xhtml.

PiperOrigin-RevId: 549394435
Change-Id: I000e044a35ec44392e9c41bab6383aa89cdefc49
This commit is contained in:
Saran Tunyasuvunakool
2023-07-19 12:34:21 -07:00
committed by Copybara-Service
parent 51aa375af0
commit 8386b28877
2 changed files with 14 additions and 11 deletions
+12 -9
View File
@@ -2163,9 +2163,10 @@ file.
.. _asset-texture-content_type: .. _asset-texture-content_type:
:at:`content_type`: :at-val:`string, optional` :at:`content_type`: :at-val:`string, optional`
If the file attribute is specified, then this sets the `MIME <https://en.wikipedia.org/wiki/MIME>`_ type of the file If the file attribute is specified, then this sets the
to be loaded. Any filename extensions will be ignored. Currently ``image/png`` and ``image/vnd.mujoco.texture`` are `Media Type <https://www.iana.org/assignments/media-types/media-types.xhtml>`_ (formerly known as MIME types) of the
supported. file to be loaded. Any filename extensions will be ignored. Currently ``image/png`` and ``image/vnd.mujoco.texture``
are supported.
.. _asset-texture-file: .. _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: .. _asset-hfield-content_type:
:at:`content_type`: :at-val: `string, optional` :at:`content_type`: :at-val: `string, optional`
If the file attribute is specified, then this sets the `MIME <https://en.wikipedia.org/wiki/MIME>`_ type of the file If the file attribute is specified, then this sets the
to be loaded. Any filename extensions will be overloaded. Currently ``image/png`` and ``image/vnd.mujoco.hfield`` `Media Type <https://www.iana.org/assignments/media-types/media-types.xhtml>`_ (formerly known as MIME types) of the
are supported. file to be loaded. Any filename extensions will be overloaded. Currently ``image/png`` and
``image/vnd.mujoco.hfield`` are supported.
.. _asset-hfield-file: .. _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: .. _asset-mesh-content_type:
:at:`content_type`: :at-val:`string, optional` :at:`content_type`: :at-val:`string, optional`
If the file attribute is specified, then this sets the `MIME <https://en.wikipedia.org/wiki/MIME>`_ type of the file If the file attribute is specified, then this sets the
to be loaded. Any filename extensions will be overloaded. Currently ``model/vnd.mujoco.msh``, ``model/obj``, and `Media Type <https://www.iana.org/assignments/media-types/media-types.xhtml>`_ (formerly known as MIME type) of the
``model/stl`` are supported. 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: .. _asset-mesh-file:
+2 -2
View File
@@ -15,8 +15,8 @@ General
:ref:`Cartesian actuator<actuator-general-refsite>` forces are realizable by individual motors at the joints. :ref:`Cartesian actuator<actuator-general-refsite>` forces are realizable by individual motors at the joints.
See :ref:`CForceRange` for details. See :ref:`CForceRange` for details.
- Added an optional ``content_type`` attribute to hfield, texture, and mesh assets. This attribute supports a formatted - Added an optional ``content_type`` attribute to hfield, texture, and mesh assets. This attribute supports a formatted
`MIME <https://en.wikipedia.org/wiki/MIME>`_ string used to determine the type of the asset file without resorting to `Media Type <https://www.iana.org/assignments/media-types/media-types.xhtml>`_ (previously known as MIME type) string
pulling the type from the file extension. 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<mjd_subQuat>` and :ref:`integration<mjd_quatIntegrate>` - Added analytic derivatives for quaternion :ref:`subtraction<mjd_subQuat>` and :ref:`integration<mjd_quatIntegrate>`
(rotation with an angular velocity). Derivatives are in the 3D tangent space. (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 - Added :ref:`mjv_connector` which has identical functionality to :ref:`mjv_makeConnector`, but with more convenient