Skip to content

Commit 3557490

Browse files
authored
Merge pull request #742 from stepnem/rn118copyedit
rn-118: minor copy edit
2 parents 4ff0890 + 90bbc5c commit 3557490

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

rev_news/drafts/edition-118.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ This edition covers what happened during the months of November and December 202
6363

6464
Looking at `configure.ac`, Junio Hamano, the Git maintainer, noted
6565
that `pkg-config` isn't used at all, instead `curl-config --libs` is
66-
used to detect curl's flags. Even if the `configure` script was
66+
used to detect curl's flags. Even though the `configure` script was
6767
added early in the history of the Git project, Junio said it was an
6868
afterthought and nobody has considered "upgrading" from
6969
`curl-config` to `pkg-config` for dependency detection.
@@ -91,7 +91,7 @@ This edition covers what happened during the months of November and December 202
9191
[Meson](https://mesonbuild.com/) as an alternative.
9292

9393
CMake was [added more recently in 2020](https://lore.kernel.org/git/[email protected]/)
94-
by Sibi Siddharthan as a third build system with the main goal of
94+
by Sibi Siddharthan as the third build system with the main goal of
9595
improving the build experience for developers on Windows.
9696

9797
Soon after Patrick's reply, the Git Contributors' Summit took place,
@@ -283,10 +283,10 @@ __Light reading__
283283
4. [Implementing OneFlow on GitHub, BitBucket and GitLab](https://www.endoflineblog.com/implementing-oneflow-on-github-bitbucket-and-gitlab) (2021)
284284

285285
[GitFlow: A successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/)
286-
was a blog post by Vincent Driessen from 2010, with note of reflection from 2020;
287-
the original author now suggest to adopt a much simpler workflow (like
286+
was a blog post by Vincent Driessen from 2010, with a note of reflection from 2020;
287+
the original author now suggests adopting a much simpler workflow (like
288288
[GitHub flow](https://guides.github.com/introduction/flow/)) if the team is doing
289-
continuous delivery of software, and use GitFlow only when necessary,
289+
continuous delivery of software, and using GitFlow only when necessary,
290290
for explicitly versioned software - with multiple versions of it in the wild to be supported.<br>
291291
See also [Patterns for Managing Source Code Branches](https://martinfowler.com/articles/branching-patterns.html)
292292
by Martin Fowler, mentioned in [Git Rev News Edition #63](https://git.github.io/rev_news/2020/05/28/edition-63/).
@@ -311,18 +311,18 @@ __Git tools and sites__
311311
+ [Anonymous GitHub](https://anonymous.4open.science/) is a service
312312
that allows you to anonymize your GitHub repository for double-blind scientific reviews
313313
(of scientific articles where source code is to be made available for open science reasons).
314-
Several anonymization options are available to ensure that you do not break the double-anonymize,
314+
Several anonymization options are available to ensure that you do not break the double anonymization,
315315
such as removing links, images or specific terms.
316316
The goal is to make is as easy as possible for the reviewer to explore and review the repository.
317317
+ [Git.News](https://git.news/) is a website which provides an infinite newsfeed of
318318
trending repositories from GitHub, HackerNews & Reddit
319319
(which you can then filter by programming language).
320320
+ [Octobox](https://octobox.io/) is a service to help manage GitHub notifications.
321-
Includes optional GitHub app to add live information on issue, PR, and CI status, labels, authors, etc.
322-
Octobox is free for open source projects and the use of basic notifications for private projects.
321+
Includes an optional GitHub app to add live information on issue, PR, CI status, labels, authors, etc.
322+
Octobox is free for open source projects and the use of basic notifications is free for private projects.
323323
+ [Filestash](https://www.filestash.app/) is a Dropbox-like enterprise-grade file manager,
324324
connecting your storage with your identity provider and authorisations.
325-
It adds a web interface to storage solutions like S3 buckets, SFTP/FTPS server, Git repositories, etc.
325+
It adds a web interface to storage solutions like S3 buckets, SFTP/FTPS servers, Git repositories, etc.
326326
Self-hosted deployment is free; it can be done using a Docker image.
327327
Written in Go and JavaScript, under AGPLv3 license.
328328
Demo available at <https://demo.filestash.app/>,
@@ -348,7 +348,7 @@ __Git tools and sites__
348348
and may be modified through the wiki's web interface.
349349
Under GPLv2 license.
350350
+ [Xandikos](https://www.xandikos.org/) is a lightweight CardDAV/CalDAV server
351-
that backs onto a Git repository.
351+
that keeps history and backups in a Git repository.
352352
It allows to share calendars (events, todo items, journal entries) via CalDAV
353353
and contacts (vCard) via CardDAV.
354354
Written in Python using Dulwich, Jinja2, icalendar, and defusedxml,
@@ -371,7 +371,7 @@ __Git tools and sites__
371371
+ [git-activity](https://git-activity.olets.dev/) is a tool
372372
to record your Git activity across multiple (or all) repos,
373373
and read it optionally filtered by date,
374-
activity type (e.g. commit, branch creation, etc) regex pattern,
374+
activity type (e.g. commit, branch creation, etc.) regex pattern,
375375
repo name regex pattern, branch name regex pattern, commit message regex pattern,
376376
and/or commit SHA (first seven characters) regex pattern.
377377
Useful for retroactively filling out a time sheet (or correcting a time sheet),

0 commit comments

Comments
 (0)