TM committee dissolving

BRANDING.MD

@@ -18,7 +18,8 @@ trademark law.
 
 Given the open nature of Knative, you may use the Knative trademark to refer
 to the project without prior written permission in accordance with these
-guidelines. Please contact the Knative Trademark Committee if your proposed use case does not fall within these pre-approved categories.
+guidelines. Please contact the [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch) 
+if your proposed use case does not fall within these pre-approved categories.
 
 Examples of approved references include the following:
 
@@ -43,7 +44,8 @@ Suggested templates:
 * The Knative name may not be used or registered in a manner that would cause
   confusion as to the CNCF’s affiliation or endorsement (as the trademark owner).
 * Don't use the Knative name as part of your company name, product name,
-  domain name, or social media profile unless explicitly approved in advance by the Knative Trademark Committee.
+  domain name, or social media profile unless explicitly approved in advance by the
+  [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch).
 * Other than as permitted by these guidelines, the Knative name should not be
   combined with other trademarks, terms, or source identifiers.
 * Don't remove, distort or alter any element of the Knative Trademarks without
@@ -68,14 +70,14 @@ Suggested templates:
   promotional materials should also prominently disclaim any official
   affiliation with or endorsement by Google and the Knative project.
 * Don't use the Knative logo on product UI, or promotional materials without
-  the Knative trademark owner’s  prior written permission. The Knative
-  [Trademark Committee](https://github.com/knative/community/blob/main/TRADEMARK-COMMITTEE.md#getting-in-touch)
+  the Knative trademark owner’s  prior written permission. The
+  [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch)
   will coordinate any communications with the trademark owner.
 * You may use the Knative name or logo for non-commercial swag purposes.
 * Don't use the Knative name or logo to indicate that your design or
   implementation is compatible with Knative without prior written permission. 
 
-The Knative Trademark Committee understands the community desire for a
+The Knative Steering Committee understands the community desire for a
 conformance standard, and we do plan to implement one at a future date. We
 also recognize that conformance is a complicated issue with many variables,
 and it is still early days for the Knative project. For comparison, the
@@ -85,7 +87,7 @@ is to have a Conformance Working Group created soon.
 
 For details on the conformance process, see [Qualifying Offerings and Self-Testing](https://github.com/knative/specs/blob/main/knative-conformance.md) and [Knative Conformance Certification](https://github.com/knative/specs/blob/main/docs/conformance_procedure.md).
 
-The Knative Trademark Owner and the Knative Trademark Committee reserve the
+The Knative Trademark Owner and the Knative Steering Committee reserve the
 right to approve or deny trademark permission for specific use cases
 in the best interest of the Knative Community.
 

CALENDAR.MD

@@ -9,7 +9,6 @@ Access to add new events to the calendar is available to folks that have a
 
 * Working Group leads
 * Steering Committee members
-* Knative Trademark Committee members
 
 However, if there are other folks that have a need to have a @knative.team
 account, please file an issue with Steering Committee, or send an email to
@@ -22,4 +21,4 @@ existing account (at least in some cases).
 
 If there's a one-off calendar invite needed, please send an email to
 `[email protected]` with the details of the event and we can
-create the event for you.
+create the event for you.

GOVERNANCE.md

@@ -7,12 +7,9 @@ aliases:
   - /contributing/governance/
 ---
 
-Knative Governance is broken into three components. At a high level, the Knative
-Steering Committee (KSC) is the "root" level governance body, but the Knative
-Trademark Committee (KTC) operates within a protected governance umbrella in
-parallel with the KSC. As such, the KSC may investigate and enforce Code of
-Conduct actions against members of the KTC, but may not alter the charter or
-governance of the KTC rules. The Tech Oversight Committee (TOC) operates
+Knative Governance is broken into two components. At a high level, the Knative
+Steering Committee (KSC) is the "root" level governance body.
+The Tech Oversight Committee (TOC) operates
 entirely within the governance definitions delineated by the KSC.
 
 ## Community and Operations
@@ -24,7 +21,7 @@ platforms, and test resources.
 
 ## Trademarks
 
-The [Knative Trademark Committee](./TRADEMARK-COMMITTEE.md) is responsible for
+The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for
 management, licensing, and conformance verification of Knative logos, names, and
 trademarks, including the definition of what "Knative" is and the definition and
 rules for usage of derived marks.

README.md

@@ -27,7 +27,6 @@ Other Documents
   committee
 - [Technical Oversight Committee](./TECH-OVERSIGHT-COMMITTEE.md) - describes our
   technical oversight committee
-- [Trademark Committee](./TRADEMARK-COMMITTEE.md) - describes our trademark committee
 - [Community Roles](./ROLES.md) - describes the roles individuals can assume
   within the Knative community
 - [Reviewing and Merging Pull Requests](./REVIEWING.md) - how we manage pull

REPOSITORY-GUIDELINES.md

@@ -180,18 +180,18 @@ of pluggability.
 
 The following are not required to create a working-group-owned repository:
 
-- Steering or Trademark approval (see ["the fine print"](#the-fine-print))
+- Steering approval (see ["the fine print"](#the-fine-print))
 - TOC approval
   - TOC may request certain naming patterns (e.g. `kn-plugin` for client WG)
 - Solving an unique problem (exploring different approaches to problems outside
   the core is actively encouraged!)
 
 ### The fine print
 
-Steering and Trademark reserve the right to require that repos be removed or
+Steering reserve the right to require that repos be removed or
 transferred out of the `knative-extensions` organization and API groups to be
 renamed. This is intended to simplify the process in the common case, while
-giving Steering or Trademark the ability to step in and rectify problems that
+giving Steering the ability to step in and rectify problems that
 may arise.
 
 ### Deletion

STEERING-COMMITTEE.md

@@ -43,9 +43,8 @@ evolve as the community and project change.
 1. Steward, control access, delegate access, and establish processes regarding
    all Knative project resources and has the final say in the disposition of
    those resources.
-1. Advise the Trademark Committee on usage of the brand and marks in relation to
-   promoting the community. This advice is non-binding on the Trademark
-   Committee.
+1. Coordinate with the CNCF regarding usage of the Knative brand and how that 
+   brand can be used in relation to other efforts or vendors.
 1. Define and evolve the scope of the Knative community and extensions, and the
    process for migration of extensions projects into Knative Extensions.
 1. Receive and handle reports about [code of conduct](./CODE-OF-CONDUCT.md)

TECH-OVERSIGHT-COMMITTEE.md

@@ -37,6 +37,9 @@ product and design decisions.
 
   - Approve the creation/deletion of GitHub repositories, along with other
     high-level administrative issues around GitHub and our other tools.
+
+  - Advise the Steering Committe on conformance rules and tests that 
+    define brand use decisions.
 
 - Happy Healthy Community
 

groups/restrictions.yaml

@@ -2,9 +2,6 @@ restrictions:
   - path: "committee-code-of-conduct/groups.yaml"
     allowedGroups:
       - "^[email protected]$"
-  - path: "committee-trademark/groups.yaml"
-    allowedGroups:
-      - "^[email protected]$"
   - path: "committee-oversight/groups.yaml"
     allowedGroups:
       - "^[email protected]$"

mechanics/GDRIVE.md

@@ -51,7 +51,6 @@ There are several mailing lists set up to manage permission groups (some could a
 
 *   wg-leads – all working group leads, gives update permission on the Knative official events calendar
 *   steering – steering committee members
-*   trademark – trademark committee members
 *   (TODO) toc – tech oversight committee members
 
 

mechanics/SC.md

@@ -59,7 +59,7 @@ year but is not captured in the stats.knative.dev dashboard, they will be able
 to submit an exception form to the steering committee who will then review and
 determine whether this member should be marked as an exception.
 
-Additionally, anyone serving on the SC, TOC, or Trademark Committee will 
+Additionally, anyone serving on the SC or TOC will 
 automatically be eligible to vote regardless of their number of contributions.
 
 All eligible voters will be captured at

mechanics/TOC.md

@@ -53,7 +53,7 @@ year but is not captured in the stats.knative.dev dashboard, they will be able
 to submit an exception form to the steering committee who will then review and
 determine whether this member should be marked as an exception.
 
-Additionally, anyone serving on the SC, TOC, or Trademark Committee will 
+Additionally, anyone serving on the SC or TOC will 
 automatically be eligible to vote regardless of their number of contributions.
 
 All eligible voters will be captured at

peribolos/knative-OWNERS_ALIASES

@@ -78,16 +78,13 @@ aliases:
   - knative-prow-updater-robot
   - knative-test-reporter-robot
   - krsna-m
-  - mchmarny
   - nainaz
   - pierDipi
   - psschwei
   - puerco
   - salaboy
   - skonto
-  - smoser-ibm
   - upodroid
-  - xtreme-sameer-vohra
   knative-release-leads:
   - Cali0707
   - Leo6Leo
@@ -163,10 +160,6 @@ aliases:
   - dsimansk
   - krsna-m
   - psschwei
-  trademark-committee:
-  - mchmarny
-  - smoser-ibm
-  - xtreme-sameer-vohra
   ux-wg-leads:
   - cali0707
   - leo6leo

peribolos/knative.yaml

@@ -536,13 +536,6 @@ orgs:
             - puerco
             - salaboy
             privacy: closed
-          Trademark Committee:
-            description: Knative Trademark Committee
-            maintainers:
-            - xtreme-sameer-vohra
-            - smoser-ibm
-            - mchmarny
-            privacy: closed
           Technical Oversight Committee:
             description: Members of the Knative Technical Oversight Committee (TOC)
             maintainers: