Fix navbar and shorten page title

Author: graeme-a-stewart

_includes/navbar.ext

@@ -56,8 +56,8 @@
             <li class="dropdown">
               <a class="dropdown-toggle" data-toggle="dropdown" href="{{ site.baseurl }}/projects.html" id="projects_menu"><span class="glyphicon glyphicon-road"></span>&nbsp;&nbsp;Projects &amp; Support<span class="caret"></span></a>
                 <ul class="dropdown-menu" aria-labelledby="projects_menu">
-                  <li><a href="{{ site.baseurl }}/organization/affiliated.html">HSF Affiliated Projects and Software</a></li>
-                  <li><a href="{{ site.baseurl }}/organization/guidelines.html">Guidelines for HSF Affiliated Projects and Software, and Endorsement Badge Assignments</a></li>
+                  <li><a href="{{ site.baseurl }}/projects/affiliated.html">HSF Affiliated Projects and Software</a></li>
+                  <li><a href="{{ site.baseurl }}/projects/guidelines.html">Projects and Software Guidelines</a></li>
                   <li class="divider"></li>
                   <li><a href="{{ site.baseurl }}/project_guidelines.html">How to join as a project</a></li>
                   <li><a href="{{ site.baseurl }}/projects.html">Member Projects</a></li>

projects/guidelines.md

@@ -1,10 +1,9 @@
 ---
-title: "Guidelines for HSF Affiliated Projects and Software, and Endorsement Badge Assignments"
+title: "Affiliated Projects and Software Guidelines"
 author: Eduardo Rodrigues, Pere Mato
 layout: plain
 ---
 
-
 In a spirit of openness and flexibility, the HSF maintains an evolving checklist of best practices for HSF Affiliated Projects and Software, rather than a set of requirements.
 HSF Affiliated Projects and Software need to abide by (at least a subset of) the guidelines,
 which are used for their endorsement and attribution of Bronze, Silver or Gold levels of recognition.
@@ -18,7 +17,6 @@ The guidelines can be updated in light of updates or release of community practi
 
 The guidelines take inspiration from the [“old HSF page”](https://hepsoftwarefoundation.org/project_guidelines.html) and from the [Open Source Security Foundation (OpenSSF)’s page](https://www.bestpractices.dev/en/criteria).
 
-
 ## Best-practice Guidelines
 
 ### General guidelines