The branch master has been updated
  discards  281bb29486558342679d3e928972c306325d0d7c (commit)
       via  69298c27369f59c4c1cbb4ee34d141aac9adc09e (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 (281bb29486558342679d3e928972c306325d0d7c)
            \
             N -- N -- N (69298c27369f59c4c1cbb4ee34d141aac9adc09e)

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 69298c27369f59c4c1cbb4ee34d141aac9adc09e
Author: Richard Levitte <levi...@openssl.org>
Date:   Tue Feb 13 15:45:58 2018 +0100

    Add 1.1.1 stuff

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

Summary of changes:
 docs/{manmaster => man1.1.1}/index.html          | 6 +++---
 docs/{man1.1.0/apps => man1.1.1/man1}/index.html | 4 ++--
 docs/{manmaster => man1.1.1}/man3/index.html     | 4 ++--
 docs/{manmaster => man1.1.1}/man5/index.html     | 4 ++--
 docs/{manmaster => man1.1.1}/man7/index.html     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 copy docs/{manmaster => man1.1.1}/index.html (88%)
 copy docs/{man1.1.0/apps => man1.1.1/man1}/index.html (91%)
 copy docs/{manmaster => man1.1.1}/man3/index.html (90%)
 copy docs/{manmaster => man1.1.1}/man5/index.html (90%)
 copy docs/{manmaster => man1.1.1}/man7/index.html (90%)

diff --git a/docs/manmaster/index.html b/docs/man1.1.1/index.html
similarity index 88%
copy from docs/manmaster/index.html
copy to docs/man1.1.1/index.html
index 1cc870f..49d2b6c 100644
--- a/docs/manmaster/index.html
+++ b/docs/man1.1.1/index.html
@@ -7,10 +7,10 @@
     <div id="content">
       <div class="blog-index">
        <article>
-         <header><h2>Manpages for master</h2></header>
+         <header><h2>Manpages for 1.1.1</h2></header>
          <div class="entry-content">
            <p>
-            The manual pages for the master branch are
+            The manual pages for the 1.1.1 branch are
             available here.
             The OpenSSL documentation is divided into the following
             sections:
@@ -26,7 +26,7 @@
            You are here: <a href="/">Home</a>
            : <a href="/docs">Documentation</a>
            : <a href="/docs/manpages.html">Manpages</a>
-           : <a href="">master</a>
+           : <a href="">1.1.1</a>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
diff --git a/docs/man1.1.0/apps/index.html b/docs/man1.1.1/man1/index.html
similarity index 91%
copy from docs/man1.1.0/apps/index.html
copy to docs/man1.1.1/man1/index.html
index 1e80193..c0cc99e 100644
--- a/docs/man1.1.0/apps/index.html
+++ b/docs/man1.1.1/man1/index.html
@@ -30,8 +30,8 @@
            You are here: <a href="/">Home</a>
            : <a href="/docs">Documentation</a>
            : <a href="/docs/manpages.html">Manpages</a>
-           : <a href="/docs/man1.1.0">master</a>
-           : <a href="/docs/man1.1.0/apps">commands</a>
+           : <a href="/docs/man1.1.1">1.1.1</a>
+           : <a href="/docs/man1.1.1/man1">commands</a>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
diff --git a/docs/manmaster/man3/index.html b/docs/man1.1.1/man3/index.html
similarity index 90%
copy from docs/manmaster/man3/index.html
copy to docs/man1.1.1/man3/index.html
index 6f46995..d12bda6 100644
--- a/docs/manmaster/man3/index.html
+++ b/docs/man1.1.1/man3/index.html
@@ -29,8 +29,8 @@
            You are here: <a href="/">Home</a>
            : <a href="/docs">Documentation</a>
            : <a href="/docs/manpages.html">Manpages</a>
-           : <a href="/docs/manmaster">master</a>
-           : <a href="/docs/manmaster/man3">libraries</a>
+           : <a href="/docs/man1.1.1">1.1.1</a>
+           : <a href="/docs/man1.1.1/man3">libraries</a>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
diff --git a/docs/manmaster/man5/index.html b/docs/man1.1.1/man5/index.html
similarity index 90%
copy from docs/manmaster/man5/index.html
copy to docs/man1.1.1/man5/index.html
index 64f26a8..a4564ab 100644
--- a/docs/manmaster/man5/index.html
+++ b/docs/man1.1.1/man5/index.html
@@ -29,8 +29,8 @@
            You are here: <a href="/">Home</a>
            : <a href="/docs">Documentation</a>
            : <a href="/docs/manpages.html">Manpages</a>
-           : <a href="/docs/manmaster">master</a>
-           : <a href="/docs/manmaster/man5">file formats</a>
+           : <a href="/docs/man1.1.1">1.1.1</a>
+           : <a href="/docs/man1.1.1/man5">file formats</a>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
diff --git a/docs/manmaster/man7/index.html b/docs/man1.1.1/man7/index.html
similarity index 90%
copy from docs/manmaster/man7/index.html
copy to docs/man1.1.1/man7/index.html
index b1dc49d..49b6a73 100644
--- a/docs/manmaster/man7/index.html
+++ b/docs/man1.1.1/man7/index.html
@@ -29,8 +29,8 @@
            You are here: <a href="/">Home</a>
            : <a href="/docs">Documentation</a>
            : <a href="/docs/manpages.html">Manpages</a>
-           : <a href="/docs/manmaster">master</a>
-           : <a href="/docs/manmaster/man7">overviews</a>
+           : <a href="/docs/man1.1.1">1.1.1</a>
+           : <a href="/docs/man1.1.1/man7">overviews</a>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

Reply via email to