Fixes several typos (#520)

Author: seisman

cmake/dist/CMakeLists.txt

@@ -168,7 +168,7 @@ if (WIN32 AND NOT CYGWIN)
 	endif (OMP_DLL_LOC)
 
 	if (WIN32 AND GMTMEX_PATH) 
-		# Install the gmtmex on Windows. Its location is controled by GMTMEX_PATH set in ConfigUser.cmake
+		# Install the gmtmex on Windows. Its location is controlled by GMTMEX_PATH set in ConfigUser.cmake
 		if (BITAGE EQUAL 64)
 			install (PROGRAMS "${GMTMEX_PATH}/gmtmex.mexw64" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
 		else ()

cmake/modules/ConfigureChecks.cmake

@@ -178,7 +178,7 @@ if (WIN32)
 endif (WIN32)
 
 # Check if these functions are declared (might not be the case although they
-# are build-in)
+# are built-in)
 check_symbol_exists (strdup    string.h DECLARED_STRDUP)
 check_symbol_exists (strsep    string.h DECLARED_STRSEP)
 

cmake/modules/NSIS.template.in

@@ -1096,7 +1096,7 @@ Section "Uninstall"
 @CPACK_NSIS_DELETE_ICONS@
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -1115,7 +1115,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   secondStartMenuDeleteLoop:

doc/rst/source/GMT_Docs.rst

@@ -1516,7 +1516,7 @@ The upper uses Gregorian weeks (which start at the day chosen by
     gmt set FORMAT_DATE_MAP u FORMAT_TIME_PRIMARY_MAP Character \
            FORMAT_TIME_SECONDARY_MAP full FONT_ANNOT_PRIMARY +9p
     gmt basemap -R1969-7-21T/1969-8-9T/0/1 -JX5i/0.2i -Bpa1K -Bsa1U -BS -P -K > GMT_-B_time5.ps
-    gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Chararacter
+    gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Character
     gmt basemap -R -J -Bpa3Kf1k -Bsa1r -BS -O -Y0.65i >> GMT_-B_time5.ps
 
 .. _cartesian_axis5:

doc/rst/source/GMT_Docs_classic.rst

@@ -1522,7 +1522,7 @@ The upper uses Gregorian weeks (which start at the day chosen by
     gmt set FORMAT_DATE_MAP u FORMAT_TIME_PRIMARY_MAP Character \
            FORMAT_TIME_SECONDARY_MAP full FONT_ANNOT_PRIMARY +9p
     gmt psbasemap -R1969-7-21T/1969-8-9T/0/1 -JX5i/0.2i -Bpa1K -Bsa1U -BS -P -K > GMT_-B_time5.ps
-    gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Chararacter
+    gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Character
     gmt psbasemap -R -J -Bpa3Kf1k -Bsa1r -BS -O -Y0.65i >> GMT_-B_time5.ps
 
 .. _cartesian_axis5:

doc/rst/source/grdmask.rst

@@ -116,7 +116,7 @@ Optional Arguments
     perform a rectangular search where all nodes within ±\ *xlim* and
     ±\ *ylim* of a data point will be considered inside.
     One can also achieve the rectangular selection effect by using the **-S**\ *<n_cells>c* form.
-    Here *n_cells* means the number of cells arround each data point. As an example, **-S0c** means
+    Here *n_cells* means the number of cells around each data point. As an example, **-S0c** means
     that only the cell where point lies is masked, **-S1c** masks one cell beyond that
     (i.e. makes a 3x3 neighborhood), and so on.
 

doc/rst/source/julia_wrapper.rst

@@ -253,7 +253,7 @@ Definition of the *daset type*.
         comment::Array{Any,1}   # Cell array with any comments
     end
 
-Definition of the *cpt type* that holds a CPT paltette.
+Definition of the *cpt type* that holds a CPT palette.
 
 .. _ps-type:
 

doc/rst/source/solar_notes.rst_

@@ -1,7 +1,7 @@
 References
 ----------
 
-Code from the Excell spreadshits in http://www.esrl.noaa.gov/gmd/grad/solcalc/calcdetails.html
+Code from the Excel Spreadsheets in http://www.esrl.noaa.gov/gmd/grad/solcalc/calcdetails.html
 
 
 Notes

doc/rst/source/supplements/spotter/polespotter.rst

@@ -189,7 +189,7 @@ Examples
 
 To create a polespotting image from the abyssal hill and fracture zone fabric
 (lon,lat) data in the files hills.txt and fractures.txt, on a 1x1 degree grid
-for the norhern hemisphere, sampling the great circles every 10 km, and also
+for the northern hemisphere, sampling the great circles every 10 km, and also
 dump the great circles to standard output, try
 
    ::

doc/rst/source/surface.rst

@@ -131,7 +131,7 @@ Optional Arguments
     than *max_radius* away from a data constraint is set to NaN [no masking].
     Append a distance unit (see UNITS) if needed.
     One can also select the nodes to mask by using the **-M**\ *<n_cells>c* form.
-    Here *n_cells* means the number of cells arround the node controled by a data point. As an example
+    Here *n_cells* means the number of cells around the node controlled by a data point. As an example
     **-M0c** means that only the cell where point lies is filled, **-M1c** keeps one cell
     beyond that (i.e. makes a 3x3 neighborhood), and so on.
 

doc/scripts/GMT_-B_time5.sh

@@ -2,6 +2,6 @@
 gmt begin GMT_-B_time5 ps
 gmt set FORMAT_DATE_MAP u FORMAT_TIME_PRIMARY_MAP Character FORMAT_TIME_SECONDARY_MAP full FONT_ANNOT_PRIMARY +9p
 gmt basemap -R1969-7-21T/1969-8-9T/0/1 -JX5i/0.2i -Bpa1K -Bsa1U -BS 
-gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Chararacter
+gmt set FORMAT_DATE_MAP o TIME_WEEK_START Sunday FORMAT_TIME_SECONDARY_MAP Character
 gmt basemap -Bpa3Kf1k -Bsa1r -BS -Y0.65i 
 gmt end 

doc/scripts/GMT_App_M_1a.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 #	Makes the insets for Appendix M(cpt)
-#	[skip srtm which is just a special verison of dem2]
+#	[skip srtm which is just a special version of dem2]
 #
 # Use the knowledge that we need 3 pages: First two pages are the
 # 44 original GMT 5 CPTs and the last page has 17 scientific colormaps

doc/scripts/GMT_App_M_1b.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 #	Makes the insets for Appendix M(cpt)
-#	[skip srtm which is just a special verison of dem2]
+#	[skip srtm which is just a special version of dem2]
 # Use the knowledge that we need 2 pages.
 # 44 original GMT 5 CPTs and the last page has 17 scientific colormaps
 # from Fabio [www.fabiocrameri.ch/visualisation]

doc/scripts/GMT_App_M_1c.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 #	Makes the insets for Appendix M(cpt)
-#	[skip srtm which is just a special verison of dem2]
+#	[skip srtm which is just a special version of dem2]
 # Use the knowledge that we need 3 pages.
 # 44 original GMT 5 CPTs and the last page has 18 scientific colormaps
 # from Fabio [www.fabiocrameri.ch/visualisation]

src/CMakeLists.txt

@@ -171,7 +171,7 @@ if (OPENMP_FOUND AND GMT_OPENMP)
 		CACHE INTERNAL "OPENMP config message")
 	if (WIN32 AND OMP_DLL_LOC)
 		# UGLY AND RISKY PATCH FOR THE CPACK BUG OF NOT COPYING THE OMP DLL. THIS PATCH RELIES
-		# ON THE SETING OF THE OMP_DLL_LOC VARIABLE IN ConfigUser.cmake. MINE HAS:
+		# ON THE SETTING OF THE OMP_DLL_LOC VARIABLE IN ConfigUser.cmake. MINE HAS:
 		# set (OMP_DLL_LOC "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/redist/x64/Microsoft.VC120.OPENMP/vcomp120.dll")
 		install(FILES ${OMP_DLL_LOC} DESTINATION bin COMPONENT Libraries)
 	endif (WIN32 AND OMP_DLL_LOC)

src/PSL_strings.h

@@ -1027,7 +1027,7 @@ static char *PSL_prologue_str =
 "% Translate and memorize advance\n"
 "/PSL_xorig 0 def /PSL_yorig 0 def\n"
 "/TM {2 copy T PSL_yorig add /PSL_yorig edef PSL_xorig add /PSL_xorig edef}!\n"
-"% To reencode one font with the provided encoding vector\n"
+"% To re-encode one font with the provided encoding vector\n"
 "/PSL_reencode {findfont dup length dict begin\n"
 "  {1 index /FID ne {def}{pop pop} ifelse} forall\n"
 "  exch /Encoding edef currentdict end definefont pop\n"

src/blockmean.c

@@ -225,7 +225,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMEAN_CTRL *Ctrl, struct G
 	}
 	if (Ctrl->G.active) {	/* Make sure -A sets valid fields, some require -E */
 		if (!Ctrl->E.active && (Ctrl->A.selected[1] || Ctrl->A.selected[2] || Ctrl->A.selected[3])) {
-			/* -E is required if -A specifices l or h */
+			/* -E is required if -A specifies l or h */
 			Ctrl->E.active = true;			/* Extended report with standard deviation, min, and max in cols 4-6 */
 		}
 		if (GMT->parent->external && !Ctrl->A.active) {		/* From externals let -G equals -Az */
@@ -247,11 +247,11 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMEAN_CTRL *Ctrl, struct G
 			Ctrl->A.selected[0] = true, Ctrl->A.n_selected = 1;
 		else {	/* Make sure -A choices are valid and that -E is set if extended fields are selected */
 			if (!Ctrl->E.active && (Ctrl->A.selected[1] || Ctrl->A.selected[2] || Ctrl->A.selected[3])) {
-				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifices s, l, or h.  -E was added.\n");
+				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifies s, l, or h.  -E was added.\n");
 				Ctrl->E.active = true; 
 			}
 			if (Ctrl->A.selected[4] && !Ctrl->W.weighted[GMT_OUT]) {
-				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifices w.\n");
+				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifies w.\n");
 				n_errors++; 
 			}
 		}
@@ -452,7 +452,7 @@ int GMT_blockmean (void *V_API, int mode, void *args) {
 
 	w_col = gmt_get_cols (GMT, GMT_OUT) - 1;	/* Index of weight column (the last output column) */
 	n_cells_filled = 0;				/* Number of blocks with values */
-	fcol[4] = (unsigned int)w_col;				/* Since we dont know what it is until parsed */
+	fcol[4] = (unsigned int)w_col;				/* Since we don't know what it is until parsed */
 	GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Calculating block means\n");
 
 	if (Ctrl->G.active) {	/* Create the grid(s) */

src/blockmedian.c

@@ -217,18 +217,18 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMEDIAN_CTRL *Ctrl, struct
 				n_errors++; 
 			}
 			else {	/* Plain -E is added */
-				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifices s, l, or h.  -E was added.\n");
+				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifies s, l, or h.  -E was added.\n");
 				Ctrl->E.active = true;
 				Ctrl->E.mode = BLK_DO_EXTEND3;		/* Report L1scale, low, high in cols 4-6 */
 			}
 		}
 		else if (Ctrl->A.selected[3] || Ctrl->A.selected[4]) {	/* Need q25 or q75 and s not set, so add -Eb */
-			GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-Eb is required if -A specifices q25 or q75.  -Eb was added.\n");
+			GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-Eb is required if -A specifies q25 or q75.  -Eb was added.\n");
 			Ctrl->E.active = true;
 			Ctrl->E.mode = BLK_DO_EXTEND4;		/* Report low, 25%, 75% and high in cols 4-7 */
 		}
 		else if (Ctrl->A.selected[2] || Ctrl->A.selected[5]) {	/* Plain -E is added */
-			GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifices s, l, or h.  -E was added.\n");
+			GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifies s, l, or h.  -E was added.\n");
 			Ctrl->E.active = true;
 			Ctrl->E.mode = BLK_DO_EXTEND3;		/* Report L1scale, low, high in cols 4-6 */
 		}
@@ -254,7 +254,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMEDIAN_CTRL *Ctrl, struct
 			Ctrl->A.selected[0] = true, Ctrl->A.n_selected = 1;
 		else {	/* Make sure -A choices are valid and that -E is set if extended fields are selected */
 			if (Ctrl->A.selected[6] && !Ctrl->W.weighted[GMT_OUT]) {
-				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifices w.\n");
+				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifies w.\n");
 				n_errors++; 
 			}
 		}
@@ -521,7 +521,7 @@ int GMT_blockmedian (void *V_API, int mode, void *args) {
 		data = gmt_M_malloc (GMT, data, 0, &n_alloc, struct BLK_DATA);
 	}
 	w_col = gmt_get_cols (GMT, GMT_OUT) - 1;	/* Weights always reported in last output column */
-	fcol[6] = (unsigned int)w_col;				/* Since we dont know what it is until parsed */
+	fcol[6] = (unsigned int)w_col;				/* Since we don't know what it is until parsed */
 
 	/* Ready to go. */
 

src/blockmode.c

@@ -230,7 +230,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMODE_CTRL *Ctrl, struct G
 
 	if (Ctrl->G.active) {	/* Make sure -A sets valid fields, some require -E */
 		if (!Ctrl->E.active && (Ctrl->A.selected[1] || Ctrl->A.selected[2] || Ctrl->A.selected[3])) {
-			/* -E is required if -A specifices l or h */
+			/* -E is required if -A specifies l or h */
 			Ctrl->E.active = true;			/* Extended report with standard deviation, min, and max in cols 4-6 */
 			Ctrl->E.mode = BLK_DO_EXTEND3;	/* Report LMSscale, low, high in cols 4-6 */
 		}
@@ -254,11 +254,11 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct BLOCKMODE_CTRL *Ctrl, struct G
 			Ctrl->A.selected[0] = true, Ctrl->A.n_selected = 1;
 		else {	/* Make sure -A choices are valid and that -E is set if extended fields are selected */
 			if (!Ctrl->E.active && (Ctrl->A.selected[1] || Ctrl->A.selected[2] || Ctrl->A.selected[3])) {
-				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifices s, l, or h.  -E was added.\n");
+				GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "-E is required if -A specifies s, l, or h.  -E was added.\n");
 				Ctrl->E.active = true; 
 			}
 			if (Ctrl->A.selected[4] && !Ctrl->W.weighted[GMT_OUT]) {
-				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifices w.\n");
+				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "-W or -Wo is required if -A specifies w.\n");
 				n_errors++; 
 			}
 		}
@@ -355,7 +355,7 @@ GMT_LOCAL double bin_mode (struct GMT_CTRL *GMT, struct BLK_DATA *d, uint64_t n,
 			case BLOCKMODE_AVE:		/* Get the average of the modes */
 				value += ((bin + B->min) + B->o_offset) * B->width;
 				break;
-			case BLOCKMODE_HIGH:	/* Update highest mode so far, when loop exits we have the hightest mode */
+			case BLOCKMODE_HIGH:	/* Update highest mode so far, when loop exits we have the highest mode */
 			 	value = ((bin + B->min) + B->o_offset) * B->width;
 				break;
 		}
@@ -649,7 +649,7 @@ int GMT_blockmode (void *V_API, int mode, void *args) {
 		data = gmt_M_malloc (GMT, data, 0, &n_alloc, struct BLK_DATA);
 	}
 	w_col = gmt_get_cols (GMT, GMT_OUT) - 1;	/* Weights always reported in last output column */
-	fcol[4] = (unsigned int)w_col;				/* Since we dont know what it is until parsed */
+	fcol[4] = (unsigned int)w_col;				/* Since we don't know what it is until parsed */
 
 	/* Ready to go. */