From 1125368624ae70b84a4ef3da3bb515d36f29173f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Jun 2012 16:09:10 +0200 Subject: [PATCH] Remove ambiguity in memcache_servers documentation The documentation could be understood like the following: memcache_servers from memcache.conf is always used if set, even if memcache_servers in proxy-server.conf is set. This is clearly not the case, as proxy-server.conf has a higher priority if it memcache_servers is set there. Change-Id: I967c7e80796a0e296c5c65bd097df1669d16203e --- doc/manpages/proxy-server.conf.5 | 2 +- etc/proxy-server.conf-sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5 index 7dccf83704..871ab1b9c3 100644 --- a/doc/manpages/proxy-server.conf.5 +++ b/doc/manpages/proxy-server.conf.5 @@ -212,7 +212,7 @@ Logging address. The default is /dev/log. .IP "\fBset log_headers\fR " Enables the ability to log request headers. The default is False. .IP \fBmemcache_servers\fR -Default for memcache_servers is to try to read the property from /etc/swift/memcache.conf (see memcache.conf-sample) or lacking that file, it will default to the value below. You can specify multiple servers separated with commas, as in: 10.1.2.3:11211,10.1.2.4:11211. This can be a list separated by commas. The default is 127.0.0.1:11211. +If not set in the configuration file, the value for memcache_servers will be read from /etc/swift/memcache.conf (see memcache.conf-sample) or lacking that file, it will default to the value below. You can specify multiple servers separated with commas, as in: 10.1.2.3:11211,10.1.2.4:11211. This can be a list separated by commas. The default is 127.0.0.1:11211. .RE diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index a8cf050a10..bc56ade7ff 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -135,7 +135,7 @@ use = egg:swift#memcache # set log_level = INFO # set log_headers = False # set log_address = /dev/log -# Default for memcache_servers is to try to read the property from +# If not set here, the value for memcache_servers will be read from # memcache.conf (see memcache.conf-sample) or lacking that file, it will # default to the value below. You can specify multiple servers separated with # commas, as in: 10.1.2.3:11211,10.1.2.4:11211