merge to trunk

This commit is contained in:
David Goetz
2011-03-03 13:48:38 -08:00
19 changed files with 799 additions and 678 deletions

View File

@@ -215,7 +215,7 @@ Configuring each node
Sample configuration files are provided with all defaults in line-by-line comments.
#. If your going to use the DevAuth (the default swift-auth-server), create
#. If you're going to use the DevAuth (the default swift-auth-server), create
`/etc/swift/auth-server.conf` (you can skip this if you're going to use
Swauth)::