diff --git a/test/sample.conf b/test/sample.conf
index bdaaeb064f..1262b80dad 100644
--- a/test/sample.conf
+++ b/test/sample.conf
@@ -1,12 +1,12 @@
 [func_test]
-# sample config for Swift with tempauth
+# Sample config for Swift with tempauth
 auth_host = 127.0.0.1
 auth_port = 8080
 auth_ssl = no
 auth_prefix = /auth/
-## sample config for Swift with Keystone v2 API
-# For keystone v2 change auth_version to 2 and auth_prefix to /v2.0/
-# And "allow_account_management" should not be set "true"
+# Sample config for Swift with Keystone v2 API.
+# For keystone v2 change auth_version to 2 and auth_prefix to /v2.0/.
+# And "allow_account_management" should not be set "true".
 #auth_version = 3
 #auth_host = localhost
 #auth_port = 5000
@@ -35,7 +35,7 @@ password3 = testing3
 #domain4 = test-domain
 
 # Fifth user is required for service token-specific tests.
-# The account must be different than the primary test account
+# The account must be different from the primary test account.
 # The user must not have a group (tempauth) or role (keystoneauth) on
 # the primary test account. The user must have a group/role that is unique
 # and not given to the primary tester and is specified in the options