diff --git a/README.md b/README.md index f94ed1496..cf3053e9e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ proxies, load balancers, logical replication clients, etc. ## v4 -This is the `v4` branch. `v4` is in release candate state but is not officially released. +This is the `v4` branch. `v4` is in release candidate state but is not officially released. ## Example Usage diff --git a/batch.go b/batch.go index 76e45da7a..53719def7 100644 --- a/batch.go +++ b/batch.go @@ -36,7 +36,7 @@ type BatchResults interface { // QueryRow reads the results from the next query in the batch as if the query has been sent with Conn.QueryRow. QueryRow() Row - // Close closes the batch operation. Any error that occured during a batch operation may have made it impossible to + // Close closes the batch operation. Any error that occurred during a batch operation may have made it impossible to // resyncronize the connection with the server. In this case the underlying connection will have been closed. Close() error } @@ -95,7 +95,7 @@ func (br *batchResults) QueryRow() Row { } -// Close closes the batch operation. Any error that occured during a batch operation may have made it impossible to +// Close closes the batch operation. Any error that occurred during a batch operation may have made it impossible to // resyncronize the connection with the server. In this case the underlying connection will have been closed. func (br *batchResults) Close() error { if br.err != nil { diff --git a/doc.go b/doc.go index 8ef28b857..53627999e 100644 --- a/doc.go +++ b/doc.go @@ -154,7 +154,7 @@ pgx also includes support for custom types implementing the database/sql.Scanner interfaces. If pgx does cannot natively encode a type and that type is a renamed type (e.g. type MyTime time.Time) pgx will attempt -to encode the underlying type. While this is usually desired behavior it can produce suprising behavior if one the +to encode the underlying type. While this is usually desired behavior it can produce surprising behavior if one the underlying type and the renamed type each implement database/sql interfaces and the other implements pgx interfaces. It is recommended that this situation be avoided by implementing pgx interfaces on the renamed type.