From b7c886938e8e1fee9494170bf52a8b14c909ffd1 Mon Sep 17 00:00:00 2001
From: Zach Corleissen <zacharysarah@users.noreply.github.com>
Date: Wed, 21 Aug 2019 15:52:31 -0700
Subject: [PATCH] Update chair and approver info (#15988)

Remove shavidissa from approvers

Add emeritus approvers
---
 OWNERS            | 4 ++++
 OWNERS_ALIASES    | 8 +-------
 SECURITY_CONTACTS | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/OWNERS b/OWNERS
index 62138a57ba094..f1f2f3587388c 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,5 +6,9 @@ reviewers:
 approvers:
 - sig-docs-en-owners # Defined in OWNERS_ALIASES
 
+emeritus_approvers:
+- chenopis
+- jaredbhatti
+
 labels:
 - sig/docs
\ No newline at end of file
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index a4881cbe177f8..dd33e0ce96109 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -50,21 +50,18 @@ aliases:
     - mistyhacks
     - rajakavitha1
     - ryanmcginnis
-    - shavidissa
     - simplytunde
     - steveperry-53
     - stewart-yu
     - tengqm
     - tfogo
+    - xiangpengzhao
     - zacharysarah
     - zparnold
   sig-docs-en-reviews: # PR reviews for English content
-    - jimangel
     - rajakavitha1
     - sftim
     - stewart-yu
-    - xiangpengzhao
-    - zhangxiaoyu-zidif
   sig-docs-es-owners: # Admins for Spanish content
     - raelga
     - alexbrand
@@ -144,11 +141,8 @@ aliases:
     - seokho-son
   sig-docs-maintainers: # Website maintainers
     - bradamant3
-    - chenopis
-    - jaredbhatti
     - jimangel
     - kbarnard10
-    - mistyhacks
     - pwittrock
     - steveperry-53
     - tengqm
diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS
index a91048f714175..6c33b7c038527 100644
--- a/SECURITY_CONTACTS
+++ b/SECURITY_CONTACTS
@@ -10,6 +10,6 @@
 # DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
 # INSTRUCTIONS AT https://kubernetes.io/security/
 
-chenopis
 bradamant3
+jimangel
 zacharysarah