Merge branch 'main' into event-sdk-todos

open-telemetry · May 23, 2024 · 246a30b · 246a30b
2 parents 2f49c83 + ce9cf49
commit 246a30b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/specification/README.md b/specification/README.md
@@ -50,7 +50,7 @@ path_base_for_github_subdir:
 
 ## Notation Conventions and Compliance
 
-The keywords "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+The keywords "MUST", "MUST NOT", "REQUIRED", "SHOULD",
 "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and "OPTIONAL" in the
 [specification][] are to be interpreted as described in [BCP
 14](https://tools.ietf.org/html/bcp14)
@@ -59,11 +59,10 @@ The keywords "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
 appear in all capitals, as shown here.
 
 An implementation of the [specification][] is not compliant if it fails to
-satisfy one or more of the "MUST", "MUST NOT", "REQUIRED", "SHALL", or "SHALL
-NOT" requirements defined in the [specification][]. Conversely, an
+satisfy one or more of the "MUST", "MUST NOT", "REQUIRED",
+requirements defined in the [specification][]. Conversely, an
 implementation of the [specification][] is compliant if it satisfies all the
-"MUST", "MUST NOT", "REQUIRED", "SHALL", and "SHALL NOT" requirements defined in
-the [specification][].
+"MUST", "MUST NOT", "REQUIRED", requirements defined in the [specification][].
 
 ## Project Naming
 

diff --git a/specification/versioning-and-stability.md b/specification/versioning-and-stability.md
@@ -41,7 +41,7 @@ In this document, the terms "OpenTelemetry" and "language implementations" both
 These terms do not refer to the specification or the Collector in this document.
 
 Each language implementation MUST take these versioning and stability requirements, and produce a language-specific document which details how these requirements will be met.
-This document SHALL be placed in the root of each repo and named `VERSIONING`.
+This document MUST be placed in the root of each repo and named `VERSIONING` or `VERSIONING.md`.
 
 ## Design goals
 
@@ -283,7 +283,7 @@ For stability of telemetry produced by instrumentation see the
 
 Signals MAY eventually be replaced. When this happens, they are marked as deprecated.
 
-Signals SHALL only be marked as deprecated when the replacement becomes stable.
+Signals MUST NOT be marked as deprecated unless the replacement is stable.
 Deprecated code MUST abide by the same support guarantees as stable code.
 
 ### Removed