Skip to content

Commit d19e335

Browse files
committed
Merge branch 'master' into develop
2 parents a348f4b + d9d33ad commit d19e335

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Current version: v5.0.1 (RethinkDB v2.3)
1212

1313
Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
1414

15-
If you need any help you can find me on the [RethinkDB slack](http://slack.rethinkdb.com/) in the #gorethink channel.
15+
If you need any help you can find me on the [RethinkDB slack](https://rethinkdb.slack.com/) in the #gorethink channel.
1616

1717
## Installation
1818

query_control.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ func Error(args ...interface{}) Term {
223223
return constructRootTerm("Error", p.Term_ERROR, args, map[string]interface{}{})
224224
}
225225

226-
// Args is a special term usd to splice an array of arguments into another term.
227-
// This is useful when you want to call a varadic term such as GetAll with a set
226+
// Args is a special term used to splice an array of arguments into another term.
227+
// This is useful when you want to call a variadic term such as GetAll with a set
228228
// of arguments provided at runtime.
229229
func Args(args ...interface{}) Term {
230230
return constructRootTerm("Args", p.Term_ARGS, args, map[string]interface{}{})

0 commit comments

Comments
 (0)