Merge remote-tracking branch 'origin/2.3' into 2.3

weaverryan · weaverryan · commit 7a6f30ea1cd8 · 2015-01-16T13:44:55.000-05:00
* origin/2.3:
  Removed a leftover comma in security config sample
diff --git a/book/security.rst b/book/security.rst
@@ -295,7 +295,7 @@ provider, but it's better to think of it as an "in configuration" provider:
                     memory:
                         users:
                             ryan:
-                                password: ryanpass,
+                                password: ryanpass
                                 roles: 'ROLE_USER'
                             admin:
                                 password: kitten
