[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  9f69c105329768824b1cbf243662036dca25956f (commit)
      from  3e72a62c4a0bd69e5f2b4380dd070e5587e2c201 (commit)


- Log -----------------------------------------------------------------
commit 9f69c105329768824b1cbf243662036dca25956f
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Oct 26 13:55:52 2016 -0400

    Handle new manpage structure for master

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

Summary of changes:
 Makefile                                   | 6 +++++-
 docs/manmaster/index.html                  | 7 ++++---
 docs/manmaster/{apps => man1}/index.html   | 2 +-
 docs/manmaster/{crypto => man3}/index.html | 5 ++---
 docs/manmaster/{ssl => man5}/index.html    | 7 +++----
 docs/manmaster/{crypto => man7}/index.html | 6 +++---
 6 files changed, 18 insertions(+), 15 deletions(-)
 rename docs/manmaster/{apps => man1}/index.html (95%)
 copy docs/manmaster/{crypto => man3}/index.html (85%)
 rename docs/manmaster/{ssl => man5}/index.html (83%)
 rename docs/manmaster/{crypto => man7}/index.html (85%)

diff --git a/Makefile b/Makefile
index 2ff7768..43da116 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,11 @@ manpages: manmaster
 	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.1-stable,1.0.1)
 
 manmaster:
-	$(call makemanpages,$(CHECKOUTS)/openssl,master)
+	./bin/mk-manpages $(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
 
 # Legacy targets
 hack-source_htaccess: all
diff --git a/docs/manmaster/index.html b/docs/manmaster/index.html
index beac148..dfd87a4 100644
--- a/docs/manmaster/index.html
+++ b/docs/manmaster/index.html
@@ -16,9 +16,10 @@
             parts:
 	    </p>
             <ul>
-              <li><a href="apps">The commands</a></li>
-              <li><a href="ssl">The ssl library</a></li>
-              <li><a href="crypto">The crypto library</a></li>
+              <li><a href="man1">Commands</a></li>
+              <li><a href="man3">Libraries</a></li>
+              <li><a href="man5">File Formats</a></li>
+              <li><a href="man7">Overviews</a></li>
             </ul>
 	  </div>
 	  <footer>
diff --git a/docs/manmaster/apps/index.html b/docs/manmaster/man1/index.html
similarity index 95%
rename from docs/manmaster/apps/index.html
rename to docs/manmaster/man1/index.html
index 0fe45d3..90f1fa2 100644
--- a/docs/manmaster/apps/index.html
+++ b/docs/manmaster/man1/index.html
@@ -31,7 +31,7 @@
 	    : <a href="/docs">Documentation</a>
 	    : <a href="/docs/manpages.html">Manpages</a>
 	    : <a href="/docs/manmaster">master</a>
-	    : <a href="/docs/manmaster/apps">commands</a>
+	    : <a href="/docs/manmaster/man1">commands</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
 	</article>
diff --git a/docs/manmaster/crypto/index.html b/docs/manmaster/man3/index.html
similarity index 85%
copy from docs/manmaster/crypto/index.html
copy to docs/manmaster/man3/index.html
index 6b87a86..6f46995 100644
--- a/docs/manmaster/crypto/index.html
+++ b/docs/manmaster/man3/index.html
@@ -10,8 +10,7 @@
 	  <header><h2>crypto library</h2></header>
 	  <div class="entry-content">
 	    <p>
-	    The <a href="crypto.html">crypto</a> manpage provides a
-	    general overview of the crypto library.
+	    This is the OpenSSL API for the SSL and Crypto libraries.
 	    The detailed list is here:
 	    </p>
 
@@ -31,7 +30,7 @@
 	    : <a href="/docs">Documentation</a>
 	    : <a href="/docs/manpages.html">Manpages</a>
 	    : <a href="/docs/manmaster">master</a>
-	    : <a href="/docs/manmaster/crypto">crypto</a>
+	    : <a href="/docs/manmaster/man3">libraries</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
 	</article>
diff --git a/docs/manmaster/ssl/index.html b/docs/manmaster/man5/index.html
similarity index 83%
rename from docs/manmaster/ssl/index.html
rename to docs/manmaster/man5/index.html
index 5d3213a..64f26a8 100644
--- a/docs/manmaster/ssl/index.html
+++ b/docs/manmaster/man5/index.html
@@ -7,11 +7,10 @@
     <div id="content">
       <div class="blog-index">
 	<article>
-	  <header><h2>ssl library</h2></header>
+	  <header><h2>crypto library</h2></header>
 	  <div class="entry-content">
 	    <p>
-	    The <a href="ssl.html">ssl</a> manpage provides a
-	    general overview of the ssl library.
+            OpenSSL file formats.
 	    The detailed list is here:
 	    </p>
 
@@ -31,7 +30,7 @@
 	    : <a href="/docs">Documentation</a>
 	    : <a href="/docs/manpages.html">Manpages</a>
 	    : <a href="/docs/manmaster">master</a>
-	    : <a href="/docs/manmaster/ssl">ssl</a>
+	    : <a href="/docs/manmaster/man5">file formats</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
 	</article>
diff --git a/docs/manmaster/crypto/index.html b/docs/manmaster/man7/index.html
similarity index 85%
rename from docs/manmaster/crypto/index.html
rename to docs/manmaster/man7/index.html
index 6b87a86..b1dc49d 100644
--- a/docs/manmaster/crypto/index.html
+++ b/docs/manmaster/man7/index.html
@@ -10,8 +10,7 @@
 	  <header><h2>crypto library</h2></header>
 	  <div class="entry-content">
 	    <p>
-	    The <a href="crypto.html">crypto</a> manpage provides a
-	    general overview of the crypto library.
+            OpenSSL overviews.
 	    The detailed list is here:
 	    </p>
 
@@ -31,7 +30,7 @@
 	    : <a href="/docs">Documentation</a>
 	    : <a href="/docs/manpages.html">Manpages</a>
 	    : <a href="/docs/manmaster">master</a>
-	    : <a href="/docs/manmaster/crypto">crypto</a>
+	    : <a href="/docs/manmaster/man7">overviews</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
 	</article>
@@ -42,3 +41,4 @@
 <!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
+