Merge "Added note to neutron.conf"

diff --cc etc/neutron.conf
index 2455f2fd75d1f51ac624791765c7891696b6f26b,1c9ba02cd6f2c986bf71f68cf2e42a386d1bc1f6..31977a8748ede82300c34098a4b59f5d1cd466cf
--- 1/etc/neutron.conf
--- 2/etc/neutron.conf
+++ b/etc/neutron.conf
@@@ -413,11 -412,11 +413,15 @@@ admin_password = %SERVICE_PASSWORD
  # Replace 127.0.0.1 above with the IP address of the database used by the
  # main neutron server. (Leave it as is if the database runs on this host.)
  # connection = sqlite://
+ # NOTE: In deployment the [database] section and its connection attribute may
+ # be set in the corresponding core plugin '.ini' file. However, it is suggested
+ # to put the [database] section and its connection attribute in this
+ # configuration file.
  
 +# Database engine for which script will be generated when using offline
 +# migration
 +# engine =
 +
  # The SQLAlchemy connection string used to connect to the slave database
  # slave_connection =