aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-03-10 18:09:53 +0100
committerKristian Evers <kristianevers@gmail.com>2020-03-11 09:22:32 +0100
commitaa71df059f2eee4f33f0b137948c1f71d8260b88 (patch)
tree645047b9fe9307f75d24e1ba6abee9aa55016dea
parentba67e2c86d64a73e9438a7a979185a10026544ef (diff)
downloadPROJ-aa71df059f2eee4f33f0b137948c1f71d8260b88.tar.gz
PROJ-aa71df059f2eee4f33f0b137948c1f71d8260b88.zip
Doc: use 'ellipsoidal' to refer to the ellipsoidal formulation (to be opposed to the spherical one)
Instead of 'elliptical'. Was suggested by @cffk in https://github.com/OSGeo/PROJ/pull/2030#issuecomment-596132341 An elliptical projection is a projection whose global shape fits inside an ellipsoid, like Mollweide. At least according to https://www.merriam-webster.com/dictionary/elliptical%20projection and https://en.wikipedia.org/wiki/Mollweide_projection
-rw-r--r--docs/source/operations/projections/aea.rst2
-rw-r--r--docs/source/operations/projections/aeqd.rst4
-rw-r--r--docs/source/operations/projections/alsk.rst2
-rw-r--r--docs/source/operations/projections/bonne.rst2
-rw-r--r--docs/source/operations/projections/calcofi.rst2
-rw-r--r--docs/source/operations/projections/cass.rst6
-rw-r--r--docs/source/operations/projections/cea.rst2
-rw-r--r--docs/source/operations/projections/eqdc.rst2
-rw-r--r--docs/source/operations/projections/geos.rst2
-rw-r--r--docs/source/operations/projections/gn_sinu.rst2
-rw-r--r--docs/source/operations/projections/gs48.rst2
-rw-r--r--docs/source/operations/projections/gs50.rst2
-rw-r--r--docs/source/operations/projections/healpix.rst2
-rw-r--r--docs/source/operations/projections/imw_p.rst2
-rw-r--r--docs/source/operations/projections/krovak.rst2
-rw-r--r--docs/source/operations/projections/labrd.rst2
-rw-r--r--docs/source/operations/projections/laea.rst2
-rw-r--r--docs/source/operations/projections/lagrng.rst2
-rw-r--r--docs/source/operations/projections/lcc.rst2
-rw-r--r--docs/source/operations/projections/lcca.rst2
-rw-r--r--docs/source/operations/projections/leac.rst2
-rw-r--r--docs/source/operations/projections/lee_os.rst2
-rw-r--r--docs/source/operations/projections/lsat.rst2
-rw-r--r--docs/source/operations/projections/mbtfps.rst2
-rw-r--r--docs/source/operations/projections/merc.rst6
-rw-r--r--docs/source/operations/projections/mil_os.rst2
-rw-r--r--docs/source/operations/projections/misrsom.rst2
-rw-r--r--docs/source/operations/projections/ob_tran.rst2
-rw-r--r--docs/source/operations/projections/omerc.rst2
-rw-r--r--docs/source/operations/projections/poly.rst2
-rw-r--r--docs/source/operations/projections/qsc.rst2
-rw-r--r--docs/source/operations/projections/rhealpix.rst2
-rw-r--r--docs/source/operations/projections/rouss.rst2
-rw-r--r--docs/source/operations/projections/sinu.rst2
-rw-r--r--docs/source/operations/projections/stere.rst2
-rw-r--r--docs/source/operations/projections/sterea.rst2
-rw-r--r--docs/source/operations/projections/tmerc.rst8
-rw-r--r--docs/source/operations/projections/utm.rst2
38 files changed, 46 insertions, 46 deletions
diff --git a/docs/source/operations/projections/aea.rst b/docs/source/operations/projections/aea.rst
index 70b3e75e..47a24251 100644
--- a/docs/source/operations/projections/aea.rst
+++ b/docs/source/operations/projections/aea.rst
@@ -6,7 +6,7 @@ Albers Equal Area
+---------------------+----------------------------------------------------------+
| **Classification** | Conic |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/aeqd.rst b/docs/source/operations/projections/aeqd.rst
index 1bf15bb8..5c85be06 100644
--- a/docs/source/operations/projections/aeqd.rst
+++ b/docs/source/operations/projections/aeqd.rst
@@ -6,7 +6,7 @@ Azimuthal Equidistant
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Alias** | aeqd |
+---------------------+----------------------------------------------------------+
@@ -33,7 +33,7 @@ Options
.. option:: +guam
- Use Guam elliptical formulas. Only accurate near the Island of Guam
+ Use Guam ellipsoidal formulas. Only accurate near the Island of Guam
(:math:`\lambda\approx 144.5^{\circ}`, :math:`\phi\approx 13.5^{\circ}`)
.. include:: ../options/k_0.rst
diff --git a/docs/source/operations/projections/alsk.rst b/docs/source/operations/projections/alsk.rst
index 5c0954f2..45e628f5 100644
--- a/docs/source/operations/projections/alsk.rst
+++ b/docs/source/operations/projections/alsk.rst
@@ -6,7 +6,7 @@ Modified Stererographics of Alaska
+---------------------+----------------------------------------------------------+
| **Classification** | Modified azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Alaska |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/bonne.rst b/docs/source/operations/projections/bonne.rst
index cb626b13..1b81237b 100644
--- a/docs/source/operations/projections/bonne.rst
+++ b/docs/source/operations/projections/bonne.rst
@@ -7,7 +7,7 @@ Bonne (Werner lat_1=90)
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/calcofi.rst b/docs/source/operations/projections/calcofi.rst
index fb0cd199..829c5060 100644
--- a/docs/source/operations/projections/calcofi.rst
+++ b/docs/source/operations/projections/calcofi.rst
@@ -10,7 +10,7 @@ California Cooperative Oceanic Fisheries Investigations program, known as CalCOF
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Only valid for the west coast of USA and Mexico |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/cass.rst b/docs/source/operations/projections/cass.rst
index 9cd78164..a263575e 100644
--- a/docs/source/operations/projections/cass.rst
+++ b/docs/source/operations/projections/cass.rst
@@ -9,7 +9,7 @@ Although the Cassini projection has been largely replaced by the Transverse Merc
+---------------------+-------------------------------------------------------------------------+
| **Classification** | Transverse and oblique cylindrical |
+---------------------+-------------------------------------------------------------------------+
-| **Available forms** | Forward and inverse, Spherical and Elliptical |
+| **Available forms** | Forward and inverse, Spherical and ellipsoidal |
+---------------------+-------------------------------------------------------------------------+
| **Defined area** | Global, but best used near the central meridian with long, narrow areas |
+---------------------+-------------------------------------------------------------------------+
@@ -100,8 +100,8 @@ Inverse projection
\lambda = \arctan2(\tan(x), \cos(y+\phi_0))
-Elliptical form
-===============
+Ellipsoidal form
+================
Forward projection
------------------
diff --git a/docs/source/operations/projections/cea.rst b/docs/source/operations/projections/cea.rst
index e0d3b841..3799fbcb 100644
--- a/docs/source/operations/projections/cea.rst
+++ b/docs/source/operations/projections/cea.rst
@@ -7,7 +7,7 @@ Equal Area Cylindrical
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/eqdc.rst b/docs/source/operations/projections/eqdc.rst
index 1d9ff3a3..881a9282 100644
--- a/docs/source/operations/projections/eqdc.rst
+++ b/docs/source/operations/projections/eqdc.rst
@@ -7,7 +7,7 @@ Equidistant Conic
+---------------------+----------------------------------------------------------+
| **Classification** | Conic |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, elliptical projection |
+| **Available forms** | Forward and inverse, ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/geos.rst b/docs/source/operations/projections/geos.rst
index e825104f..9b8bf21b 100644
--- a/docs/source/operations/projections/geos.rst
+++ b/docs/source/operations/projections/geos.rst
@@ -10,7 +10,7 @@ scanning angle intervals.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/gn_sinu.rst b/docs/source/operations/projections/gn_sinu.rst
index 9aebf68c..a42e1d14 100644
--- a/docs/source/operations/projections/gn_sinu.rst
+++ b/docs/source/operations/projections/gn_sinu.rst
@@ -7,7 +7,7 @@ General Sinusoidal Series
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/gs48.rst b/docs/source/operations/projections/gs48.rst
index 07f1978b..7a721299 100644
--- a/docs/source/operations/projections/gs48.rst
+++ b/docs/source/operations/projections/gs48.rst
@@ -7,7 +7,7 @@ Mod. Stererographics of 48 U.S.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | The lower 48 states of the U.S. |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/gs50.rst b/docs/source/operations/projections/gs50.rst
index 7d5965fa..0afdd05c 100644
--- a/docs/source/operations/projections/gs50.rst
+++ b/docs/source/operations/projections/gs50.rst
@@ -7,7 +7,7 @@ Mod. Stererographics of 50 U.S.
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | All 50 states of the U.S. |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/healpix.rst b/docs/source/operations/projections/healpix.rst
index cdefa522..41bc10db 100644
--- a/docs/source/operations/projections/healpix.rst
+++ b/docs/source/operations/projections/healpix.rst
@@ -6,7 +6,7 @@ HEALPix
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/imw_p.rst b/docs/source/operations/projections/imw_p.rst
index 8cc793a8..1dad270e 100644
--- a/docs/source/operations/projections/imw_p.rst
+++ b/docs/source/operations/projections/imw_p.rst
@@ -7,7 +7,7 @@ International Map of the World Polyconic
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudoconical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/krovak.rst b/docs/source/operations/projections/krovak.rst
index 1473a5b6..e8313e7b 100644
--- a/docs/source/operations/projections/krovak.rst
+++ b/docs/source/operations/projections/krovak.rst
@@ -7,7 +7,7 @@ Krovak
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but more accurate around Czechoslovakia |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/labrd.rst b/docs/source/operations/projections/labrd.rst
index 670a5257..98a30556 100644
--- a/docs/source/operations/projections/labrd.rst
+++ b/docs/source/operations/projections/labrd.rst
@@ -7,7 +7,7 @@ Laborde
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but more accurate around Madagascar |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/laea.rst b/docs/source/operations/projections/laea.rst
index bd2a7255..5434564c 100644
--- a/docs/source/operations/projections/laea.rst
+++ b/docs/source/operations/projections/laea.rst
@@ -7,7 +7,7 @@ Lambert Azimuthal Equal Area
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/lagrng.rst b/docs/source/operations/projections/lagrng.rst
index 1a492af5..b96fcd32 100644
--- a/docs/source/operations/projections/lagrng.rst
+++ b/docs/source/operations/projections/lagrng.rst
@@ -7,7 +7,7 @@ Lagrange
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/lcc.rst b/docs/source/operations/projections/lcc.rst
index d3ba026f..8002fa31 100644
--- a/docs/source/operations/projections/lcc.rst
+++ b/docs/source/operations/projections/lcc.rst
@@ -20,7 +20,7 @@ justifies adding this otherwise non-standard projection.
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal conic |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection.|
+| **Available forms** | Forward and inverse, spherical and ellipsoidal .|
| | One or two standard parallels (1SP and 2SP). |
| | "LCC 2SP Michigan" form can be used by setting |
| | `+k_0` parameter to specify elliposid scale. |
diff --git a/docs/source/operations/projections/lcca.rst b/docs/source/operations/projections/lcca.rst
index 8ca41e93..f97c81b4 100644
--- a/docs/source/operations/projections/lcca.rst
+++ b/docs/source/operations/projections/lcca.rst
@@ -7,7 +7,7 @@ Lambert Conformal Conic Alternative
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/leac.rst b/docs/source/operations/projections/leac.rst
index e37c0de0..7cc0f2d2 100644
--- a/docs/source/operations/projections/leac.rst
+++ b/docs/source/operations/projections/leac.rst
@@ -7,7 +7,7 @@ Lambert Equal Area Conic
+---------------------+----------------------------------------------------------+
| **Classification** | Conical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/lee_os.rst b/docs/source/operations/projections/lee_os.rst
index f7878898..3f9248ac 100644
--- a/docs/source/operations/projections/lee_os.rst
+++ b/docs/source/operations/projections/lee_os.rst
@@ -7,7 +7,7 @@ Lee Oblated Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/lsat.rst b/docs/source/operations/projections/lsat.rst
index 4da0023a..d7b545a8 100644
--- a/docs/source/operations/projections/lsat.rst
+++ b/docs/source/operations/projections/lsat.rst
@@ -7,7 +7,7 @@ Space oblique for LANDSAT
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/mbtfps.rst b/docs/source/operations/projections/mbtfps.rst
index 485a9c59..34217e71 100644
--- a/docs/source/operations/projections/mbtfps.rst
+++ b/docs/source/operations/projections/mbtfps.rst
@@ -7,7 +7,7 @@ McBryde-Thomas Flat-Polar Sinusoidal
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/merc.rst b/docs/source/operations/projections/merc.rst
index ae5d136a..063d02dc 100644
--- a/docs/source/operations/projections/merc.rst
+++ b/docs/source/operations/projections/merc.rst
@@ -12,7 +12,7 @@ The projection is conformal which makes it suitable for navigational purposes.
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but best used near the equator |
+---------------------+----------------------------------------------------------+
@@ -112,10 +112,10 @@ Inverse projection
\phi = \frac{\pi}{2} - 2 \arctan \left[ e^{-y/k_0} \right]
-Elliptical form
+Ellisoidal form
***************
-For the elliptical form of the projection we introduce the scaling factor:
+For the ellipsoidal form of the projection we introduce the scaling factor:
.. math::
diff --git a/docs/source/operations/projections/mil_os.rst b/docs/source/operations/projections/mil_os.rst
index 37c4a471..dbf8488f 100644
--- a/docs/source/operations/projections/mil_os.rst
+++ b/docs/source/operations/projections/mil_os.rst
@@ -7,7 +7,7 @@ Miller Oblated Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/misrsom.rst b/docs/source/operations/projections/misrsom.rst
index 3f9ba832..f04af6b3 100644
--- a/docs/source/operations/projections/misrsom.rst
+++ b/docs/source/operations/projections/misrsom.rst
@@ -7,7 +7,7 @@ Space oblique for MISR
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/ob_tran.rst b/docs/source/operations/projections/ob_tran.rst
index 0140210f..7e7242ff 100644
--- a/docs/source/operations/projections/ob_tran.rst
+++ b/docs/source/operations/projections/ob_tran.rst
@@ -7,7 +7,7 @@ General Oblique Transformation
+---------------------+----------------------------------------------------------+
| **Classification** | Cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/omerc.rst b/docs/source/operations/projections/omerc.rst
index ba2edf45..cf9a1af1 100644
--- a/docs/source/operations/projections/omerc.rst
+++ b/docs/source/operations/projections/omerc.rst
@@ -10,7 +10,7 @@ gap between the Mercator and the Transverse Mercator projections.
+---------------------+----------------------------------------------------------+
| **Classification** | Conformal cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but reasonably accurate only within 15 degrees |
| | of the oblique central line |
diff --git a/docs/source/operations/projections/poly.rst b/docs/source/operations/projections/poly.rst
index 12c64927..67815cca 100644
--- a/docs/source/operations/projections/poly.rst
+++ b/docs/source/operations/projections/poly.rst
@@ -7,7 +7,7 @@ Polyconic (American)
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudoconical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/qsc.rst b/docs/source/operations/projections/qsc.rst
index ce7dd57d..d7171fb4 100644
--- a/docs/source/operations/projections/qsc.rst
+++ b/docs/source/operations/projections/qsc.rst
@@ -7,7 +7,7 @@ Quadrilateralized Spherical Cube
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, elliptical projection |
+| **Available forms** | Forward and inverse, ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/rhealpix.rst b/docs/source/operations/projections/rhealpix.rst
index caca5c7b..5a9b99b5 100644
--- a/docs/source/operations/projections/rhealpix.rst
+++ b/docs/source/operations/projections/rhealpix.rst
@@ -6,7 +6,7 @@ rHEALPix
+---------------------+----------------------------------------------------------+
| **Classification** | Miscellaneous |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/rouss.rst b/docs/source/operations/projections/rouss.rst
index 6abcc200..08fc6e36 100644
--- a/docs/source/operations/projections/rouss.rst
+++ b/docs/source/operations/projections/rouss.rst
@@ -7,7 +7,7 @@ Roussilhe Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/sinu.rst b/docs/source/operations/projections/sinu.rst
index 7f9f2681..6bd059fb 100644
--- a/docs/source/operations/projections/sinu.rst
+++ b/docs/source/operations/projections/sinu.rst
@@ -7,7 +7,7 @@ Sinusoidal (Sanson-Flamsteed)
+---------------------+----------------------------------------------------------+
| **Classification** | Pseudocylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/stere.rst b/docs/source/operations/projections/stere.rst
index f88e83a7..759ed935 100644
--- a/docs/source/operations/projections/stere.rst
+++ b/docs/source/operations/projections/stere.rst
@@ -7,7 +7,7 @@ Stereographic
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/sterea.rst b/docs/source/operations/projections/sterea.rst
index 7b17e1ef..80666d06 100644
--- a/docs/source/operations/projections/sterea.rst
+++ b/docs/source/operations/projections/sterea.rst
@@ -7,7 +7,7 @@ Oblique Stereographic Alternative
+---------------------+----------------------------------------------------------+
| **Classification** | Azimuthal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, spherical and elliptical projection |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global |
+---------------------+----------------------------------------------------------+
diff --git a/docs/source/operations/projections/tmerc.rst b/docs/source/operations/projections/tmerc.rst
index d79d99e0..2866517b 100644
--- a/docs/source/operations/projections/tmerc.rst
+++ b/docs/source/operations/projections/tmerc.rst
@@ -9,7 +9,7 @@ The transverse Mercator projection in its various forms is the most widely used
+---------------------+----------------------------------------------------------+
| **Classification** | Transverse and oblique cylindrical |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, Spherical and Elliptical |
+| **Available forms** | Forward and inverse, spherical and ellipsoidal |
+---------------------+----------------------------------------------------------+
| **Defined area** | Global, but reasonably accurate only within 15 degrees |
| | of the central meridian |
@@ -79,7 +79,7 @@ Parameters
.. versionadded:: 6.0.0
- Use the algorithm described in section "Elliptical Form" below.
+ Use the algorithm described in section "Ellipsoidal Form" below.
It is faster than the default algorithm, but also diverges faster
as the distance from the central meridian increases.
@@ -147,8 +147,8 @@ Inverse projection
\lambda = \arctan(\frac{\sinh x'}{\cos D})
-Elliptical form
-***************
+Ellipsoidal form
+****************
The formulas below describe the algorithm used when giving the
:option:`+approx` option. They are originally from :cite:`Snyder1987`,
diff --git a/docs/source/operations/projections/utm.rst b/docs/source/operations/projections/utm.rst
index e0ea89e4..b45dafc1 100644
--- a/docs/source/operations/projections/utm.rst
+++ b/docs/source/operations/projections/utm.rst
@@ -11,7 +11,7 @@ longigude.
+---------------------+----------------------------------------------------------+
| **Classification** | Transverse cylindrical, conformal |
+---------------------+----------------------------------------------------------+
-| **Available forms** | Forward and inverse, Elliptical only |
+| **Available forms** | Forward and inverse, ellipsoidal only |
+---------------------+----------------------------------------------------------+
| **Defined area** | Within the used zone, but transformations of coordinates |
| | in adjacent zones can be expected to be accurate as well |