Pulling some upstream doc updates

dougalb · dougalb · commit f28de020cfe3 · 2015-08-04T09:56:57.000-07:00
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -6,4 +6,3 @@ List of contributors:
  - Kenneth Daily - kmdaily at gmail dot com
  - John Lilley - johnbot at ltech dot edu
  - Nelson R Monserrate - MonserrateNelson at JohnDeere dot com
- - 
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
@@ -279,7 +279,7 @@ ComputeFleet root volume size in GB. (AMI must support growroot)
 
 Defaults to 10 in default template. ::
 
-    master_root_volume_size = 10
+    compute_root_volume_size = 10
 
 base_os
 """""""
