diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48daa73..7888a01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ Only accretive/fixative changes will be made from now on.
 The following changes have been made to **master** since the 1.0.409 build:
 
 * In **Tips & Tricks**, noted that MySQL returns `BLOB` columns as `byte[]` instead of `java.sql.Blob`.
-* Address #103 by adding a section on timeouts to **Tips & Tricks**.
+* Address #103, #104 by adding a section on timeouts to **Tips & Tricks**.
 * Fix #102 by allowing keywords or strings in `:return-keys`.
 * Fix #101 by tightening the spec on a JDBC URL to correctly reflect that it must start with `jdbc:`.
 * Add support for calling `.getLoginTimeout`/`.setLoginTimeout` on the reified `DataSource` returned by `get-datasource` when called on a hash map "db-spec" or JDBC URL string.
diff --git a/doc/all-the-options.md b/doc/all-the-options.md
index 234a8fd..f86f68f 100644
--- a/doc/all-the-options.md
+++ b/doc/all-the-options.md
@@ -58,7 +58,7 @@ Any function that creates a `Statement` or a `PreparedStatement` will accept the
 * `:fetch-size` -- an integer that guides the JDBC driver in terms of how many rows to fetch at once; sometimes you need to set `:fetch-size` to zero or a negative value in order to trigger streaming of result sets -- some JDBC drivers require additional options to be set on the connection _as well_,
 * `:max-rows` -- an integer that tells the JDBC driver to limit result sets to this many rows,
 * `:result-type` -- a keyword that affects how the `ResultSet` can be traversed: `:forward-only`, `:scroll-insensitive`, `:scroll-sensitive`,
-* `:timeout` -- an integer that specifies the (query) timeout allowed for SQL operations, in milliseconds.
+* `:timeout` -- an integer that specifies the (query) timeout allowed for SQL operations, in seconds. See [**Handling Timeouts**](/doc/tips-and-tricks.md#handling-timeouts) in **Tips & Tricks** for more details on this and other possible timeout settings.
 * `:statement` -- a hash map of camelCase properties to set on the `Statement` or `PreparedStatement` object after it is created; these correspond to `.set*` methods on the `Statement` class (which `PreparedStatement` inherits) and are set via the Java reflection API (using `org.clojure/java.data`). If `:fetchSize`, `:maxRows`, or `:queryTimeout` are provided, they will take precedence over the fast, specific options above.
 
 If you specify either `:concurrency` or `:result-type`, you must specify _both_ of them. If you specify `:cursors`, you must also specify `:result-type` _and_ `:concurrency`.