[openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  32d40d0d8942ac7156066c55354dc174f7b8b3bc (commit)
       via  a9d2d52ed1b56a72e6dd0e24357dea0bb84c3550 (commit)
      from  695dd3a332fdd54b873fd0d08f9ae720141f24cd (commit)


- Log -----------------------------------------------------------------
commit 32d40d0d8942ac7156066c55354dc174f7b8b3bc
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Feb 19 20:29:53 2019 +0100

    Make sure that generated POD files are actually created before we run doc-nits
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    GH: #8285

commit a9d2d52ed1b56a72e6dd0e24357dea0bb84c3550
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Tue Feb 19 20:24:08 2019 +0100

    Indent with 4
    
    doc-nits says that over needs a parameter
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    GH: #8285

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

Summary of changes:
 Configurations/unix-Makefile.tmpl   | 2 +-
 doc/man7/openssl_user_macros.pod.in | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 0b744bb..1e6709f 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -721,7 +721,7 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects \
           generate_crypto_conf generate_crypto_asn1 generate_fuzz_oids
 
 .PHONY: doc-nits
-doc-nits:
+doc-nits: build_generated
 	(cd $(SRCDIR); $(PERL) util/find-doc-nits -n -p ) >doc-nits
 	@if [ -s doc-nits ] ; then cat doc-nits ; exit 1; \
 	else echo 'doc-nits: no errors.'; rm doc-nits ; fi
diff --git a/doc/man7/openssl_user_macros.pod.in b/doc/man7/openssl_user_macros.pod.in
index 30b8121..17c2d2e 100644
--- a/doc/man7/openssl_user_macros.pod.in
+++ b/doc/man7/openssl_user_macros.pod.in
@@ -19,7 +19,7 @@ user defined macros.
 
 =head2 The macros
 
-=over
+=over 4
 
 =item B<OPENSSL_API_COMPAT>
 
@@ -30,7 +30,7 @@ be declared.
 
 The version number assigned to this macro can take one of two forms:
 
-=over
+=over 4
 
 =item C<0xMNNFF000L>
 
@@ -43,7 +43,7 @@ Any version number may be given, but these numbers are
 the current known major deprecation points, making them the most
 meaningful:
 
-=over
+=over 4
 
 =item C<0x00908000L> (version 0.9.8)
 
@@ -63,7 +63,7 @@ This form is a simple number that represents the major version number
 and is supported for version 3.0.0 and up.  For extra convenience,
 these numbers are also available:
 
-=over
+=over 4
 
 =item Z<>0 (C<0x00908000L>, i.e. version 0.9.8)