From bec180fcf07ef6c7ec4dd372fb56d9d41f9c557c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 3 Jan 2020 19:31:09 +0100 Subject: [PATCH] Doc++ --- doc/changelog.dox | 2 +- doc/namespaces.dox | 2 +- src/Magnum/Math/Intersection.h | 2 +- src/Magnum/MeshTools/GenerateNormals.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index af73c8dc7..6aa5069bc 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -106,7 +106,7 @@ See also: and retrieved from @ref Corrade::Utility::Configuration / @ref Corrade::Utility::Arguments - @ref Resource is now nothrow-movable and thus can be used with growable - @ref Containers::Array instances + @ref Corrade::Containers::Array instances @subsubsection changelog-latest-changes-gl GL library diff --git a/doc/namespaces.dox b/doc/namespaces.dox index fe1df0fba..b4da304b5 100644 --- a/doc/namespaces.dox +++ b/doc/namespaces.dox @@ -29,7 +29,7 @@ /** @namespace Magnum @brief Root namespace -Contains classes for interacting with OpenGL. +Base classes and typedefs. This library is built as part of Magnum by default. To use this library with CMake, find the `Magnum` package and link to the `Magnum::Magnum` target: diff --git a/src/Magnum/Math/Intersection.h b/src/Magnum/Math/Intersection.h index 1b2303fca..183841a05 100644 --- a/src/Magnum/Math/Intersection.h +++ b/src/Magnum/Math/Intersection.h @@ -143,7 +143,7 @@ template inline T planeLine(const Vector4& plane, const Vector3& @param p Starting point of the line @param r Direction of the line -@m_deprecated_since{201,10} Use @ref planeLine(const Vector4&, const Vector3&, const Vector3&) +@m_deprecated_since{2018,10} Use @ref planeLine(const Vector4&, const Vector3&, const Vector3&) together with @ref planeEquation(const Vector3&, const Vector3&, const Vector3&) instead. */ diff --git a/src/Magnum/MeshTools/GenerateNormals.h b/src/Magnum/MeshTools/GenerateNormals.h index 6622d69b5..5d73a461c 100644 --- a/src/Magnum/MeshTools/GenerateNormals.h +++ b/src/Magnum/MeshTools/GenerateNormals.h @@ -91,7 +91,7 @@ duplicates before returning. Expects that the position count is divisible by 3. from the input @p indices array, so you'll need to recombine them using @ref combineIndexedArrays() in order to have a single index array for both vertices and normals. Because this makes the usage more complex than - strictly neccessary, this function is deprecated in favor of + strictly necessary, this function is deprecated in favor of @ref generateFlatNormals(const Containers::StridedArrayView1D&). */ CORRADE_DEPRECATED("use generateFlatNormals(const Containers::StridedArrayView1D&) instead") std::pair, std::vector> MAGNUM_MESHTOOLS_EXPORT generateFlatNormals(const std::vector& indices, const std::vector& positions);