Skip to content

Commit

Permalink
Merge branch 'fix-typos'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ward Fisher committed Oct 16, 2015
2 parents caa4937 + a359cb6 commit ba57c62
Show file tree
Hide file tree
Showing 62 changed files with 119 additions and 119 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC OR APPLE)

ADD_DEFINITIONS()

# Supress CRT Warnings.
# Suppress CRT Warnings.
# Only necessary for Windows
IF(MSVC)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
Expand Down Expand Up @@ -459,7 +459,7 @@ OPTION(USE_HDF5 "Use HDF5." ${ENABLE_NETCDF_4})
IF(USE_HDF5 OR ENABLE_NETCDF_4)
SET(USE_HDF5 ON)
SET(USE_NETCDF4 ON)
# Accomodate developers who have hdf5 libraries and
# Accommodate developers who have hdf5 libraries and
# headers on their system, but do not have a the hdf
# .cmake files. If this is the case, they should
# specify HDF5_HL_LIB, HDF5_LIB, HDF5_INCLUDE_DIR manually.
Expand Down Expand Up @@ -653,7 +653,7 @@ ENDIF()

# Check to see if libtool supports

# Check for the math library so it can be explicitely linked.
# Check for the math library so it can be explicitly linked.
IF(NOT WIN32)
FIND_LIBRARY(HAVE_LIBM NAMES math m libm)
MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}")
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile.developer
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ PREDEFINED =
EXPAND_AS_DEFINED =

# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an
# remove all references to function-like macros that are alone on a line, have an
# all uppercase name, and do not end with a semicolon. Such function macros are
# typically used for boiler-plate code, and will confuse the parser if not
# removed.
Expand Down
6 changes: 3 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ This is a bug-fix-only release for version 4.3.1.

### 4.3.1-rc1 Released 2013-08-09

* Migrated from the netCDF-C `subversion` repository to a publically available GitHub repository available at https://github.com/Unidata/netCDF-C. This repository may be checked out (cloned) with the following command:
* Migrated from the netCDF-C `subversion` repository to a publicly available GitHub repository available at https://github.com/Unidata/netCDF-C. This repository may be checked out (cloned) with the following command:

$ git clone https://github.com/Unidata/netCDF-C.git

Expand Down Expand Up @@ -397,7 +397,7 @@ This is a bug-fix-only release for version 4.3.1.
## 4.3.0 Released 2013-04-29

* fsync: Changed default in autotools config file; fsync must now be
explicitely enabled instead of explicitely disabled. [NCF-239]
explicitly enabled instead of explicitly disabled. [NCF-239]

[NCF-239]: https://bugtracking.unidata.ucar.edu/browse/NCF-239

Expand Down Expand Up @@ -1116,7 +1116,7 @@ Kent.
* Fixed some cross-compile problems.

* Rewrote code which placed bogus errors on the HDF5 error stack, trying
to open non-existant attributes and variables. Now no HDF5 errors are
to open non-existent attributes and variables. Now no HDF5 errors are
seen.

* Removed man subdirectory. Now man4 subdirectory is used for all builds.
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ PREDEFINED = USE_NETCDF4
EXPAND_AS_DEFINED =

# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an
# remove all references to function-like macros that are alone on a line, have an
# all uppercase name, and do not end with a semicolon. Such function macros are
# typically used for boiler-plate code, and will confuse the parser if not
# removed.
Expand Down
2 changes: 1 addition & 1 deletion docs/OPeNDAP.dox
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ assumed that the cost is not prohibitive.

In an effort to provide better performance for some access patterns,
client-side caching of data is available. The default is no caching,
but it may be enabled by prefixing the URL with the paramter "cache".
but it may be enabled by prefixing the URL with the parameter "cache".

Caching operates basically as follows.

Expand Down
4 changes: 2 additions & 2 deletions docs/file_format_specifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ sets these when creating a group.

Each dataset in the HDF5 file must be created with a property list for
which the attribute creation order has been set to creation
ordering. The H5Pset_attr_creation_order funtion is used to set the
ordering. The H5Pset_attr_creation_order function is used to set the
creation ordering of attributes of a variable.

The following example code (from libsrc4/nc4hdf.c) shows how the
Expand Down Expand Up @@ -511,7 +511,7 @@ Until version 1.8, HDF5 did not have any capability to represent
shared dimensions. With the 1.8 release, HDF5 introduced the dimension
scale feature to allow shared dimensions in HDF5 files.

The dimension scale is unfortunately not exactly equivilent to the
The dimension scale is unfortunately not exactly equivalent to the
netCDF shared dimension, and this leads to a number of compromises in
the design of netCDF-4.

Expand Down
2 changes: 1 addition & 1 deletion docs/internal.dox
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ adding something like the following.

\section dispatch_step7 Step 7.

Modify the NC_intialize function in liblib/stub.c by adding
Modify the NC_initialize function in liblib/stub.c by adding
appropriate references to the NCM dispatch function.

\code
Expand Down
2 changes: 1 addition & 1 deletion docs/old/netcdf-cxx4.texi
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ attributes are discussed.

@node Class Hierarchy, Auxiliary Types and Constants, Introduction, Introduction
@unnumberedsec Class Hierarchy
@cindex class hierachy
@cindex class hierarchy

The class for netCDF file objects is @code{NcFile}.

Expand Down
6 changes: 3 additions & 3 deletions docs/old/netcdf-f77.texi
Original file line number Diff line number Diff line change
Expand Up @@ -2218,7 +2218,7 @@ group.

Variable are only visible in the group in which they are defined. The
same applies to attributes. ``Global'' attributes are defined in
whichever group is refered to by the ncid.
whichever group is referred to by the ncid.

Dimensions are visible in their groups, and all child groups.

Expand Down Expand Up @@ -3775,7 +3775,7 @@ Insert a named field into a compound type.
@heading Usage

@example
INTEGER FUNTION NF_INSERT_COMPOUND(INTEGER TYPEID, CHARACTER*(*) NAME, INTEGER OFFSET,
INTEGER FUNCTION NF_INSERT_COMPOUND(INTEGER TYPEID, CHARACTER*(*) NAME, INTEGER OFFSET,
INTEGER FIELD_TYPEID)
@end example

Expand Down Expand Up @@ -3959,7 +3959,7 @@ C Include an array.
Get the number of fields, length in bytes, and name of a compound
type.

In addtion to the NF_INQ_COMPOUND function, three additional functions
In addition to the NF_INQ_COMPOUND function, three additional functions
are provided which get only the name, size, and number of fields.

@heading Usage
Expand Down
6 changes: 3 additions & 3 deletions docs/old/netcdf-f90.texi
Original file line number Diff line number Diff line change
Expand Up @@ -1731,7 +1731,7 @@ group.

Variable are only visible in the group in which they are defined. The
same applies to attributes. ``Global'' attributes are defined in
whichever group is refered to by the ncid.
whichever group is referred to by the ncid.

Dimensions are visible in their groups, and all child groups.

Expand Down Expand Up @@ -3334,7 +3334,7 @@ Wyoming.

Fortran users may use character buffers to read and write compound
types. User are invited to try classic Fortran features such as the
equivilence and the common block statment.
equivilence and the common block statement.

@heading Usage

Expand Down Expand Up @@ -3590,7 +3590,7 @@ must do so before the compound type is committed.
Get the number of fields, length in bytes, and name of a compound
type.

In addtion to the NF90_INQ_COMPOUND function, three additional functions
In addition to the NF90_INQ_COMPOUND function, three additional functions
are provided which get only the name, size, and number of fields.

@heading Usage
Expand Down
4 changes: 2 additions & 2 deletions docs/old/netcdf-install.texi
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ in which case this flag should be disabled.
@item --enable-dap-long-tests
If --enable-dap-remote-tests is enabled, then this
flag can also be enabled to add extra tests that may
take signficant time to execute.
take significant time to execute.
This flag is off by default.

@item --enable-hdf4
Expand Down Expand Up @@ -760,7 +760,7 @@ Change the size (in bytes) that will be used as a target size when
computing default chunksizes for netCDF-4/HDF5 chunked variables.

@item --default-chunks-in-cache
Change the number of chunks that are accomodated in the per-variable
Change the number of chunks that are accommodated in the per-variable
chunk caches that are used by default.

@item --max-default-cache-size
Expand Down
16 changes: 8 additions & 8 deletions docs/old/netcdf-internal.texi
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ netcdf-f90, The NetCDF Users' Guide for FORTRAN 90}).

@menu
* C Code::
* Derivitive Works::
* Derivative Works::
* Concept Index::
@detailmenu
Expand All @@ -71,7 +71,7 @@ C Code
@end detailmenu
@end menu

@node C Code, Derivitive Works, Top, Top
@node C Code, Derivative Works, Top, Top
@chapter C Code

The netCDF library is implemented in C in a bunch of directories under
Expand Down Expand Up @@ -533,11 +533,11 @@ package involving cfortran.h, which defines a C function of the exact
signature which will be produced by a fortran program calling a C
function. So _nf_open will map to nc_open.

@node Derivitive Works, Concept Index, C Code, Top
@chapter Derivitive Works
@node Derivative Works, Concept Index, C Code, Top
@chapter Derivative Works

At Unidata, the creative energies are simply enourmous. NetCDF has
spawned a host of derivitive works, some samples of which are listed
At Unidata, the creative energies are simply enormous. NetCDF has
spawned a host of derivative works, some samples of which are listed
below.

@section From ``A Tale of Two Data Formats,'' the bestselling novel
Expand Down Expand Up @@ -654,7 +654,7 @@ it doesn't mean that I can't love you, you know?
[Audience]: (sighing) Ahhhhhh...
[Jerry]: Now we have a suprise guest, flow all the way here from
[Jerry]: Now we have a surprise guest, flow all the way here from
Champagne-Urbana, Illinois, to appear as a guest on this show. Her
name is HDF5, and she's a professional data format.
Expand All @@ -671,7 +671,7 @@ someone gets hurt...
@end example


@node Concept Index, , Derivitive Works, Top
@node Concept Index, , Derivative Works, Top
@chapter Concept Index

@printindex cp
Expand Down
10 changes: 5 additions & 5 deletions docs/old/netcdf.texi
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ write variables and attributes of any type. Use these functions to
read and write variables and attributes of user defined type. In C use
nc_put_att/nc_get_att and the nc_put_var/nc_get_var,
nc_put_var1/nc_get_var1, nc_put_vara/nc_get_vara, or
nc_put_vars/nc_get_vars functons to access attribute and variable data
nc_put_vars/nc_get_vars functions to access attribute and variable data
of user defined type.

@subsection Compound Types
Expand Down Expand Up @@ -3237,7 +3237,7 @@ The DAS output from the web server should look like this.
@verbatim
Attributes {
Facility {
String PrincipleInvestigator ``Mark Abbott'', ``Ph.D'';
String PrincipleInvestigator ``Mark Abort'', ``Ph.D'';
String DataCenter ``COAS Environmental Computer Facility'';
String DrifterType ``MetOcean WOCE/OCM'';
}
Expand Down Expand Up @@ -5979,7 +5979,7 @@ sets these when creating a group.
Each dataset in the HDF5 file must be created with a property list for
which the attribute creation order has been set to creation
ordering. The H5Pset_attr_creation_order funtion is used to set the
ordering. The H5Pset_attr_creation_order function is used to set the
creation ordering of attributes of a variable.
The following example code (from libsrc4/nc4hdf.c) shows how the
Expand Down Expand Up @@ -6014,7 +6014,7 @@ Until version 1.8, HDF5 did not have any capability to represent
shared dimensions. With the 1.8 release, HDF5 introduced the dimension
scale feature to allow shared dimensions in HDF5 files.
The dimension scale is unfortunately not exactly equivilent to the
The dimension scale is unfortunately not exactly equivalent to the
netCDF shared dimension, and this leads to a number of compromises in
the design of netCDF-4.
Expand Down Expand Up @@ -6416,7 +6416,7 @@ endif
@end example
@unnumberedsec Step 7.
Modify the NC_intialize function in liblib/stub.c by
Modify the NC_initialize function in liblib/stub.c by
adding appropriate references to the NCM dispatch function.
@example
#ifdef USE_NETCDFM
Expand Down
4 changes: 2 additions & 2 deletions docs/software.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ categories.
- Missing values (setctomiss, setmisstoc, setrtomiss)
- Arithmetic (add, sub, mul, div, ...)
- Mathematical functions (sqrt, exp, log, sin, cos, ...)
- Comparision (eq, ne, le, lt, ge, gt, ...)
- Comparison (eq, ne, le, lt, ge, gt, ...)
- Conditions (ifthen, ifnotthen, ifthenc, ifnotthenc)
- Field statistics (fldsum, fldavg, fldstd, fldmin, fldmax, ...)
- Vertical statistics (vertsum, vertavg, vertstd, vertmin, ...)
Expand Down Expand Up @@ -1857,7 +1857,7 @@ from a given file, URL, stream, or NetcdfFile object. SIS netCDF storage
is intended to be a bridge between NetCDF Climate and Forecast (CF)
conventions and ISO 19115 metadata.

SIS is under developement as an Apache project. Release 0.3 is currently
SIS is under development as an Apache project. Release 0.3 is currently
available for download.

Tcl/Tk interfaces {#TclTk}
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial.dox
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

\section sec_tut Tutorial Documentation

This page contains refrences to various other NetCDF background and tutorial pages.
This page contains references to various other NetCDF background and tutorial pages.

\subsection tutorial_pages Tutorial Pages

Expand Down
2 changes: 1 addition & 1 deletion docs/types.dox
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ defining variables or attributes. Use functions
- nc_put_vara() / nc_get_vara()
- nc_put_vars() / nc_get_vars()

functons to access attribute and variable data of user defined type.
functions to access attribute and variable data of user defined type.

\subsection types_compound_types Compound Types

Expand Down
2 changes: 1 addition & 1 deletion dods.m4
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ AC_DEFUN([DODS_CHECK_SIZES], [dnl
# there are 2 possibilities for the definition of dods_int32, ...,
# types. First possibility is that the C99 types are used and
# dods-datatypes-static.h is copied. In that case the following
# definitions are not really usefull. In case the C99 types are
# definitions are not really useful. In case the C99 types are
# not available, dods-datatypes-config.h.in is used to generate
# dods-datatypes.h.
# The code below makes dods-datatypes-config.h stand on its own.
Expand Down
2 changes: 1 addition & 1 deletion examples/C/quick_large_files.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* This example program is part of Unidata's netCDF library for
scientific data access.
This program (quickly, but not throughly) tests the large file
This program (quickly, but not thoroughly) tests the large file
features.
Ed Hartnett, 8/11/4
Expand Down
2 changes: 1 addition & 1 deletion include/nc3internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef enum {


/*
* NC dimension stucture
* NC dimension structure
*/
typedef struct {
/* all xdr'd */
Expand Down
2 changes: 1 addition & 1 deletion include/nc4internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ typedef struct NC_HDF5_FILE_INFO
} NC_HDF5_FILE_INFO_T;


/* These functions convert beteen netcdf and HDF5 types. */
/* These functions convert between netcdf and HDF5 types. */
int nc4_get_typelen_mem(NC_HDF5_FILE_INFO_T *h5, nc_type xtype,
int is_long, size_t *len);
int nc4_convert_type(const void *src, void *dest,
Expand Down
2 changes: 1 addition & 1 deletion include/utf8proc.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ typedef unsigned char _Bool;
* Flags being regarded by several functions in the library:
* NULLTERM: The given UTF-8 input is NULL terminated.
* STABLE: Unicode Versioning Stability has to be respected.
* COMPAT: Compatiblity decomposition
* COMPAT: Compatibility decomposition
* (i.e. formatting information is lost)
* COMPOSE: Return a result with composed characters.
* DECOMPOSE: Return a result with decomposed characters.
Expand Down
4 changes: 2 additions & 2 deletions libdap2/dceconstraints.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ dceslicecompose(DCEslice* s1, DCEslice* s2, DCEslice* result)
{
int err = NC_NOERR;
size_t lastx = 0;
DCEslice sr; /* For back compatability so s1 and result can be same object */
DCEslice sr; /* For back compatibility so s1 and result can be same object */
#ifdef DEBUG1
slicedump("compose: s1",s1);
slicedump("compose: s2",s2);
Expand Down Expand Up @@ -997,7 +997,7 @@ dcesegmentsize(DCEsegment* seg, size_t start, size_t stop)
}

/* Return the index of the leftmost slice
starting at start and upto, but not including
starting at start and up to, but not including
stop, such that it and all slices to the right
are "safe". Safe means dceiswholeslice() is true.
In effect, we can read the safe index set as a
Expand Down
2 changes: 1 addition & 1 deletion libdispatch/dcopy.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ nc_copy_att(int ncid_in, int varid_in, const char *name,
}
}
else
return retval; /* Some other error occured. */
return retval; /* Some other error occurred. */
}
else
return NC_copy_att(ncid_in, varid_in, name, ncid_out, varid_out);
Expand Down
Loading

0 comments on commit ba57c62

Please sign in to comment.