diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index 7dc5fc159..494bb4194 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -5,6 +5,62 @@ http://www.springsource.org/spring-data/redis
Commit changelog: http://github.com/SpringSource/spring-data-redis/tree/v[version]
Issues changelog: http://jira.springsource.org/secure/ReleaseNote.jspa?projectId=10604
+Changes in version 1.1.0.M1 (2013-07-02)
+----------------------------------------
+
+General
+* Added Redis 2.6 millisecond expiration commands (pexpire, pttl, etc)
+* Added Redis 2.6 bit commands (bitop, bitcount)
+* Added support for Redis 2.6 scripting
+* Added Redis 2.6 incrbyfloat and hincrbyfloat commands
+* Added Redis 2.6 dump and restore commands
+* Added Redis 2.6 info by section
+* Added Redis 2.6 srandmember with count
+* Removed RJC due to lack of Redis 2.6 support
+* Upgraded JRedis from older fork (https://github.com/anthonylauzon/jredis) to
+latest original master (https://github.com/alphazero/jredis)
+* Made Jedis dependency optional in the build
+
+Package o.s.d.redis.core
+* Changed ValueOperations.multiSetIfAbsent return type from void to Boolean
+
+Package o.s.d.redis.connection
+* Changed StringRedisCommands.mSetNX return type from void to Boolean
+
+Package o.s.d.redis.connection.jredis
+* Removed base64 key encoding, since binary keys are supported in JRedis upgrade.
+Fixes issue where keys method with patterns was not working due to encoding.
+* Added JredisPool, since pool impl was removed from JRedis. Also fixes
+issue with previous pool where failed connections were not removed.
+
+Package o.s.d.redis.connection.lettuce
+* Added LettucePool for optional pooling of blocking/tx Lettuce connections
+* Added optional Redis password to LettuceConnectionFactory
+* Modified LettuceConnectionFactory to throw RedisConnectionFailureExceptions instead
+of native Exceptions
+
+
+Changes in version 1.0.5.RELEASE (2013-07-02)
+---------------------------------------------
+
+General
+* Upgraded to SRP 0.7
+* Upgraded to Lettuce 2.3.3
+
+Package o.s.d.redis.core
+* Fixed left/right pop timeouts converting to 0 seconds (blocking indefinitely)
+
+Package o.s.d.redis.connection.lettuce
+* Fixed exec returning empty list instead of null if watched variable modified
+
+Package o.s.d.redis.connection.srp
+* Fixed exec throwing TransactionFailedException instead of returning null if watched
+variable modified
+
+Package o.s.d.redis.listener.adapter
+* Added MessageListenerAdapter constructor with delegate and listener method
+
+
Changes in version 1.0.4.RELEASE (2013-04-18)
---------------------------------------------
diff --git a/docs/src/reference/docbook/reference/redis.xml b/docs/src/reference/docbook/reference/redis.xml
index 7f005bfb4..ac32804fa 100644
--- a/docs/src/reference/docbook/reference/redis.xml
+++ b/docs/src/reference/docbook/reference/redis.xml
@@ -162,7 +162,7 @@
Configuring SRP connector
- SRP (an acronym for Sam's Redis Protocol) is the forth, open-source connector supported by
+ SRP (an acronym for Sam's Redis Protocol) is the third open-source connector supported by
Spring Data Redis through the org.springframework.data.redis.connection.srp package.
By now, its configuration is probably easy to guess:
@@ -184,7 +184,7 @@
Configuring Lettuce connector
- Lettuce is the fifth open-source connector supported by
+ Lettuce is the fourth open-source connector supported by
Spring Data Redis through the org.springframework.data.redis.connection.lettuce package.
Its configuration is probably easy to guess:
@@ -196,11 +196,15 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
]]>
- Needless to say, the configuration is quite similar to that of the other connectors.
+ There are also a few Lettuce-specific connection parameters that can be tweaked.
+ By default, all LettuceConnections created by the LettuceConnectionFactory share the same
+ thread-safe native connection for all non-blocking and non-transactional operations. Set shareNativeConnection to false to use a dedicated
+ connection each time. LettuceConnectionFactory can also be configured with a LettucePool to use for pooling
+ blocking and transactional connections, or all connections if shareNativeConnection is set to false.
diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java
index 6dcdd655f..faf118a2c 100644
--- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java
+++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisPool.java
@@ -127,7 +127,7 @@ public class JredisPool implements Pool {
* @param timeout
* The socket timeout or 0 to use the default socket timeout
* @param poolConfig
- * The pool {@link COnfig}
+ * The pool {@link Config}
*/
public JredisPool(String hostName, int port, int dbIndex, String password, int timeout,
Config poolConfig) {