Merge commit '366108d785ceccb36bb9d171f53c873cea457c5b' into binary

* commit '366108d785ceccb36bb9d171f53c873cea457c5b':
  Halve distro size ;)
  Add -L mode to manpage.
  Version bump (shipit's having trouble with it), and update ChangeLog
  per-stat-class tracking of evictions and out of memory conditions.
  Don't re-calculate the slab class id for slabs_free() either.
  Don't re-calculate the slab class id.
  Useless check. 'id' will never be higher than POWER_LARGEST.
  Give 'SERVER_ERROR out of memory' errors more context.
  Minor refactoring of server_socket.

Conflicts:

	memcached.c

2 files changed, 6 insertions, 0 deletions

diff --git a/doc/binary-protocol-plan.jpg b/doc/binary-protocol-plan.jpg
deleted file mode 100644
index 4fd5f85..0000000
--- a/doc/binary-protocol-plan.jpg
+++ /dev/null
diff --git a/doc/memcached.1 b/doc/memcached.1
index 9be1b62..9063440 100644
--- a/doc/memcached.1
+++ b/doc/memcached.1
@@ -105,6 +105,12 @@ Use <char> as the delimiter between key prefixes and IDs. This is used for
 per-prefix stats reporting. The default is ":" (colon). If this option is
 specified, stats collection is turned on automatically; if not, then it may
 be turned on by sending the "stats detail on" command to the server.
+.TP
+.B \-L
+Try to use large memory pages (if available). Increasing the memory page size
+could reduce the number of TLB misses and improve the performance. In order to
+get large pages from the OS, memcached will allocate the total item-cache in
+one large chunk. Only available if supported on your OS.
 .br
 .SH LICENSE
 The memcached daemon is copyright Danga Interactive and is distributed under