Delete/correct deprecated options in sample vol files.

Signed-off-by: Sachidananda Urs <sac@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 3031 (Fix share/{doc,man} directory)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3031

3 files changed, 16 insertions, 28 deletions

diff --git a/doc/glusterd.vol b/doc/glusterd.vol
index 4e43fb0dad2..4518e8d65c3 100644
--- a/doc/glusterd.vol
+++ b/doc/glusterd.vol
@@ -5,4 +5,3 @@ volume management
     option transport.socket.keepalive-time 10
     option transport.socket.keepalive-interval 2
 end-volume
-
diff --git a/doc/glusterfs.vol.sample b/doc/glusterfs.vol.sample
index 3b1f1851722..977363b921b 100644
--- a/doc/glusterfs.vol.sample
+++ b/doc/glusterfs.vol.sample
@@ -8,7 +8,7 @@
 ### "#" is comment character.
 ### - Config file is case sensitive
 ### - Options within a volume block can be in any order.
-### - Spaces or tabs are used as delimitter within a line. 
+### - Spaces or tabs are used as delimitter within a line.
 ### - Each option should end within a line.
 ### - Missing or commented fields will assume default values.
 ### - Blank/commented lines are allowed.
@@ -21,24 +21,19 @@ volume client
 # option transport-type unix
 # option transport-type ib-sdp
   option remote-host 127.0.0.1         # IP address of the remote brick
-# option transport.socket.remote-port 24016              
+# option transport.socket.remote-port 24016
 
-# option transport-type ib-verbs
-# option transport.ib-verbs.remote-port 24016              
-# option transport.ib-verbs.work-request-send-size  1048576
-# option transport.ib-verbs.work-request-send-count 16
-# option transport.ib-verbs.work-request-recv-size  1048576
-# option transport.ib-verbs.work-request-recv-count 16
+# option transport-type rdma
+# option transport.rdma.remote-port 24016
+# option transport.rdma.work-request-send-count 16
+# option transport.rdma.work-request-recv-count 16
 
-# option transport-timeout 30          # seconds to wait for a reply
-                                       # from server for each request
   option remote-subvolume brick        # name of the remote volume
 end-volume
 
 ### Add readahead feature
 #volume readahead
 #  type performance/read-ahead
-#  option page-size 1MB     # unit in bytes
 #  option page-count 2       # cache per file  = (page-count x page-size)
 #  subvolumes client
 #end-volume
@@ -46,16 +41,13 @@ end-volume
 ### Add IO-Cache feature
 #volume iocache
 #  type performance/io-cache
-#  option page-size 256KB
-#  option page-count 2
 #  subvolumes readahead
 #end-volume
 
 ### Add writeback feature
 #volume writeback
 #  type performance/write-behind
-#  option aggregate-size 1MB
 #  option window-size 2MB
 #  option flush-behind off
-#  subvolumes iocache   
+#  subvolumes iocache
 #end-volume
diff --git a/doc/glusterfsd.vol.sample b/doc/glusterfsd.vol.sample
index e91df3290a9..ec2fd341ef0 100644
--- a/doc/glusterfsd.vol.sample
+++ b/doc/glusterfsd.vol.sample
@@ -8,8 +8,8 @@
 ### "#" is comment character.
 ### - Config file is case sensitive
 ### - Options within a volume block can be in any order.
-### - Spaces or tabs are used as delimitter within a line. 
-### - Multiple values to options will be : delimitted.
+### - Spaces or tabs are used as delimitter within a line.
+### - Multiple values to options will be : delimited.
 ### - Each option should end within a line.
 ### - Missing or commented fields will assume default values.
 ### - Blank/commented lines are allowed.
@@ -27,18 +27,15 @@ volume server
   option transport-type tcp
 # option transport-type unix
 # option transport-type ib-sdp
-# option transport.socket.bind-address 192.168.1.10     # Default is to listen on all interfaces
-# option transport.socket.listen-port 24016              
+# option transport.socket.bind-address 192.168.1.10     # Default is to listen
+                                                        # on all interfaces
+# option transport.socket.listen-port 24016
 
-# option transport-type ib-verbs
-# option transport.ib-verbs.bind-address 192.168.1.10     # Default is to listen on all interfaces
-# option transport.ib-verbs.listen-port 24016              
-# option transport.ib-verbs.work-request-send-size  131072
-# option transport.ib-verbs.work-request-send-count 64
-# option transport.ib-verbs.work-request-recv-size  131072
-# option transport.ib-verbs.work-request-recv-count 64
+# option transport-type rdma
+# option transport.rdma.listen-port 24016
+# option transport.rdma.work-request-send-count 64
+# option transport.rdma.work-request-recv-count 64
 
-# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
   subvolumes brick
 # NOTE: Access to any volume through protocol/server is denied by
 # default. You need to explicitly grant access through # "auth"