git: 68a02c0367 - main - Replace SVN with Git in Explaining BSD article

The branch main has been updated by carlavilla:

URL: https://cgit.FreeBSD.org/doc/commit/?id=68a02c036766179ca890882954750897b1e5306e

commit 68a02c036766179ca890882954750897b1e5306e
Author:     Minsoo Choo <minsoochoo0122@proton.me>
AuthorDate: 2023-07-22 08:35:32 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2023-07-22 08:35:32 +0000

    Replace SVN with Git in Explaining BSD article
    
    Reviewed by:            fernape@
    Differential Revision:  https://reviews.freebsd.org/D41115
---
 documentation/content/en/articles/explaining-bsd/_index.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/content/en/articles/explaining-bsd/_index.adoc b/documentation/content/en/articles/explaining-bsd/_index.adoc
index 23958d80b5..378fd766ce 100644
--- a/documentation/content/en/articles/explaining-bsd/_index.adoc
+++ b/documentation/content/en/articles/explaining-bsd/_index.adoc
@@ -4,7 +4,7 @@ authors:
   - author: Greg Lehey
     email: grog@FreeBSD.org
 description: Brief explanation about BSD
-trademarks: ["freebsd", "amd", "apple", "intel", "linux", "opengroup", "sun", "unix", "general"]
+trademarks: ["freebsd", "amd", "apple", "git", intel", "linux", "opengroup", "sun", "unix", "general"]
 tags: ["Explaining BSD", "BSD", "FreeBSD", "operating system"]
 ---
 
@@ -161,7 +161,7 @@ This arrangement differs from Linux in a number of ways:
 . No one person controls the content of the system. In practice, this difference is overrated, since the Principal Architect can require that code be backed out, and even in the Linux project several people are permitted to make changes.
 . On the other hand, there _is_ a central repository, a single place where you can find the entire operating system sources, including all older versions.
 . BSD projects maintain the entire "Operating System", not only the kernel. This distinction is only marginally useful: neither BSD nor Linux is useful without applications. The applications used under BSD are frequently the same as the applications used under Linux.
-. As a result of the formalized maintenance of a single SVN source tree, BSD development is clear, and it is possible to access any version of the system by release number or by date. SVN also allows incremental updates to the system: for example, the FreeBSD repository is updated about 100 times a day. Most of these changes are small.
+. As a result of the formalized maintenance of a single Git source tree, BSD development is clear, and it is possible to access any version of the system by release number or by date. Git also allows incremental updates to the system: for example, the FreeBSD repository is updated about 100 times a day. Most of these changes are small.
 
 === BSD releases
 
@@ -171,7 +171,7 @@ In addition, the version number has a suffix indicating its purpose:
 
 . The development version of the system is called _CURRENT_. FreeBSD assigns a number to CURRENT, for example FreeBSD 5.0-CURRENT. NetBSD uses a slightly different naming scheme and appends a single-letter suffix which indicates changes in the internal interfaces, for example NetBSD 1.4.3G. OpenBSD does not assign a number ("OpenBSD-current"). All new development on the system goes into this branch.
 . At regular intervals, between two and four times a year, the projects bring out a _RELEASE_ version of the system, which is available on CD-ROM and for free download from FTP sites, for example OpenBSD 2.6-RELEASE or NetBSD 1.4-RELEASE. The RELEASE version is intended for end users and is the normal version of the system. NetBSD also provides _patch releases_ with a third digit, for example NetBSD 1.4.2.
-. As bugs are found in a RELEASE version, they are fixed, and the fixes are added to the SVN tree. In FreeBSD, the resultant version is called the _STABLE_ version, while in NetBSD and OpenBSD it continues to be called the RELEASE version. Smaller new features can also be added to this branch after a period of test in the CURRENT branch. Security and other important bug fixes are also applied to all supported RELEASE versions.
+. As bugs are found in a RELEASE version, they are fixed, and the fixes are added to the Git tree. In FreeBSD, the resultant version is called the _STABLE_ version, while in NetBSD and OpenBSD it continues to be called the RELEASE version. Smaller new features can also be added to this branch after a period of test in the CURRENT branch. Security and other important bug fixes are also applied to all supported RELEASE versions.
 
 _By contrast, Linux maintains two separate code trees: the stable version and the development version.
 Stable versions have an even minor version number, such as 2.0, 2.2 or 2.4.