[openssl-commits] [web] beta update

Rich Salz rsalz at openssl.org
Mon Dec 11 17:30:45 UTC 2017


The branch beta has been updated
       via  e43f369b194c52ec3c39f9f29100f3f224215e1a (commit)
       via  bd4dc221678afb84d3db99c9ce9e7004b8542a23 (commit)
       via  d11a31a06a2cafdabcefac864c7059e2250371b1 (commit)
      from  22fe369deffaccab10d1cf82b740a85064f8b782 (commit)


- Log -----------------------------------------------------------------
commit e43f369b194c52ec3c39f9f29100f3f224215e1a
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Dec 11 12:30:32 2017 -0500

    Phase 2, policies->project

commit bd4dc221678afb84d3db99c9ce9e7004b8542a23
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Dec 11 12:27:36 2017 -0500

    Move some policies files to governance
    
    Also phase one of naming policies->project

commit d11a31a06a2cafdabcefac864c7059e2250371b1
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Dec 11 12:18:10 2017 -0500

    Remove old roadmap

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

Summary of changes:
 .../omc-bylaws.html => governance/omc/bylaws.html  |   2 +-
 {policies => governance/osf}/osf-bylaws.pdf        | Bin
 {policies => governance/osf}/oss-bylaws.pdf        | Bin
 {policies => governance/osf}/trademark.html        |   2 +-
 inc/banner.shtml                                   |   2 +-
 policies/roadmap_2015-2016.html                    | 421 ---------------------
 policies/ticket-activity.png                       | Bin 13572 -> 0 bytes
 {policies => project}/cla.html                     |   2 +-
 {policies => project}/codingstyle.html             |   2 +-
 {policies => project}/codingstyle.txt              |   0
 {policies => project}/committers.html              |   8 +-
 {policies => project}/index.html                   |   4 +-
 {policies => project}/openssl_ccla.pdf             | Bin
 {policies => project}/openssl_icla.pdf             | Bin
 {policies => project}/platformpolicy.html          |   2 +-
 {policies => project}/releasestrat.html            |   2 +-
 {policies => project}/roadmap.html                 |   2 +-
 {policies => project}/secpolicy.html               |   2 +-
 {policies => project}/sidebar.shtml                |   8 +-
 sidebar.shtml                                      |   2 +-
 20 files changed, 17 insertions(+), 444 deletions(-)
 rename policies/omc-bylaws.html => governance/omc/bylaws.html (99%)
 rename {policies => governance/osf}/osf-bylaws.pdf (100%)
 rename {policies => governance/osf}/oss-bylaws.pdf (100%)
 rename {policies => governance/osf}/trademark.html (99%)
 delete mode 100644 policies/roadmap_2015-2016.html
 delete mode 100644 policies/ticket-activity.png
 rename {policies => project}/cla.html (98%)
 rename {policies => project}/codingstyle.html (96%)
 rename {policies => project}/codingstyle.txt (100%)
 rename {policies => project}/committers.html (96%)
 rename {policies => project}/index.html (97%)
 rename {policies => project}/openssl_ccla.pdf (100%)
 rename {policies => project}/openssl_icla.pdf (100%)
 rename {policies => project}/platformpolicy.html (97%)
 rename {policies => project}/releasestrat.html (98%)
 rename {policies => project}/roadmap.html (98%)
 rename {policies => project}/secpolicy.html (99%)
 rename {policies => project}/sidebar.shtml (76%)

diff --git a/policies/omc-bylaws.html b/governance/omc/bylaws.html
similarity index 99%
rename from policies/omc-bylaws.html
rename to governance/omc/bylaws.html
index f39bf63..6cb6274 100644
--- a/policies/omc-bylaws.html
+++ b/governance/omc/bylaws.html
@@ -191,7 +191,7 @@
         </div>
         <footer>
           You are here: <a href="/">Home</a>
-          : <a href="/policies">Policies</a>
+          : <a href="/governance/omc">OMC</a>
           : <a href="">Bylaws</a>
           <br/><a href="/sitemap.txt">Sitemap</a>
         </footer>
diff --git a/policies/osf-bylaws.pdf b/governance/osf/osf-bylaws.pdf
similarity index 100%
rename from policies/osf-bylaws.pdf
rename to governance/osf/osf-bylaws.pdf
diff --git a/policies/oss-bylaws.pdf b/governance/osf/oss-bylaws.pdf
similarity index 100%
rename from policies/oss-bylaws.pdf
rename to governance/osf/oss-bylaws.pdf
diff --git a/policies/trademark.html b/governance/osf/trademark.html
similarity index 99%
rename from policies/trademark.html
rename to governance/osf/trademark.html
index f669e46..214ad43 100644
--- a/policies/trademark.html
+++ b/governance/osf/trademark.html
@@ -176,7 +176,7 @@
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
-	    : <a href=".">Policies</a>
+	    : <a href="/policy">Project</a>
 	    : <a href="">Trademark Policy</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
diff --git a/inc/banner.shtml b/inc/banner.shtml
index cd4ad48..95f3cd6 100644
--- a/inc/banner.shtml
+++ b/inc/banner.shtml
@@ -26,7 +26,7 @@
     <li><a href="/source/" title="Source code">Downloads</a></li>
     <li><a href="/docs/" title="FAQ, FIPS, manpages, ...">Docs</a></li>
     <li><a href="/news/" title="Latest information">News</a></li>
-    <li><a href="/policies/" title="How we operate">Policies</a></li>
+    <li><a href="/project/" title="How we operate">Project</a></li>
     <li><a href="/community/" title="Blog, bugs, email, ...">Community</a></li>
     <li><a href="/support/" title="Commercial support and contracting">Support</a></li>
   </ul>
diff --git a/policies/roadmap_2015-2016.html b/policies/roadmap_2015-2016.html
deleted file mode 100644
index 133584a..0000000
--- a/policies/roadmap_2015-2016.html
+++ /dev/null
@@ -1,421 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!--#include virtual="/inc/head.shtml" -->
-
-<body>
-<!--#include virtual="/inc/banner.shtml" -->
-
-<div id="main">
-  <div id="content">
-    <div class="blog-index">
-      <article>
-	<header>
-	  <h2>Project Roadmap</h2>
-	  <h5>
-	    First issued 30th June 2014<br/>
-	    Last modified 8th August 2015
-	  </h5>
-	</header>
-
-	<div class="entry-content">
-	  <p>
-	  This document is intended to outline the OpenSSL project
-	  roadmap. It is a living document and is expected to change
-	  over time. Objectives and dates should be considered
-	  aspirational.</p>
-	  <p>
-	  The OpenSSL project is increasingly perceived as slow-moving
-	  and insular. This roadmap will attempt to address this by
-	  setting out some objectives for improvement, along with
-	  defined timescales.</p>
-
-	  <h3><a name='toc'>Table of Contents:</a></h3>
-
-	  <ol>
-	    <li><a href="#current">Current Issues</a></li>
-	    <li><a href="#objectives">Objectives</a></li>
-	    <li><a href="#forthcoming">Forthcoming Features</a></li>
-	    <li><a href="#update">Roadmap Update History</a></li>
-	  </ol></p>
-	  <p> </p>
-
-
-	  <h3><a name="current">Current Issues</a> <a href="#toc"><img src="/img/up.gif"/></a></h3>
-	  <p>
-	  The OpenSSL project is currently experiencing a number of issues.
-	  These are:</p>
-	  <ol>
-	    <li><em>RT Backlog</em><br/>
-	    Over a period of some considerable time open tickets have
-	    been building up in RT (our bug tracking system) to the
-	    point that now there are a very significant number of
-	    them. A large proportion of these issues have been open
-	    for years. Some of these have in fact been dealt with and
-	    should be closed, but this has not been recorded in the
-	    system. Most however have not been looked at.
-	    </li>
-	    <li><em>Incomplete/incorrect documentation</em><br/>
-	    Documentation of OpenSSL is patchy at best. Some areas are
-	    well documented, while many others suffer from incomplete
-	    or incorrect documentation. There are also many areas
-	    which have no documentation at all.
-	    </li>
-	    <li><em>Library complexity</em><br/>
-	    The OpenSSL libraries and applications are complex,
-	    both from a maintainer's perspective and from a user's
-	    perspective. The public API contains many things which
-	    should probably be internal. The code has been ported
-	    to a large number of platforms, many of which are no
-	    longer relevant to us today, and this complicates the
-	    codebase. Some parts of the code have been in place for
-	    a very long time, and are in need of a refresh. It is
-	    further complicated by the support for FIPS.
-	    This complexity causes maintenance problems, and
-	    can also be the source of obscure and difficult to spot
-	    security vulnerabilities. It can also make users' lives
-	    much more difficult especially when combined with (2)
-	    above.
-	    The current memory management code has
-	    also been a source of problems and vulnerabilities.
-	    </li>
-	    <li><em>Inconsistent coding style</em><br/>
-	    There have been numerous developers working on the codebase
-	    over many years. There are many different styles used within
-	    the code, which is confusing and makes maintenance more
-	    difficult than it should be. Even if strictly consistent,
-	    the current code layout is unusual and idiosyncratic and
-	    unlike any other open source software.
-	    </li>
-	    <li><em>Lack of code review</em><br/>
-	    We don't have a code review system and we don't mandate code
-	    reviews.
-	    </li>
-	    <li><em>No clear release plan</em><br/>
-	    Historically OpenSSL has made new feature releases on
-	    an infrequent basis and no forward plan of releases has
-	    been published. It is difficult for users to plan for new
-	    releases, and understand when new features might become
-	    available, or when support will end for a release. In
-	    addition a large number of stable releases are maintained
-	    by the OpenSSL development team - diverting effort away
-	    from the most up to date versions.
-	    </li>
-	    <li><em>No clear platform strategy</em><br/>
-	    Historically OpenSSL has supported a very wide range of
-	    platforms. Typically platform support has been added through
-	    "ifdef" conditional compilation on a per platform
-	    basis. This approach has led to a number of problems:
-	    <ul>
-	      <li>
-	      The code has become very cluttered and is difficult to
-	      effectively maintain</li>
-	      <li>
-	      There is support still in the code for a number of legacy
-	      platforms which are unlikely to be widely deployed today -
-	      if the code even still works on those platforms</li>
-	      <li>
-	      In practice the development team do not have access to many of
-	      the platforms that the codebase supports and testing typically
-	      takes place on a very limited set (usually Linux, FreeBSD and
-	      Windows)</li>
-	    </ul>
-	    <del>
-	      <li>
-	      <em>No published security strategy</em><br/>
-	      We do not have a well-known and published approach for how we
-	      appropriately inform all interested parties of security
-	      advisories.</li>
-	    </del>
-	  </ol>
-
-	  <p></p>
-
-	  <h3><a name="objectives">Objectives</a> <a href="#toc"><img src="/img/up.gif"/></a></h3>
-	  <p>
-	  Each of the issues identified above can be translated into
-	  high level objectives. Some of these objectives can be
-	  achieved more easily and quickly than others.</p>
-	  <p>
-	  <em>An important principle is that the priority and focus of
-	    effort will be on achieving these objectives over and above
-	    the delivery of new features.</em></p>
-
-	  <h4>RT Backlog</h4>
-	  <ol>
-	    <li>
-	    Manage all newly submitted RT tickets in a timely
-	    manner such as an initial response within four working
-	    days. (Timescale: Now)</li>
-	    <li>
-	    Reduce over time the existing RT backlog (Timescale:
-	    Ongoing). This may include the mass closure of very old
-	    tickets, such as those raised before the release of any
-	    currently supported version.
-	    <p><em>Update (8th September 2014)</em>:
-	    we have made a great deal of progress on the backlog.
-	    A <a href="ticket-activity.png">graph of ticket activity</a>
-	    is available, as is the <a href="buglist.txt">raw data</a>
-	    for every bug showing when it was open, and resolved. We
-	    will update these files periodically.</p></li>
-	  </ol>
-
-	  <h4>Incomplete/incorrect documentation</h4>
-	   <ol>
-	     <li>
-	     Provide complete documentation for all of the public
-	     API (excluding deprecated APIs) (Timescale: Within one year).
-	     </li>
-	     <li>Some parts of the API have historically been public but were
-	     not intended for public use, such as low level cipher and digest
-	     APIs. These parts may not be documented, and if they are will be
-	     marked as deprecated (Timescale: within nine months).</li>
-	     <li>This may include introducing a new documentation system.</li>
-	   </ol>
-
-	  <h4>Library complexity</h4>
-	  <ol>
-	    <li>
-	    Review and revise the public API with a view to reducing complexity
-	    (Timescale: Within one year)</li>
-	    <li>
-	    Document a platform strategy: see below (Timescale: Within three
-	    months)</li>
-	    <li>
-	    <del>Review and refactor the FIPS code to make it far less
-	    intrusive (Timescale: Within one year)</del>
-	    <br>Objective met (2015): The FIPS code has been removed from the
-	    master branch, and will be re-integrated more cleanly during
-	    a future validation.
-	    </li>
-	    <li>
-	    <del>Review and refactor the memory management code.
-	    (Timescale: Within six months)</del>
-	    <br>Objective met (2015): All use of dynamic memory allocation has
-	    been cleaned up and made consistent, and the internal memory
-	    pool has been removed.
-	    </li>
-	  </ol>
-
-	  <h4>Inconsistent coding style</h4>
-	  <ol>
-	    <li>
-	    Define a clear coding standard for the project. This will cover not
-	    only code layout but also items such as how to handle platform
-	    dependencies, unit testing and optional code. (Timescale: Within
-	    three months).</li>
-	    <li>
-	    <del>Format the entire codebase according to the agreed standard.
-	    (Timescale: Within three months of coding standard being
-	    defined).</del>
-	    <br>Objective met (2015): All release branches were
-	    reformatted using a script included in the release.
-	    </li>
-	    <li>
-	    Refactor code to follow other parts of the style guide. (Timescale:
-	    Within one year)</li>
-	  </ol>
-
-	  <h4>Code review</h4>
-	  <ol>
-	    <li>
-	    <del>
-	      Agree and implement a process such that all new commits
-	      should first be reviewed by a team member conversant
-	      with the relevant code and updated until the reviewer's
-	      issues are addressed. This is contingent on recruiting
-	      sufficient team members that reviewers are more-or-less
-	      always available. (Timescale: Within three months)
-	    </del>
-	    <br>Objective met (16th July 2014): All changes are first reviewed by 
-	    another team member prior to being committed to the public openssl 
-	    repository.
-	    </li>
-	    <li>
-	    <del>
-	      Agree on a code review system. (Timescale: Within six months)
-	    </del>
-	    <br>Objective met (2015): We use
-	    <a href="https://gitlab.com">GitLab</a>.
-	    </li>
-	  </ol>
-
-	  <h4>Audit</h4>
-	  <p>
-	  Externally audit the current code base. (Timescale: Dependent on
-	  external body)</p>
-	  <p>Update (14th October 2014):
-	  Auditors selected and funded; schedule being worked on.</p>
-
-	  <h4>Static/Dynamic Analysis</h4>
-	  <p>
-	  Regularly audit the code using appropriate analysis tools.
-	  (Timescale: Within six months)
-	  </p>
-
-	  <h4>Release Strategy</h4>
-	  <del>
-	  <p>
-	  We intend to develop a release strategy which will set out our plans
-	  for how frequently we plan to release, and when. It will also cover
-	  how long releases will be supported for, and when their EOL (End Of
-	  Life) will be. (Timescale: Within three months)</p>
-	  <p>
-	  There are a number of objectives that we would be seeking to address
-	  within the release strategy. Some of these objectives compete with
-	  each other, and so from necessity there will have to be compromises.
-	  The objectives are:
-	  <ol>
-	    <li>
-	    We need security fix releases with very low chance of breaking
-	    anything. This is largely met by prohibiting new features in stable
-	    branches (i.e. letter releases).</li>
-	    <li>
-	    If something is broken in a release a fixed version should be made
-	    available shortly afterwards (i.e. more letter releases more
-	    often)</li>
-	    <li>
-	    We need a way to get new binary compatible features into OpenSSL
-	    relatively quickly.</li>
-	    <li>
-	    We don't want to have to maintain too many branches. This is likely
-	    to include a timescale for the EOL of version 0.9.8</li>
-	    <li>
-	    We need a way to refactor code and make necessary binary
-	    incompatible changes, deprecating APIs etc.</li>
-	  </ol>
-	  </del>
-	  Objective met (2015): We have announced a
-	  <a href="releasestrat.html">release strategy</a>
-	  which includes end-of-life and long-term support definitions.
-	  Also, our
-	  <a href="secpolicy.html">security policy</a> has relevant
-	  information.
-	  </p>
-
-	  <h4>Platform Strategy</h4>
-	  <p>
-	  Moving forward OpenSSL will adopt the following policy:</p>
-	  <ul>
-	    <li>
-	    There will be a defined set of primary platforms. The primary
-	    platforms will be Linux and FreeBSD. A primary platform is one where
-	    most development occurs.</li>
-	    <li>
-	    In addition there will be a list of secondary platforms which are
-	    supported by the development team.</li>
-	    <li>
-	    Platform specific code will be moved out of the main codebase
-	    (removing overuse of "ifdef").</li>
-	    <li>
-	    Legacy platforms that are unlikely to have wide deployment will be
-	    removed from the code.</li>
-	    <li>
-	    Non-supported platforms requiring regular maintenance activities
-	    will eventually be removed from the code after first seeking
-	    community owners to support the platforms in platform specific
-	    repositories.</li>
-	  </ul>
-	  <p>
-	  Necessary criteria for a platform to be included in the secondary
-	  platform list includes:</p>
-	  <ul>
-	    <li>
-	    Currency, i.e. a platform is widely deployed and in current use</li>
-	    <li>
-	    Vendor support</li>
-	    <li>
-	    Available to the dev team, i.e. the dev team have access to a
-	    suitable environment in which to test builds and deal with tickets
-	    and issues</li>
-	    <li>
-	    Dev team ownership, i.e. at least one person on the team is willing
-	    to take some responsibility for a platform.</li>
-	  </ul>
-	  <p>
-	  In addition the secondary list will be as small as possible so as not
-	  to spread the development team too thinly.</p>
-	  <p>
-	  The secondary platforms are still to be defined but will be based on
-	  the above criteria. For each primary/secondary platform, we should
-	  have, at least, a continuous integration box and a dev machine we can
-	  access for test/debug. We will seek support from the platform vendors
-	  or the community to provide access to these platforms. The secondary
-	  platform list will change over time, but an initial list will be
-	  produced within three months.</p>
-	  <p>
-	  The Platform Strategy will be phased in over a period of time based
-	  on how quickly we can refactor the code.</p>
-
-	  <h4>Security Strategy</h4>
-	  <p>
-	  <del>
-	    We will be documenting a security strategy which will define our
-	    policy on how we make security fixes, and what (if any)
-	    pre-notification of forthcoming security releases will be provided
-	    (and to whom) (Timescale: Within two months)
-	  </del>
-	  <br>Objective met (7th September 2014): The OpenSSL security policy
-	  is available <a href="secpolicy.html">here</a>.
-	  </p>
-
-	  <h3><a name="forthcoming">Forthcoming Features</a> <a href="#toc"><img src="/img/up.gif"/></a></h3>
-	  <p>The primary focus of effort will be on achieving the
-	  objectives detailed above, however we are evaluating the following
-	  new features.</p>
-
-	  <ul>
-	    <li>IPv6 support</li>
-	    <li>AEAD updates (API review, Poly/ChaCha support, /dev/crypto
-	    operations coalescing)</li>
-	    <li>TLS 1.3.</li>
-	    <li>Certificate Transparency support</li>
-	    <li>Support for new ciphersuites e.g., CCM</li>
-	    <li>Extended SSL_CONF support</li>
-	    <li>DANE support</li>
-	    <li>Security levels (currently experimental in master)</li>
-	    <li>OCB</li>
-	    <li>FIPS code review and refactor</li>
-	    <li>Support for emerging platforms, e.g. ARMv8, POWER8</li>
-	    <li>Built-in multi-threaded support for two major threading
-	    "flavours," POSIX threads and Win32</li>
-	  </ul>
-	  <p></p>
-
-	  <h3><a name="update">Roadmap Update History</a> <a href="#toc"><img src="/img/up.gif"/></a></h3>
-	  <p>
-	  The following changes have been made since the roadmap was first 
-	  issued 30-June-2014.
-	  </p>
-	  <ul>
-	    <li>8-August-2015.
-	    Many updates, for what happened in 2015.</li>
-	    <li>14-October-2014.
-	    Updated audit; added TLS 1.3 and Certificate
-	    Transparency to features.</li>
-	    <li>8-September-2014.
-	    Updated status on the RT backlog objective.</li>
-	    <li>7-September-2014.
-	    Updated security policy section.</li>
-	    <li>16-July-2014.
-	    Updated code review section.</li>
-	    <li>1-July-2014.
-	    Noted RT is our bug tracking system.</li>
-	  </ul>
-	</div>
-	<footer>
-	  You are here: <a href="/">Home</a>
-	  : <a href="/policies"> Policies</a>
-	  : <a href="">Roadmap</a>.
-	  <br><a href="/sitemap.txt">Sitemap</a>
-	</footer>
-      </article>
-    </div>
-    <!--#include virtual="sidebar.shtml" -->
-  </div>
-</div>
-
-<!--#include virtual="/inc/footer.shtml" -->
-</body>
-
-</html>
-
diff --git a/policies/ticket-activity.png b/policies/ticket-activity.png
deleted file mode 100644
index e88325c..0000000
Binary files a/policies/ticket-activity.png and /dev/null differ
diff --git a/policies/cla.html b/project/cla.html
similarity index 98%
rename from policies/cla.html
rename to project/cla.html
index f234dde..d382c3d 100644
--- a/policies/cla.html
+++ b/project/cla.html
@@ -61,7 +61,7 @@
 	</div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
-	    : <a href=".">Policies</a>
+	    : <a href=".">Project</a>
 	    : <a href="">Contributor Agreements</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
diff --git a/policies/codingstyle.html b/project/codingstyle.html
similarity index 96%
rename from policies/codingstyle.html
rename to project/codingstyle.html
index 78f5e66..93ba9d4 100644
--- a/policies/codingstyle.html
+++ b/project/codingstyle.html
@@ -23,7 +23,7 @@
 
 	  <footer>
 	    You are here: <a href="/">Home</a>
-	    : <a href="">Policies</a>
+	    : <a href="">Project</a>
 	    : <a href="">Coding Style.</a><br/>
 	    <a href="/sitemap.txt">Sitemap</a>
 	  </footer>
diff --git a/policies/codingstyle.txt b/project/codingstyle.txt
similarity index 100%
rename from policies/codingstyle.txt
rename to project/codingstyle.txt
diff --git a/policies/committers.html b/project/committers.html
similarity index 96%
rename from policies/committers.html
rename to project/committers.html
index 0374870..18333a1 100644
--- a/policies/committers.html
+++ b/project/committers.html
@@ -25,7 +25,7 @@
               <h2>How to become a committer?</h2>
               <p>Commit access is granted by the OpenSSL Management Committee
               (OMC) (see the
-              <a href="/policies/omc-bylaws.html">OpenSSL bylaws</a>).
+              <a href="/governance/om/bylaws.html">OpenSSL bylaws</a>).
 
               <p>We welcome contributors who become domain experts in some
               part of the library (for example, low-level crypto) as well as
@@ -39,9 +39,9 @@
               <a href="/community/conduct.html">code of conduct</a>.</p>
 
               <p>To become a committer, start by contributing code. Read our
-              <a href="/policies/codingstyle.html">coding style</a>, and get
+              <a href="/project/codingstyle.html">coding style</a>, and get
               to know our build and test system. Then, use the
-              <a href="/policies/roadmap.html">project roadmap</a>,
+              <a href="/project/roadmap.html">project roadmap</a>,
               <a href="https://github.com/openssl/openssl/issues">Github issue tracker</a>,
               and our
               <a href="/community/mailinglists.html">mailing lists</a>
@@ -129,7 +129,7 @@
 
 	    <footer>
 	      You are here: <a href="/">Home</a>
-	      : <a href="/policies"> Policies</a>
+	      : <a href="/project">Project</a>
 	      : <a href="">Guidelines for Committers</a>.
 	      <br><a href="/sitemap.txt">Sitemap</a>
 	    </footer>
diff --git a/policies/index.html b/project/index.html
similarity index 97%
rename from policies/index.html
rename to project/index.html
index e12703d..b69bf31 100644
--- a/policies/index.html
+++ b/project/index.html
@@ -9,7 +9,7 @@
     <div id="content">
       <div class="blog-index">
 	<article>
-	  <header><h2>Policies</h2></header>
+	  <header><h2>The OpenSSL Software Project</h2></header>
 	  <div class="entry-content">
 	    <p>
 	    In this section we try to document as many of our
@@ -69,7 +69,7 @@
 
 	  <footer>
 	    You are here: <a href="/">Home</a>
-	    : <a href="">Policies</a>
+	    : <a href="">Project</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
 	</article>
diff --git a/policies/openssl_ccla.pdf b/project/openssl_ccla.pdf
similarity index 100%
rename from policies/openssl_ccla.pdf
rename to project/openssl_ccla.pdf
diff --git a/policies/openssl_icla.pdf b/project/openssl_icla.pdf
similarity index 100%
rename from policies/openssl_icla.pdf
rename to project/openssl_icla.pdf
diff --git a/policies/platformpolicy.html b/project/platformpolicy.html
similarity index 97%
rename from policies/platformpolicy.html
rename to project/platformpolicy.html
index 5d59af8..73539d1 100644
--- a/policies/platformpolicy.html
+++ b/project/platformpolicy.html
@@ -49,7 +49,7 @@
 	    </div>
 	    <footer>
 	      You are here: <a href="/">Home</a>
-	      : <a href="/policies"> Policies</a>
+	      : <a href="/project">Project</a>
 	      : <a href="">Platform Policy</a>.
 	      <br><a href="/sitemap.txt">Sitemap</a>
 	    </footer>
diff --git a/policies/releasestrat.html b/project/releasestrat.html
similarity index 98%
rename from policies/releasestrat.html
rename to project/releasestrat.html
index f442cd0..d0a9412 100644
--- a/policies/releasestrat.html
+++ b/project/releasestrat.html
@@ -74,7 +74,7 @@
 	</div>
 	<footer>
 	  You are here: <a href="/">Home</a>
-	  : <a href="/policies">Policies</a>
+	  : <a href="/project">Project</a>
 	  : <a href="">Release Strategy</a>
 	  <br/><a href="/sitemap.txt">Sitemap</a>
 	</footer>
diff --git a/policies/roadmap.html b/project/roadmap.html
similarity index 98%
rename from policies/roadmap.html
rename to project/roadmap.html
index 121f004..a310465 100644
--- a/policies/roadmap.html
+++ b/project/roadmap.html
@@ -110,7 +110,7 @@
 	    </div>
 	    <footer>
 	      You are here: <a href="/">Home</a>
-	      : <a href="/policies">Policies</a>
+	      : <a href="/project">Project</a>
 	      : <a href="">Roadmap</a>.
 	      <br><a href="/sitemap.txt">Sitemap</a>
 	    </footer>
diff --git a/policies/secpolicy.html b/project/secpolicy.html
similarity index 99%
rename from policies/secpolicy.html
rename to project/secpolicy.html
index d6c691c..7e29ad8 100644
--- a/policies/secpolicy.html
+++ b/project/secpolicy.html
@@ -196,7 +196,7 @@
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
-	    : <a href=".">Policies</a>
+	    : <a href="project">Project</a>
 	    : <a href="">Security Policy</a>
 	    <br/><a href="/sitemap.txt">Sitemap</a>
 	  </footer>
diff --git a/policies/sidebar.shtml b/project/sidebar.shtml
similarity index 76%
rename from policies/sidebar.shtml
rename to project/sidebar.shtml
index f7cd8c1..1772027 100644
--- a/policies/sidebar.shtml
+++ b/project/sidebar.shtml
@@ -1,15 +1,12 @@
 <!-- sidebar.inc -->
 <aside class="sidebar">
   <section>
-    <h1><a href=".">Policies</a></h1>
+    <h1><a href=".">Project</a></h1>
     <ul>
       <li>
 	<a href="roadmap.html">Roadmap</a>
       </li>
       <li>
-        <a href="trademark.html">Trademark Policy</a>
-      </li>
-      <li>
         <a href="platformpolicy.html">Platform Policy</a>
       </li>
       <li>
@@ -19,9 +16,6 @@
 	<a href="secpolicy.html">Security Policy</a>
       </li>
       <li>
-	<a href="omc-bylaws.html">OMC (project) Bylaws</a>
-      </li>
-      <li>
         <a href="committers.html">Guidelines for Committers</a>
       </li>
       <li>
diff --git a/sidebar.shtml b/sidebar.shtml
index 37b715e..56ac43e 100644
--- a/sidebar.shtml
+++ b/sidebar.shtml
@@ -13,7 +13,7 @@
         <a href="/news">News: Latest information</a>
       </li>
       <li>
-        <a href="/policies">Policies: How we operate</a>
+        <a href="/project">Project: How we operate</a>
       </li>
       <li>
         <a href="/community">Community: Blog, bugs, email, ...</a>


More information about the openssl-commits mailing list