diff options
Diffstat (limited to 'documentation/contributor-guide')
-rw-r--r-- | documentation/contributor-guide/recipe-style-guide.rst | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/documentation/contributor-guide/recipe-style-guide.rst b/documentation/contributor-guide/recipe-style-guide.rst index 7e336a0424..e03b8ff2ba 100644 --- a/documentation/contributor-guide/recipe-style-guide.rst +++ b/documentation/contributor-guide/recipe-style-guide.rst | |||
@@ -292,13 +292,10 @@ following status strings: | |||
292 | Submitted to upstream, waiting for approval. Optionally include where | 292 | Submitted to upstream, waiting for approval. Optionally include where |
293 | it was submitted, such as the author, mailing list, etc. | 293 | it was submitted, such as the author, mailing list, etc. |
294 | 294 | ||
295 | ``Accepted`` | 295 | ``Backport [version]`` |
296 | Accepted in upstream, expect it to be removed at next update, include | 296 | Accepted upstream and included in the next release, or backported from newer |
297 | expected version info. | 297 | upstream version, because we are at a fixed version. |
298 | 298 | Include upstream version info (e.g. commit ID or next expected version). | |
299 | ``Backport`` | ||
300 | Backported from new upstream version, because we are at a fixed version, | ||
301 | include upstream version info. | ||
302 | 299 | ||
303 | ``Denied`` | 300 | ``Denied`` |
304 | Not accepted by upstream, include reason in patch. | 301 | Not accepted by upstream, include reason in patch. |
@@ -350,7 +347,7 @@ Here's an example of a patch that has been submitted upstream:: | |||
350 | 347 | ||
351 | Signed-off-by: Joe Developer <joe.developer@example.com> | 348 | Signed-off-by: Joe Developer <joe.developer@example.com> |
352 | 349 | ||
353 | A future update can change the value to ``Accepted`` or ``Denied`` as | 350 | A future update can change the value to ``Backport`` or ``Denied`` as |
354 | appropriate. | 351 | appropriate. |
355 | 352 | ||
356 | Another example of a patch that is specific to OpenEmbedded:: | 353 | Another example of a patch that is specific to OpenEmbedded:: |