[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  355b419698bd6f8db03cd79007fc0da1e757e794 (commit)
      from  56e840fe2d7163ba07bf3ef9b8daf1d368c7696c (commit)


- Log -----------------------------------------------------------------
commit 355b419698bd6f8db03cd79007fc0da1e757e794
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Jun 6 16:38:26 2019 +1000

    Address property documentation concerns.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/9090)

-----------------------------------------------------------------------

Summary of changes:
 doc/man7/property.pod | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/man7/property.pod b/doc/man7/property.pod
index 1fa6440..a9b2a77 100644
--- a/doc/man7/property.pod
+++ b/doc/man7/property.pod
@@ -126,20 +126,16 @@ Two levels of property query are supported.
 A context based property query that applies to all fetch operations and a local
 property query.
 Where both the context and local queries include a clause with the same name,
-the local clause is used and the context one ignored.
-For example, a context property query of "fips=yes" and a local property query
-of "fips=no" would result in algorithms that have the "fips" property set t
-"no".
+the local clause overrides the context clause.
 
-=head2 Override
-
-It is possible for a local property query to override a clause in the context
+It is possible for a local property query to remove a clause in the context
 property query by preceeding the property name with a '-'.
-For example, a conxtet property query that contains "fips=yes" would normally
+For example, a context property query that contains "fips=yes" would normally
 result in implementations that have "fips=yes".
-However, if the setting of
-the "fips" property is irrelevant to the operations being performed, the local
-property query can include the clause "-fips".
+
+However, if the setting of the "fips" property is irrelevant to the
+operations being performed, the local property query can include the
+clause "-fips".
 Note that the local property query could not use "fips=no" because that would
 disallow any implementations with "fips=yes" rather than not caring about the
 setting.