Update doc to reflect the bahavior change for filestore_merge_threshold setting.

Signed-off-by: Guang Yang (yguang@yahoo-inc.com)

diff --git a/doc/rados/configuration/filestore-config-ref.rst b/doc/rados/configuration/filestore-config-ref.rst
index 2e4a5b1a6fb089408ef2a1b159524d71a66e5408..72939baef3fb5e287fc8a6480d613e7a634cc1c7 100644 (file)
--- a/doc/rados/configuration/filestore-config-ref.rst
+++ b/doc/rados/configuration/filestore-config-ref.rst
@@ -256,6 +256,7 @@ Misc
 ``filestore merge threshold``
 
 :Description: Min number of files in a subdir before merging into parent
+              NOTE: A negative value means to disable subdir merging
 :Type: Integer
 :Required: No
 :Default: ``10``
@@ -263,7 +264,7 @@ Misc
 
 ``filestore split multiple``
 
-:Description:  ``filestore_split_multiple * filestore_merge_threshold * 16`` 
+:Description:  ``filestore_split_multiple * abs(filestore_merge_threshold) * 16`` 
                is the maximum number of files in a subdirectory before 
                splitting into child directories.