Repository: qpid-dispatch Updated Branches: refs/heads/master b6944e8af -> a2529d427
DISPATCH-362 - Fixed the man page doc of ssl-profile and its attributes to use camel case Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a2529d42 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a2529d42 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a2529d42 Branch: refs/heads/master Commit: a2529d4272a62a7ddf8d490e1b5de0f895386414 Parents: b6944e8 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Tue Jun 7 09:29:46 2016 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Tue Jun 7 09:29:46 2016 -0400 ---------------------------------------------------------------------- doc/man/qdrouterd_conf_man.py | 24 +++++++++++----------- python/qpid_dispatch/management/qdrouter.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a2529d42/doc/man/qdrouterd_conf_man.py ---------------------------------------------------------------------- diff --git a/doc/man/qdrouterd_conf_man.py b/doc/man/qdrouterd_conf_man.py index 10b83d1..fadb574 100644 --- a/doc/man/qdrouterd_conf_man.py +++ b/doc/man/qdrouterd_conf_man.py @@ -54,9 +54,9 @@ The configuration file is made up of sections with this syntax: :: - SECTION-NAME { - ATTRIBUTE-NAME: ATTRIBUTE-VALUE - ATTRIBUTE-NAME: ATTRIBUTE-VALUE + sectionName { + attributeName: attributeValue + attributeName: attributeValue ... } @@ -68,25 +68,25 @@ configured via management tools as well as via the configuration file. *Annotation sections* define a group of attribute values that can be included in one or more entity sections. -For example you can define an "ssl-profile" annotation section with SSL credentials +For example you can define an "sslProfile" annotation section with SSL credentials that can be included in multiple "listener" entities. Here's an example, note -how the 'ssl-profile' attribute of 'listener' sections references the 'name' -attribute of 'ssl-profile' sections. +how the 'sslProfile' attribute of 'listener' sections references the 'name' +attribute of 'sslProfile' sections. :: - ssl-profile { + sslProfile { name: ssl-profile-one - cert-db: ca-certificate-1.pem - cert-file: server-certificate-1.pem - key-file: server-private-key.pem + certDb: ca-certificate-1.pem + certFile: server-certificate-1.pem + keyFile: server-private-key.pem } listener { - ssl-profile: ssl-profile-one + sslProfile: ssl-profile-one host: 0.0.0.0 port: 20102 - sasl-mechanisms: ANONYMOUS + saslMechanisms: ANONYMOUS } """) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a2529d42/python/qpid_dispatch/management/qdrouter.json ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index 7adc2e8..a943121 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -105,8 +105,8 @@ }, "sslProfileName": { "type": "string", - "description": "The name of the ssl profile", - "create": false + "description": "The name of the ssl profile. This is for internal use only. Use the 'name' attribute to assign a name to an sslProfile section ", + "create": false } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
