diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml b/en_US.ISO8859-1/articles/explaining-bsd/article.sgml index 27634dd7a4..6bbf269ebd 100644 --- a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml +++ b/en_US.ISO8859-1/articles/explaining-bsd/article.sgml @@ -1,3 +1,6 @@ + + + %man; @@ -253,7 +256,7 @@ - Contributors write code or documentation. + Contributors write code or documentation. They are not permitted to commit (add code) directly to the source tree. In order for their code to be included in the system, it must be reviewed and checked in by a registered developer, known @@ -261,7 +264,7 @@ - Committers are developers with write + Committers are developers with write access to the source tree. In order to become a committer, an individual must show ability in the area in which he is active. @@ -277,14 +280,14 @@ their changes for review before committing them. In extreme cases, a core team member with a function such as Principal Architect may order that changes be removed from the tree, a - process known as backing out. All committers + process known as backing out. All committers receive mail describing each individual commit, so it is not possible to commit secretly. - Core team In addition, FreeBSD - and NetBSD each have a core team which manages the project. The + The Core team. FreeBSD and + NetBSD each have a core team which manages the project. The core teams developed in the course of the projects, and their role is not always well-defined. It is not necessary to be a developer in order to be a core team member, though it is normal. The rules @@ -340,7 +343,7 @@ The development version of the system is called - CURRENT. FreeBSD assigns a number to + 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 @@ -350,7 +353,7 @@ At regular intervals, between two and four times a year, the - projects bring out a RELEASE version of 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 @@ -362,7 +365,7 @@ As bugs are found in a RELEASE version, they are fixed, and the fixes are added to the CVS tree. In FreeBSD, the resultant - version is called the STABLE version, while in NetBSD and OpenBSD + 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.