Explorar el Código

Merge topic 'doc-3.2-relnotes-fixup'

6d19ef9b Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
Brad King hace 11 años
padre
commit
8206e8b431
Se han modificado 1 ficheros con 6 adiciones y 6 borrados
  1. 6 6
      Help/release/3.2.rst

+ 6 - 6
Help/release/3.2.rst

@@ -131,12 +131,6 @@ Modules
 
 
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
 * The :module:`FindMPI` module learned to find MS-MPI on Windows.
 
 
-* The :module:`FindOpenGL` module no longer explicitly searches
-  for any dependency on X11 libraries with the :module:`FindX11`
-  module.  Such dependencies should not need to be explicit.
-  Applications using X11 APIs themselves should find and link
-  to X11 libraries explicitly.
-
 * The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
 * The :module:`FindOpenSSL` module now reports ``crypto`` and ``ssl``
   libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
   libraries separately in ``OPENSSL_CRYPTO_LIBRARY`` and
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
   ``OPENSSL_SSL_LIBRARY``, respectively, to allow applications to
@@ -231,6 +225,12 @@ Deprecated and Removed Features
   compatible.  If files were in a different encoding, including
   compatible.  If files were in a different encoding, including
   Latin 1, they will need to be converted.
   Latin 1, they will need to be converted.
 
 
+* The :module:`FindOpenGL` module no longer explicitly searches
+  for any dependency on X11 libraries with the :module:`FindX11`
+  module.  Such dependencies should not need to be explicit.
+  Applications using X11 APIs themselves should find and link
+  to X11 libraries explicitly.
+
 * The implementation of CMake now relies on some C++ compiler features which
 * The implementation of CMake now relies on some C++ compiler features which
   are not supported by some older compilers.  As a result, those old compilers
   are not supported by some older compilers.  As a result, those old compilers
   can no longer be used to build CMake itself.  CMake continues to be able to
   can no longer be used to build CMake itself.  CMake continues to be able to