[openssl-commits] [web] master update

[Richard Levitte]

The branch master has been updated
  discards  a8cb4667b61d9c91e7fcfb0aa056d3226950ab20 (commit)
       via  774bd55145377e4911dae22055eaea454b617325 (commit)
       via  207f3ec89dda4bc78a40fa12da564a8c7653cd53 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a8cb4667b61d9c91e7fcfb0aa056d3226950ab20)
            \
             N -- N -- N (774bd55145377e4911dae22055eaea454b617325)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


- Log -----------------------------------------------------------------
commit 774bd55145377e4911dae22055eaea454b617325
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 13 15:45:58 2018 +0100

    Add 1.1.1 stuff

commit 207f3ec89dda4bc78a40fa12da564a8c7653cd53
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 13 15:44:45 2018 +0100

    Remake 'manmaster' into 'newmanpages'
    
    Generalise it with a multi-line macro, as we'll use it for more than
    just master.

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

Summary of changes:
 Makefile                             | 8 ++------
 bin/{mk-manmaster => mk-newmanpages} | 0
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename bin/{mk-manmaster => mk-newmanpages} (100%)

diff --git a/Makefile b/Makefile
index 55a89c4..2ba6f57 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ define makemanpages
 	./bin/mk-filelist -a docs/man$(2)/ssl '' '*.html' >docs/man$(2)/ssl/index.inc
 endef
 define newmakemanpages
-	./bin/mk-manpages $(1) $(2) docs
+	./bin/mk-newmanpages $(1) $(2) docs
 	./bin/mk-filelist -a docs/man$(2)/man1 '' '*.html' >docs/man$(2)/man1/index.inc
 	./bin/mk-filelist -a docs/man$(2)/man3 '' '*.html' >docs/man$(2)/man3/index.inc
 	./bin/mk-filelist -a docs/man$(2)/man5 '' '*.html' >docs/man$(2)/man5/index.inc
@@ -74,11 +74,7 @@ manpages: manmaster
 	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2)
 
 manmaster:
-	./bin/mk-manmaster $(CHECKOUTS)/openssl master docs
-	./bin/mk-filelist -a docs/manmaster/man1 '' '*.html' >docs/manmaster/man1/index.inc
-	./bin/mk-filelist -a docs/manmaster/man3 '' '*.html' >docs/manmaster/man3/index.inc
-	./bin/mk-filelist -a docs/manmaster/man5 '' '*.html' >docs/manmaster/man5/index.inc
-	./bin/mk-filelist -a docs/manmaster/man7 '' '*.html' >docs/manmaster/man7/index.inc
+	$(call newmakemanpages,$(CHECKOUTS)/openssl,master)
 
 ## $(SIMPLE) -- SIMPLE GENERATED FILES
 .PHONY: sitemap community/committers.inc
diff --git a/bin/mk-manmaster b/bin/mk-newmanpages
similarity index 100%
rename from bin/mk-manmaster
rename to bin/mk-newmanpages