Merge remote-tracking branch 'gh/wip_doc'

2 files changed, 16 insertions, 16 deletions

diff --git a/doc/rados/configuration/filestore-config-ref.rst b/doc/rados/configuration/filestore-config-ref.rst
index e45c0f7a9fc..80aed8e81a4 100644
--- a/doc/rados/configuration/filestore-config-ref.rst
+++ b/doc/rados/configuration/filestore-config-ref.rst
@@ -205,7 +205,7 @@ Journal
 
 ``filestore journal parallel``
 
-:Description: 
+:Description: Enables parallel journaling, default for btrfs.
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -213,7 +213,7 @@ Journal
 
 ``filestore journal writeahead``
 
-:Description:
+:Description: Enables writeahead journaling, default for xfs.
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -221,7 +221,7 @@ Journal
 
 ``filestore journal trailing``
 
-:Description:
+:Description: Deprecated, never use.
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -233,7 +233,7 @@ Misc
 
 ``filestore merge threshold``
 
-:Description: 
+:Description: Min number of files in a subdir before merging into parent
 :Type: Integer
 :Required: No
 :Default: ``10``
@@ -241,7 +241,7 @@ Misc
 
 ``filestore split multiple``
 
-:Description: 
+:Description: filestore_split_multiple*filestore_merge_threshold*16 is the max files in a subdir before splitting into child directories.
 :Type: Integer
 :Required: No
 :Default: ``2``
@@ -249,7 +249,7 @@ Misc
 
 ``filestore update to``
 
-:Description: 
+:Description: Limits filestore auto upgrade to specified version.
 :Type: Integer
 :Required: No
 :Default: ``1000``
diff --git a/doc/rados/configuration/ms-ref.rst b/doc/rados/configuration/ms-ref.rst
index d76f7f3bb25..d0b1b172d7f 100644
--- a/doc/rados/configuration/ms-ref.rst
+++ b/doc/rados/configuration/ms-ref.rst
@@ -5,7 +5,7 @@
 
 ``ms tcp nodelay``
 
-:Description: 
+:Description: Disables nagle's algorithm on messenger tcp sessions.
 :Type: Boolean
 :Required: No
 :Default: ``true``
@@ -13,7 +13,7 @@
 
 ``ms initial backoff``
 
-:Description: 
+:Description: The initial time to wait before reconnecting on a fault.
 :Type: Double
 :Required: No
 :Default: ``.2``
@@ -21,7 +21,7 @@
 
 ``ms max backoff``
 
-:Description: 
+:Description: The maximum time to wait before reconnecting on a fault.
 :Type: Double
 :Required: No
 :Default: ``15.0``
@@ -29,7 +29,7 @@
 
 ``ms nocrc``
 
-:Description: 
+:Description: Disables crc on network messages.  May increase performance if cpu limited.
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -37,7 +37,7 @@
 
 ``ms die on bad msg``
 
-:Description: 
+:Description: Debug option; do not configure.
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -45,7 +45,7 @@
 
 ``ms dispatch throttle bytes``
 
-:Description: 
+:Description: Throttles total size of messages waiting to be dispatched.
 :Type: 64-bit Unsigned Integer
 :Required: No
 :Default: ``100 << 20``
@@ -53,7 +53,7 @@
 
 ``ms bind ipv6``
 
-:Description: 
+:Description: Enable if you want your daemons to bind to IPv6 address instead of IPv4 ones. (Not required if you specify a daemon or cluster IP.)
 :Type: Boolean
 :Required: No
 :Default: ``false``
@@ -61,7 +61,7 @@
 
 ``ms rwthread stack bytes``
 
-:Description: 
+:Description: Debug option for stack size; do not configure.
 :Type: 64-bit Unsigned Integer
 :Required: No
 :Default: ``1024 << 10``
@@ -69,7 +69,7 @@
 
 ``ms tcp read timeout``
 
-:Description: 
+:Description: Controls how long (in seconds) the messenger will wait before closing an idle connection.
 :Type: 64-bit Unsigned Integer
 :Required: No
 :Default: ``900``
@@ -77,7 +77,7 @@
 
 ``ms inject socket failures``
 
-:Description: 
+:Description: Debug option; do not configure.
 :Type: 64-bit Unsigned Integer
 :Required: No
 :Default: ``0``