Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0

10 files changed, 23 insertions, 23 deletions

diff --git a/docs/source/development/reference/deprecated.rst b/docs/source/development/reference/deprecated.rst
index c748d461..19f43b41 100644
--- a/docs/source/development/reference/deprecated.rst
+++ b/docs/source/development/reference/deprecated.rst
@@ -53,7 +53,7 @@ Example
 -------
 
 The following program reads latitude and longitude values in decimal
-degress, performs Mercator projection with a Clarke 1866 ellipsoid and a
+degrees, performs Mercator projection with a Clarke 1866 ellipsoid and a
 33° latitude of true scale and prints the projected cartesian values in
 meters:
 
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index c508a167..6d6d2280 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -134,7 +134,7 @@ to use EPSG numbers like this:
 The proj/nad/epsg file can be browsed and searched in a text editor for
 coordinate systems.  There are known to be problems with some coordinate
 systems, and any coordinate systems with odd axes, a non-greenwich prime
-meridian or other quirkyness are unlikely to work properly.  Caveat Emptor!
+meridian or other quirkiness are unlikely to work properly.  Caveat Emptor!
 
 How do I use 3 parameter and 7 parameter datum shifting
 --------------------------------------------------------------------------------
@@ -282,7 +282,7 @@ What is the rHEALPix projection and how can I use it?
 rHEALPix is a projection based on the HEALPix projection.  The implementation
 of rHEALPix uses the HEALPix projection.  The rHEALPix combines the peaks of
 the HEALPix into a square.  The square's position can be translated and rotated
-across the x-axis which is a noval approach for the rHEALPix projection.  The
+across the x-axis which is a novel approach for the rHEALPix projection.  The
 initial intention of using rHEALPix in the Spatial Computation Engine Science
 Collaboration Environment (SCENZGrid).
 
diff --git a/docs/source/references.rst b/docs/source/references.rst
index 320e401b..75d7f352 100644
--- a/docs/source/references.rst
+++ b/docs/source/references.rst
@@ -34,7 +34,7 @@ References
     <http://www.mygeodesy.id.au/documents/Molodensky%20V2.pdf>`__.
 
 .. [EberHewitt1979] L. E. Eber and R.P. Hewitt, 1979,
-   `Conversion algorithms for the CALCOFI station grid
+   `Conversion algorithms for the CalCOFI station grid
    <http://www.calcofi.org/publications/calcofireports/v20/Vol_20_Eber___Hewitt.pdf>`_,
    California Cooperative Oceanic Fisheries Investigations Reports 20:135-137.
 
@@ -90,7 +90,7 @@ References
 
 .. [LambersKolb2012] M. Lambers and A. Kolb, 2012,
    "Ellipsoidal Cube Maps for Accurate Rendering of Planetary-Scale
-   Terrain Data", Proc. Pacfic Graphics (Short Papers).
+   Terrain Data", Proc. Pacific Graphics (Short Papers).
 
 .. [ONeilLaubscher1976] E. M. O'Neill and R. E. Laubscher, 1976,
    "Extended Studies of a Quadrilateralized Spherical Cube Earth Data Base",
@@ -123,7 +123,7 @@ References
    Survey Review **23**\ (176), 88–93.
 
 .. [WeberMoore2013] E. D. Weber and T.J. Moore, 2013,
-   `Corrected Conversion Algorithms For The Calcofi Station Grid And Their
+   `Corrected Conversion Algorithms For The CalCOFI Station Grid And Their
    Implementation In Several Computer Languages
    <http://calcofi.org/publications/calcofireports/v54/Vol_54_Weber.pdf>`_,
    California Cooperative Oceanic Fisheries Investigations Reports 54.
diff --git a/docs/source/usage/apps/geod.rst b/docs/source/usage/apps/geod.rst
index 1e009283..e7056121 100644
--- a/docs/source/usage/apps/geod.rst
+++ b/docs/source/usage/apps/geod.rst
@@ -138,8 +138,8 @@ which gives the results:
 where the first two values are the azimuth from Boston to Portland,
 the back azimuth from Portland to Boston followed by the distance.
 
-An  example  of forward geodesic use is to use the Boston loca-
-tion and determine Portland's location by azimuth and distance:
+An  example  of forward geodesic use is to use the Boston location
+and determine Portland's location by azimuth and distance:
 
 ::
 
diff --git a/docs/source/usage/apps/proj.rst b/docs/source/usage/apps/proj.rst
index 424a0fef..6227047f 100644
--- a/docs/source/usage/apps/proj.rst
+++ b/docs/source/usage/apps/proj.rst
@@ -65,9 +65,9 @@ The  following  control parameters can appear in any order
        -s     This options reverses the order of the output from x-y or longitude-latitude to
               y-x or latitude-longitude.
 
-       -S     Causes estimation of meridinal and parallel scale factors, area scale factor and
+       -S     Causes estimation of meridional and parallel scale factors, area scale factor and
               angular distortion, and maximum and minimum scale factors to be listed between <>
-              for each input point. For conformal projections meridinal and parallel scales
+              for each input point. For conformal projections meridional and parallel scales
               factors will be equal and angular distortion zero. Equal area projections will
               have an area factor of 1.
 
@@ -122,10 +122,10 @@ is  also  used  for  supporting files like datum
 shift files.
 
 One or more files (processed in  left  to  right
-order)  specify  the source of data to be trans-
-formed.  A - will specify the location  of  pro-
-cessing  standard input.  If no files are speci-
-fied, the input is assumed  to  be  from  stdin.
+order)  specify  the source of data to be transformed.
+A - will specify the location  of  processing
+standard input.  If no files are specified,
+the input is assumed  to  be  from  stdin.
 For ASCII input data the two data values must be
 in the first two white  space  separated  fields
 and  when  both  input  and output are ASCII all
@@ -135,8 +135,8 @@ to the output line.
 Input  geographic  data (longitude and latitude)
 must be in DMS format and input  cartesian  data
 must  be  in units consistent with the ellipsoid
-major axis or sphere radius units.  Output  geo-
-graphic  coordinates  will  be in DMS (if the -w
+major axis or sphere radius units.  Output
+geographic  coordinates  will  be in DMS (if the -w
 switch is not employed) and  precise  to  0.001"
 with  trailing, zero-valued minute-second fields
 deleted.
@@ -154,8 +154,8 @@ The following script
      +45.25919444444    111d30'000w
      EOF
 
-will perform UTM forward projection with a stan-
-dard  UTM  central  meridian  nearest  longitude
+will perform UTM forward projection with a standard
+UTM  central  meridian  nearest  longitude
 112W.  The geographic values of this example are
 equivalent and  meant  as  examples  of  various
 forms  of  DMS  input.  The x-y output data will
diff --git a/docs/source/usage/operations/projections/cass.rst b/docs/source/usage/operations/projections/cass.rst
index 83f8c2ce..4111a2ee 100644
--- a/docs/source/usage/operations/projections/cass.rst
+++ b/docs/source/usage/operations/projections/cass.rst
@@ -106,7 +106,7 @@ Forward projection
 
   y = M(\phi) - M(\phi_0) + N \tan(\phi)(\frac{A^2}{2} + (5-T+6C)\frac{A^4}{24})
 
-and M() is the meridionial distance function.
+and M() is the meridional distance function.
 
 Inverse projection
 ------------------
diff --git a/docs/source/usage/operations/projections/geos.rst b/docs/source/usage/operations/projections/geos.rst
index 28b96736..670985ae 100644
--- a/docs/source/usage/operations/projections/geos.rst
+++ b/docs/source/usage/operations/projections/geos.rst
@@ -10,7 +10,7 @@ Geostationary Satellite View
 +---------------------+----------------------------------------------------------+
 | **Defined area**    | Global                                                   |
 +---------------------+----------------------------------------------------------+
-| **Implemented by**  | Gerald I. Evenden and Martin Raspaud$                    |
+| **Implemented by**  | Gerald I. Evenden and Martin Raspaud                     |
 +---------------------+----------------------------------------------------------+
 | **Options**                                                                    |
 +---------------------+----------------------------------------------------------+
diff --git a/docs/source/usage/operations/projections/merc.rst b/docs/source/usage/operations/projections/merc.rst
index 64ba98a4..8895abc8 100644
--- a/docs/source/usage/operations/projections/merc.rst
+++ b/docs/source/usage/operations/projections/merc.rst
@@ -53,7 +53,7 @@ Example using scaling factor::
     12545706.61     2746073.80
 
 
-Note that ``+lat_ts`` and ``+k_0`` are mutually excusive.
+Note that ``+lat_ts`` and ``+k_0`` are mutually exclusive.
 If used together, ``+lat_ts`` takes precedence over ``+k_0``.
 
 Mathematical definition
diff --git a/docs/source/usage/operations/projections/rhealpix.rst b/docs/source/usage/operations/projections/rhealpix.rst
index 5808cfaa..b8ed4f5f 100644
--- a/docs/source/usage/operations/projections/rhealpix.rst
+++ b/docs/source/usage/operations/projections/rhealpix.rst
@@ -28,7 +28,7 @@ rHEALPix
 rHEALPix is a projection based on the HEALPix projection. The implementation of
 rHEALPix uses the HEALPix projection. The rHEALPix combines the peaks of the
 HEALPix into a square. The square's position can be translated and rotated across
-the x-axis which is a noval approach for the rHEALPix projection. The initial
+the x-axis which is a novel approach for the rHEALPix projection. The initial
 intention of using rHEALPix in the Spatial Computation Engine Science Collaboration
 Environment (SCENZGrid).
 
diff --git a/docs/source/usage/operations/projections/tmerc.rst b/docs/source/usage/operations/projections/tmerc.rst
index 03aa2830..1fc0cd7e 100644
--- a/docs/source/usage/operations/projections/tmerc.rst
+++ b/docs/source/usage/operations/projections/tmerc.rst
@@ -74,7 +74,7 @@ The formulas describing the Transverse Mercator are all taken from Evenden's [Ev
 
 :math:`k_0` is the scale factor at the natural origin (on the central meridian). It can be set with ``+k_0``.
 
-:math:`M(\phi)` is the meridianal distance.
+:math:`M(\phi)` is the meridional distance.
 
 Spherical form
 **************