Merge pull request #2849 from OSGeo/backport-2848-to-8.1

[Backport 8.1] Update docs About page to pull in license text from COPYING.

1 files changed, 4 insertions, 21 deletions

diff --git a/docs/source/about.rst b/docs/source/about.rst
index 365d1a04..f30d517b 100644
--- a/docs/source/about.rst
+++ b/docs/source/about.rst
@@ -22,25 +22,8 @@ License
 
 PROJ uses the MIT license. The software was initially released by the USGS in
 the public domain. When Frank Warmerdam took over the development of PROJ it
-was moved under the MIT license. The license is as follows:
-
-     Copyright (c) 2000, Frank Warmerdam
-
-     Permission is hereby granted, free of charge, to any person obtaining a
-     copy of this software and associated documentation files (the "Software"),
-     to deal in the Software without restriction, including without limitation
-     the rights to use, copy, modify, merge, publish, distribute, sublicense,
-     and/or sell copies of the Software, and to permit persons to whom the
-     Software is furnished to do so, subject to the following conditions:
-
-     The above copyright notice and this permission notice shall be included
-     in all copies or substantial portions of the Software.
-
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-     THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-     DEALINGS IN THE SOFTWARE.
+was moved under the MIT license. The full text of the license follows, and can
+also be found in the file ``COPYING``, at the top level of the source
+distribution package.
 
+.. literalinclude:: ../../COPYING