From 40677e6182ce6bd3252b32cb58e960cfc956935e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Sun, 30 Jun 2024 19:19:10 +0200 Subject: [PATCH] rn-112: minor copy edit --- rev_news/drafts/edition-112.md | 60 ++++++++++++++++------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/rev_news/drafts/edition-112.md b/rev_news/drafts/edition-112.md index 7c4a4f77c..dedde462c 100644 --- a/rev_news/drafts/edition-112.md +++ b/rev_news/drafts/edition-112.md @@ -13,7 +13,7 @@ Welcome to the 112th edition of [Git Rev News](https://git.github.io/rev_news/re a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the months of May 2024 and June 2024. +This edition covers what happened during the months of May and June 2024. ## Discussions @@ -54,9 +54,9 @@ This edition covers what happened during the months of May 2024 and June 2024. So Junio was happy that "somebody has bit it ;-)" and suggested a number of topics that could be added to the document Patrick wanted - to create. This started a discussion about deprecating or not some - features like the `restore`, `switch`, `submodules` and `worktrees` - subcommands. + to create. This started a discussion about the possibility of + deprecating some features, such as the `restore`, `switch`, + `submodules` and `worktrees` subcommands. In the RFC patch to add the document, Patrick mentioned some of the topics suggested by Junio, but not others that seemed controversial @@ -74,7 +74,7 @@ This edition covers what happened during the months of May 2024 and June 2024. section for the features we don't want to drop. Dragan Simic, who participated in the previous discussions in the - `git config` thread, repeated that he didn't want to see neither + `git config` thread, repeated that he didn't want to see any of `git restore`, `git switch` or `git checkout` deprecated, which Patrick agreed shouldn't be done. @@ -93,15 +93,15 @@ This edition covers what happened during the months of May 2024 and June 2024. Patrick then sent a [version 2 of his patch](https://lore.kernel.org/git/2ef53ff98b12fe9373a15ec3a795235f040d9049.1715667067.git.ps@pks.im/) - which added section about features "that are _not_ to be - deprecated". Some features were also added while deprecating the - hook directory was removed for now. + adding a section about features "that are _not_ to be + deprecated" and proposing some further deprecations, while withdrawing + the $GITDIR/hooks directory deprecation proposal. - Karthik Nayak replied to the version 2 patch listing a number of - commands not mentioned in the document that do similar things which + Karthik Nayak replied to the version 2 patch, listing a number of + commands not mentioned in the document that do similar things, which might indicate that some of them could be deprecated too. Patrick, Junio and Dragan discussed these commands, but decided that only - `git pickaxe`, which is an alias for `git blame` could be removed + `git pickaxe`, which is an alias for `git blame`, could be removed for now. So Patrick sent a @@ -116,11 +116,11 @@ This edition covers what happened during the months of May 2024 and June 2024. Patrick sent a [version 4](https://lore.kernel.org/git/cover.1717141598.git.ps@pks.im/) where the single patch had been broken down into 4 patches. In the - process a lot of the proposed deprecation from the previous version + process a lot of the proposed deprecations from the previous version were removed and the document name was changed from "UpcomingBreakingChanges.md" to "BreakingChanges.md" as some changes listed in the "Superseded features that will not be deprecated" - section should not be considered as upcoming. + section should not be considered upcoming. The goal was to introduce the document in a skeletal form in the first patch and then add only one item to each of the three sections @@ -133,9 +133,8 @@ This edition covers what happened during the months of May 2024 and June 2024. Patrick sent a [version 5 of the patch series](https://lore.kernel.org/git/cover.1717402497.git.ps@pks.im/) - where the main change was that the document was converted to - AsciiDoc instead of MarkDown and renamed from "BreakingChanges.md" + AsciiDoc instead of Markdown and renamed from "BreakingChanges.md" to "BreakingChanges.txt" for format compatibility with most other documents in the codebase. @@ -145,7 +144,7 @@ This edition covers what happened during the months of May 2024 and June 2024. Junio then suggested a few more small improvements which Patrick integrated into the - [version 6 of the patch series](https://lore.kernel.org/git/cover.1718345026.git.ps@pks.im/) + [version 7 of the patch series](https://lore.kernel.org/git/cover.1718345026.git.ps@pks.im/) which was later merged into the 'master' branch.