From 5c90b82fdeb84d3c9b685d4ae5db477341de58f6 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 24 Jun 2014 13:27:08 +0200
Subject: [PATCH] [ticket/12662] Change new event names and fix events.md

Previously merged PR said b4 instead of b5, also not alphabetical.

PHPBB3-12662
---
 phpBB/docs/events.md                          | 74 +++++++++----------
 .../prosilver/template/navbar_header.html     |  8 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index cc32e7ba26..5a4d9dc341 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -344,25 +344,53 @@ memberlist_view_user_statistics_before
 * Since: 3.1.0-a1
 * Purpose: Add entries before the user statistics part of any user profile
 
-navbar_header_username_append
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
-* Purpose: Add text and HTMl after the username shown in the navbar.
-
 navbar_header_logged_out_content
 ===
 * Locations:
     + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
+* Since: 3.1.0-b5
 * Purpose: Add text and HTML in place of the username when not logged in.
 
+navbar_header_profile_list_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the profile drop-down menu in the header navbar
+
+navbar_header_profile_list_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the profile drop-down menu in the header navbar
+
+navbar_header_quick_links_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the quick-links drop-down menu in the header
+
+navbar_header_quick_links_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the quick-links drop-down menu in the header
+
+navbar_header_username_append
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add text and HTMl after the username shown in the navbar.
+
 navbar_header_username_prepend
 ===
 * Locations:
     + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
+* Since: 3.1.0-b5
 
 overall_footer_after
 ===
@@ -515,34 +543,6 @@ overall_header_page_body_before
 * Since: 3.1.0-b3
 * Purpose: Add content after the page-header, but before the page-body
 
-overall_header_profile_list_after
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b5
-* Purpose: Add links to the bottom of the profile drop-down menu in the page-header
-
-overall_header_profile_list_before
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b5
-* Purpose: Add links to the top of the profile drop-down menu in the page-header
-
-overall_header_quick_links_after
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b5
-* Purpose: Add links to the bottom of the quick-links drop-down menu in the header
-
-overall_header_quick_links_before
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b5
-* Purpose: Add links to the top of the quick-links drop-down menu in the header
-
 posting_editor_buttons_after
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index eb1d1feb12..58629d3be8 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -8,7 +8,7 @@
 			<div class="dropdown hidden">
 				<div class="pointer"><div class="pointer-inner"></div></div>
 				<ul class="dropdown-contents" role="menu">
-					<!-- EVENT overall_header_quick_links_before -->
+					<!-- EVENT navbar_header_quick_links_before -->
 
 					<!-- IF S_DISPLAY_SEARCH -->
 						<li class="separator"></li>
@@ -26,7 +26,7 @@
 					<!-- ENDIF -->
 					<li class="separator"></li>
 
-					<!-- EVENT overall_header_quick_links_after -->
+					<!-- EVENT navbar_header_quick_links_after -->
 				</ul>
 			</div>
 		</li>
@@ -47,12 +47,12 @@
 				<ul class="dropdown-contents" role="menu">
 					<!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF -->
 
-					<!-- EVENT overall_header_profile_list_before -->
+					<!-- EVENT navbar_header_profile_list_before -->
 
 					<li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li>
 					<li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li>
 
-					<!-- EVENT overall_header_profile_list_after -->
+					<!-- EVENT navbar_header_profile_list_after -->
 
 					<li class="separator"></li>
 					<li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li>