Merge branch 'master' into psconvert-no-file-dup

doc/rst/source/install.rst

@@ -22,10 +22,10 @@ for compiling GMT source package (either stable release or development version).
 Windows
 -------
 
-We provide 32 and 64 bit standalone installers (e.g.,
+We provide 64 bit standalone installer (e.g.,
 gmt-6.x.x-win64.exe) in the `GitHub
 repository <https://github.com/GenericMappingTools/gmt/releases>`__. The
-installers come with GDAL, FFmpeg, and Ghostscript pre-installed.
+installer come with GDAL, FFmpeg, and Ghostscript pre-installed.
 
 In addition to the GMT installer, you also need to download and install
 `GraphicsMagick <http://www.graphicsmagick.org/>`__ if you want to

doc/rst/source/supplements/gsfml/fzblender.rst

@@ -177,7 +177,7 @@ coordinates for the left/right bounds along the FZ.
 Filtering
 ---------
 
-Filtering always runs of of data near the FZ end points.  We utilize :doc:`filter1d </filter1d>` with its
+Filtering always runs of data near the FZ end points.  We utilize :doc:`filter1d </filter1d>` with its
 **-E** option to extend the result to the end.  Because we are filtering data columns that may
 contain a strong trend (e.g., longitude versus along-track distance) we first remove such
 linear trends before filtering, then restore the trends before blending.  However, you should

src/gmtswitch

@@ -113,13 +113,13 @@ Before we can allow for switching you must prepare your environment.
 In your .cshrc or .tcshrc file:
 
 Change your path statement. Make sure it includes $home/this_gmt/bin
-If $home contains spaces places the the above within double quotes.
+If $home contains spaces places the above within double quotes.
 
 2. BASH USERS
 (re)Place these lines in your .profile file:
 
 Change your PATH statement. Make sure it includes $home/this_gmt/bin
-If $home contains spaces places the the above within double quotes.
+If $home contains spaces places the above within double quotes.
 
 3. GitHub USERS:
 You will have to manually add the path to the GMT directory since

src/mgd77/mgd77.c

@@ -5574,7 +5574,7 @@ int MGD77_igrf10syn (struct GMT_CTRL *GMT, int isv, double date, int itype, doub
 			t = 1.;
 			tc = 0.;
 		}
-		ll = 3255;		/* nth position corresponding to first coeff of 2020 (must always point to pen-ultimate set) */
+		ll = 3450;		/* nth position corresponding to first coeff of 2025 (must always point to pen-ultimate set) */
 		nmx = 13;
 		nc = nmx * (nmx + 2);
 		kmx = (nmx + 1) * (nmx + 2) / 2;