git: 3853bc7660 - main - documentation: fix WARN after hugo setings change
Vladlen Popolitov <[email protected]> Thu, 02 Jul 2026 12:38:16 +0000
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by vladlen: URL: https://cgit.FreeBSD.org/doc/commit/?id=3853bc7660d6f7feef77658c9b07f7d73e2327ce commit 3853bc7660d6f7feef77658c9b07f7d73e2327ce Author: Vladlen Popolitov <[email protected]> AuthorDate: 2026-07-02 12:38:09 +0000 Commit: Vladlen Popolitov <[email protected]> CommitDate: 2026-07-02 12:38:09 +0000 documentation: fix WARN after hugo setings change Reviewed by: carlavilla, ziaee Approved by: carlavilla Differential Revision: https://reviews.freebsd.org/D57999 --- .../books/developers-handbook/secure/_index.adoc | 6 +- .../books/handbook/advanced-networking/_index.adoc | 26 +- .../content/en/books/dev-model/_index.adoc | 56 ++-- .../books/developers-handbook/secure/_index.adoc | 4 +- .../books/handbook/advanced-networking/_index.adoc | 14 +- .../content/en/books/handbook/wayland/_index.adoc | 4 +- .../books/porters-handbook/makefiles/_index.adoc | 16 +- .../books/porters-handbook/pkg-files/_index.adoc | 4 +- .../porters-handbook/quick-porting/_index.adoc | 4 +- .../en/books/porters-handbook/testing/_index.adoc | 4 +- .../books/handbook/advanced-networking/_index.adoc | 8 +- .../books/handbook/advanced-networking/_index.adoc | 22 +- .../content/ru/books/dev-model/_index.adoc | 88 +++---- .../books/developers-handbook/secure/_index.adoc | 18 +- .../books/handbook/advanced-networking/_index.adoc | 8 +- .../content/ru/books/handbook/wayland/_index.adoc | 4 +- .../content/ru/books/handbook/x11/_index.adoc | 46 ++-- .../books/porters-handbook/makefiles/_index.adoc | 282 ++++++++++----------- .../books/porters-handbook/pkg-files/_index.adoc | 4 +- .../porters-handbook/quick-porting/_index.adoc | 4 +- .../ru/books/porters-handbook/testing/_index.adoc | 4 +- .../books/developers-handbook/secure/_index.adoc | 4 +- .../books/porters-handbook/makefiles/_index.adoc | 24 +- .../books/porters-handbook/pkg-files/_index.adoc | 4 +- .../porters-handbook/quick-porting/_index.adoc | 6 +- 25 files changed, 332 insertions(+), 332 deletions(-) diff --git a/documentation/content/de/books/developers-handbook/secure/_index.adoc b/documentation/content/de/books/developers-handbook/secure/_index.adoc index 6e71f358cd..ecf2f6e7ca 100644 --- a/documentation/content/de/books/developers-handbook/secure/_index.adoc +++ b/documentation/content/de/books/developers-handbook/secure/_index.adoc @@ -1,6 +1,6 @@ --- title: Kapitel 3. Sicheres Programmieren -authors: +authors: - author: Murray Stokely prev: books/developers-handbook/tools next: books/developers-handbook/l10n @@ -139,13 +139,13 @@ return 0; Betrachten wir nun, wie das Speicherabbild dieses Prozesses aussehen würde, wenn wir 160 Leerzeichen in unser kleines Programm eingeben, bevor wir Enter drücken. -[XXX figure here!] +[ XXX figure here! ] Offensichtlich kann man durch böswilligere Eingaben bereits kompilierten Programmtext ausführen (wie z.B. exec(/bin/sh)). === Puffer-Ãberläufe vermeiden -Die direkteste Lösung, um Stack-Ãberläufe zu vermeiden, ist immer grössenbegrenzten Speicher und String-Copy-Funktionen zu verwenden. `strncpy` und `strncat` sind Teil der C-Standardbibliothek. Diese Funktionen akzeptieren einen Längen-Parameter. Dieser Wert sollte nicht gröÃer sein als die Länge des Zielpuffers. Die Funktionen kopieren dann bis zu `length` Bytes von der Quelle zum Ziel. Allerdings gibt es einige Probleme. Keine der Funktionen garantiert, dass die Zeichenkette NUL-terminiert ist, wenn die GröÃe des Eingabepuffers so groà ist wie das Ziel. AuÃerdem wird der Parameter length zwischen strncpy und strncat inkonsistent definiert, weshalb Programmierer leicht bezüglich der korrekten Verwendung durcheinander kommen können. Weiterhin gibt es einen spürbaren Leist ungsverlust im Vergleich zu `strcpy`, wenn eine kurze Zeichenkette in einen groÃen Puffer kopiert wird. Denn `strncpy` fült den Puffer bis zur angegebenen Länge mit NUL auf. +Die direkteste Lösung, um Stack-Ãberläufe zu vermeiden, ist immer grössenbegrenzten Speicher und String-Copy-Funktionen zu verwenden. `strncpy` und `strncat` sind Teil der C-Standardbibliothek. Diese Funktionen akzeptieren einen Längen-Parameter. Dieser Wert sollte nicht gröÃer sein als die Länge des Zielpuffers. Die Funktionen kopieren dann bis zu `length` Bytes von der Quelle zum Ziel. Allerdings gibt es einige Probleme. Keine der Funktionen garantiert, dass die Zeichenkette NUL-terminiert ist, wenn die GröÃe des Eingabepuffers so groà ist wie das Ziel. AuÃerdem wird der Parameter length zwischen strncpy und strncat inkonsistent definiert, weshalb Programmierer leicht bezüglich der korrekten Verwendung durcheinander kommen können. Weiterhin gibt es einen spürbaren Leist ungsverlust im Vergleich zu `strcpy`, wenn eine kurze Zeichenkette in einen groÃen Puffer kopiert wird. Denn `strncpy` fült den Puffer bis zur angegebenen Länge mit NUL auf. In OpenBSD wurde eine weitere Möglichkeit zum kopieren von Speicherbereichen implementiert, die dieses Problem umgeht. Die Funktionen `strlcpy` und `strlcat` garantieren, dass das Ziel immer NUL-terminiert wird, wenn das Argument length ungleich null ist. Für weitere Informationen über diese Funktionen lesen Sie bitte crossref:bibliography[OpenBSD,6]. Die OpenBSD-Funktionen `strlcpy` und `strlcat` sind seit Version 3.3 auch in FreeBSD verfügbar. diff --git a/documentation/content/de/books/handbook/advanced-networking/_index.adoc b/documentation/content/de/books/handbook/advanced-networking/_index.adoc index cca12a36b6..246c7942ad 100644 --- a/documentation/content/de/books/handbook/advanced-networking/_index.adoc +++ b/documentation/content/de/books/handbook/advanced-networking/_index.adoc @@ -306,7 +306,7 @@ Häufig soll ein Computer an ein vorhandenes Drahtlosnetzwerk angeschlossen werd % ifconfig | grep -B3 -i wireless .... -+ ++ In FreeBSD 11 und neueren Versionen verwenden Sie stattdessen diesen Befehl: + @@ -315,9 +315,9 @@ In FreeBSD 11 und neueren Versionen verwenden Sie stattdessen diesen Befehl: % sysctl net.wlan.devices .... -+ ++ Wenn der drahtlose Adapter nicht aufgeführt wird, könnte ein zusätzliches Kernelmodul erforderlich sein. Es besteht jedoch auch die Möglichkeit, dass der Adapter von FreeBSD nicht unterstützt wird. -+ ++ Dieses Beispiel verwendet einen drahtlosen Atheros-Adapter `ath0`. . Fügen Sie in [.filename]#/etc/wpa_supplicant.conf# einen Eintrag für das Netzwerk hinzu. Wenn die Datei nicht existiert, müssen Sie diese erstellen. Ersetzen Sie _myssid_ und _psk_ durch die SSID und den PSK. Diese Informationen werden vom Netzwerkadministrator zur Verfügung gestellt. + @@ -890,7 +890,7 @@ network={ <.> Das Feld `ca_cert` gibt den Pfad zum CA-Zertifikat an. Diese Datei wird zur Verifizierung des Server-Zertifikats benötigt. -<.> Dieses Feld enthält die Parameter für die erste Phase der Authentifizierung, den TLS-Tunnel. Je nachdem, welcher Authentifizierungsserver benutzt wird, kann +<.> Dieses Feld enthält die Parameter für die erste Phase der Authentifizierung, den TLS-Tunnel. Je nachdem, welcher Authentifizierungsserver benutzt wird, kann ein spezifisches Label für die Authentifizierung verwendet werden. Meistens lautet das Label "client EAP encryption", dass durch `peaplabel=0` gesetzt wird. Weitere Informationen finden Sie in man:wpa_supplicant.conf[5]. <.> Das innerhalb des verschlüsselten TLS-Tunnels verwendete Authentifizierungsprotokoll. In unserem Beispiel handelt es sich dabei um `auth=MSCHAPV2`. @@ -1256,7 +1256,7 @@ Dieser Abschnitt beschreibt eine Reihe von MaÃnahmen zur Behebung von alltägli * Wird der Access Point bei der Suche nicht gefunden, überprüfen Sie, dass die Konfiguration des drahtlosen Geräts nicht die Anzahl der Kanäle beschränkt. * Wenn sich das Gerät nicht mit dem Access Point verbinden kann, überprüfen Sie, ob die Konfiguration der Station auch der des Access Points entspricht. Dazu gehören auch die Authentifzierungsmethode und die Sicherheitsprotokolle. Halten Sie die Konfiguration so einfach wie möglich. Wenn Sie ein Sicherheitsprotokoll wie WPA oder WEP verwenden, können Sie testweise den Access Point auf _offene Authentifizierung_ und _keine Sicherheit_ einstellen. -+ ++ Für die Fehlersuche steht man:wpa_supplicant[8] zur Verfügung. Starten Sie das Programm manuell mit der Option `-dd` und durchsuchen Sie anschlieÃend die Systemprotokolle nach eventuellen Fehlermeldungen. * Sobald sich das Gerät mit dem Access Point verbinden kann, prüfen Sie die Netzwerkkonfiguration mit einfachen Werkzeugen wie man:ping[8]. * Zusätzlich gibt es auch zahlreiche Low-Level-Debugging-Werkzeuge. Die Ausgabe von Debugging-Informationen des 802.11 Protocol Support Layers lassen sich mit dem Programm man:wlandebug[8] aktivieren. Um beispielsweise während der Suche nach Access Points und des Aufbaus von 802.11-Verbindungen (Handshake) auftretende Systemmeldungen auf die Konsole auszugeben, verwenden Sie den folgenden Befehl: @@ -1266,7 +1266,7 @@ Für die Fehlersuche steht man:wpa_supplicant[8] zur Verfügung. Starten Sie das # wlandebug -i wlan0 +scan+auth+debug+assoc net.wlan.0.debug: 0 => 0xc80000<assoc,auth,scan> .... -+ ++ Der 802.11-Layer liefert umfangreiche Statistiken, die mit dem Werkzeug `wlanstats`, das sich in [.filename]#/usr/src/tools/tools/net80211# befindet, abgerufen werden können. Diese Statistiken sollten alle Fehler identifizieren, die im 802.11-Layer auftreten. Beachten Sie aber, dass einige Fehler bereits im darunterliegenden Gerätetreiber auftreten und daher in diesen Statistiken nicht enthalten sind. Wie Sie Probleme des Gerätetreibers identifizieren, entnehmen Sie bitte der Dokumentation des Gerätetreibers. Wenn die oben genannten Informationen nicht helfen das Problem zu klären, erstellen Sie einen Problembericht, der die Ausgabe der weiter oben genannten Werkzeuge beinhaltet. @@ -2103,14 +2103,14 @@ Für Laptop-Benutzer ist es normalerweise wünschenswert, "wireless" als sekund Dies wird erreicht, indem die MAC-Adresse der Ethernet-Schnittstelle mit der MAC Adresse der drahtlosen Schnittstelle überschrieben wird. [NOTE] -**** +==== Theoretisch kann die Ethernet- oder die drahtlose MAC-Adresse so geändert werden, dass sie mit der jeweils anderen Adresse übereinstimmt. Bei einigen drahtlosen Schnittstellen fehlt jedoch die Unterstützung für das Ãberschreiben der MAC-Adresse. Daher wird empfohlen, die MAC-Adresse der Ethernet-Schnittstelle für diesen Zweck zu überschreiben. -**** +==== [NOTE] -**** +==== Wenn der Treiber für die drahtlose Schnittstelle nicht im `GENERIC`-Kernel oder in einem angepassten Kernel enthalten ist, kann unter FreeBSD {rel121-current} mit `_driver__load="YES"` die entsprechende [.filename]#.ko#-Datei in [.filename]#/boot/loader.conf# geladen werden. Dann muss das System neu gestartet werden. Ein anderer, besserer Weg ist es, den Treiber über [.filename]#/etc/rc.conf# zu laden, indem Sie ihn zu `kld_list` (siehe man:rc.conf[5]) hinzufügen und dann das System neu starten. Dies ist notwendig, da sonst der Treiber zum Zeitpunkt der Konfiguration der man:lagg[4]-Schnittstelle noch nicht geladen ist. -**** +==== In diesem Beispiel ist die Ethernet-Schnittstelle _re0_ der Master und die drahtlose Schnittstelle _wlan0_ der Failover. Die Schnittstelle _wlan0_ wurde aus der physischen Schnittstelle _ath0_ erstellt, und die Ethernet-Schnittstelle wird mit der MAC-Adresse der drahtlosen Schnittstelle konfiguriert. Im ersten Schritt wird die MAC-Adresse der drahtlosen Schnittstelle ermittelt: @@ -2231,7 +2231,7 @@ Die in diesem Abschnitt dargestellten Schritte konfigurieren die in FreeBSD enth .... nfs_server_enable="YES" .... -+ ++ Exportieren Sie das Root-Verzeichnis über NFS, indem Sie folgende Zeile in [.filename]#/etc/exports# hinzufügen: + [.programlisting] @@ -2289,7 +2289,7 @@ Received 264951 bytes in 0.1 seconds # Device Mountpoint FSType Options Dump Pass$ myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0 .... -+ ++ Ersetzen Sie _myhost.example.com_ durch den Hostnamen oder die IP-Adresse des NFS-Servers. In diesem Beispiel wird das Root-Dateisystem schreibgeschützt eingehangen, um ein potenzielles Löschen des Inhalts durch die NFS-Clients zu verhindern. . Setzen Sie das root-Passwort in der PXE-Umgebung für Client-Maschinen, die über PXE starten: + @@ -2384,7 +2384,7 @@ image::pxe-nfs.png[] tftp> get FreeBSD/install/boot/pxeboot Received 264951 bytes in 0.1 seconds .... -+ ++ Weitere Informationen finden Sie in man:tftpd[8] und man:tftp[1]. Die `BUGS`-Sektionen dieser Seiten dokumentieren einige Einschränkungen von TFTP. . Achten Sie darauf, dass Sie das Root-Dateisystem über NFS einhängen können. Auch hier können Sie Ihre Einstellungen aus [.filename]#/usr/local/etc/dhcpd.conf# wie folgt testen: + diff --git a/documentation/content/en/books/dev-model/_index.adoc b/documentation/content/en/books/dev-model/_index.adoc index 1f56b814b0..04bbac61e1 100644 --- a/documentation/content/en/books/dev-model/_index.adoc +++ b/documentation/content/en/books/dev-model/_index.adoc @@ -79,7 +79,7 @@ Up until now, the FreeBSD project has released a number of described techniques However, a project model summarising how the project is structured is needed because of the increasing amount of project members. footnote:[This goes hand-in-hand with Brooks' law that adding another person to a late project will make it later since it will increase the communication needs . A project model is a tool to reduce the communication needs.] This paper will provide such a project model and is donated to the FreeBSD Documentation project where it can evolve together with the project so that it can at any point in time reflect the way the project works. -It is based on [crossref:dev-model[thesis, Saers,2003]]. +It is based on [ crossref:dev-model[thesis, Saers 2003] ]. I would like to thank the following people for taking the time to explain things that were unclear to me and for proofreading the document. @@ -102,23 +102,23 @@ I would like to thank the following people for taking the time to explain things [[overview]] == Overview A project model is a means to reduce the communications overhead in a project. -As shown by [crossref:dev-model[brooks, Brooks, 1995]], increasing the number of project participants increases the communication in the project exponentially. +As shown by [ crossref:dev-model[brooks, Brooks 1995] ], increasing the number of project participants increases the communication in the project exponentially. FreeBSD has during the past few years increased both its mass of active users and committers, and the communication in the project has risen accordingly. This project model will serve to reduce this overhead by providing an up-to-date description of the project. During the Core elections in 2002, Mark Murray stated "I am opposed to a long rule-book, as that satisfies lawyer-tendencies, and is counter to the technocentricity that the project so badly needs." -[crossref:dev-model[bsd-election2002, FreeBSD, 2002B]]. +[ crossref:dev-model[bsd-election2002, FreeBSD 2002B] ]. This project model is not meant to be a tool to justify creating impositions for developers, but as a tool to facilitate coordination. It is meant as a description of the project, with an overview of how the different processes are executed. It is an introduction to how the FreeBSD project works. The FreeBSD project model will be described as of July 1st, 2004. -It is based on the Niels Jørgensen's paper [crossref:dev-model[jorgensen2001, Jørgensen, 2001]], FreeBSD's official documents, discussions on FreeBSD mailing lists and interviews with developers. +It is based on the Niels Jørgensen's paper [ crossref:dev-model[jorgensen2001, Jørgensen 2001] ], FreeBSD's official documents, discussions on FreeBSD mailing lists and interviews with developers. After providing definitions of terms used, this document will outline the organisational structure (including role descriptions and communication lines), discuss the methodology model and after presenting the tools used for process control, it will present the defined processes. Finally it will outline major sub-projects of the FreeBSD project. -[crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2002A]] Section 1.2 and 1.3 give the vision and the architectural guidelines for the project. +[ crossref:dev-model[freebsd-developer-handbook, FreeBSD 2002A] ] Section 1.2 and 1.3 give the vision and the architectural guidelines for the project. The vision is "To produce the best UNIX-like operating system package possible, with due respect to the original software tools ideology as well as usability, performance and stability." The architectural guidelines help determine whether a problem that someone wants to be solved is within the scope of the project @@ -129,7 +129,7 @@ The architectural guidelines help determine whether a problem that someone wants === Activity An "activity" is an element of work performed during the course of a project -[crossref:dev-model[ref-pmbok, PMI, 2000]]. +[ crossref:dev-model[ref-pmbok, PMI 2000] ]. It has an output and leads towards an outcome. Such an output can either be an input to another activity or a part of the process' delivery. @@ -155,7 +155,7 @@ An "outcome" is the final output of the process. This is synonymous with deliverable, that is defined as "any measurable, tangible, verifiable outcome, result or item that must be produced to complete a project or part of a project. Often used more narrowly in reference to an external deliverable, which is a deliverable that is subject to approval by the project sponsor or customer" by -[crossref:dev-model[ref-pmbok, PMI, 2000]]. +[ crossref:dev-model[ref-pmbok, PMI 2000] ]. Examples of outcomes are a piece of software, a decision made or a report written. [[ref-freebsd]] @@ -308,7 +308,7 @@ Jørgenssen's model for change integration |=== The "development release" is the FreeBSD-CURRENT ("-CURRENT") branch and the -"production release" is the FreeBSD-STABLE branch ("-STABLE") [crossref:dev-model[jorgensen2001, Jørgensen, 2001]]. +"production release" is the FreeBSD-STABLE branch ("-STABLE") [ crossref:dev-model[jorgensen2001, Jørgensen 2001] ]. This is a model for one change, and shows that after coding, developers seek community review and try integrating it with their own systems. After integrating the change into the development release, called FreeBSD-CURRENT, it is tested by many users and developers in the FreeBSD community. @@ -400,7 +400,7 @@ image::branches.png[Refer to table below for a screen-reader friendly version.] |=== The latest -CURRENT version is always referred to as -CURRENT, while the latest -STABLE release is always referred to as -STABLE. -In this figure, -STABLE refers to 4-STABLE while -CURRENT refers to 5.0-CURRENT following 5.0-RELEASE. [crossref:dev-model[freebsd-releng, FreeBSD, 2002E]] +In this figure, -STABLE refers to 4-STABLE while -CURRENT refers to 5.0-CURRENT following 5.0-RELEASE. [ crossref:dev-model[freebsd-releng, FreeBSD 2002E] ] A "major release" is always made from the -CURRENT branch. However, the -CURRENT branch does not need to fork at that point in time, but can focus on stabilising. @@ -460,14 +460,14 @@ These hat descriptions are not such a formalisation, rather a summary of the rol A Contributor contributes to the FreeBSD project either as a developer, as an author, by sending problem reports, or in other ways contributing to the -progress of the project. A contributor has no special privileges in the FreeBSD project. [crossref:dev-model[freebsd-contributors, FreeBSD, 2002F]] +progress of the project. A contributor has no special privileges in the FreeBSD project. [ crossref:dev-model[freebsd-contributors, FreeBSD 2002F] ] [[role-committer]] ==== Committer A person who has the required privileges to add their code or documentation to the repository. A committer has made a commit within the past 12 months. -[crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2000A]] An active committer is a committer who has made an average of one commit per month during that time. +[ crossref:dev-model[freebsd-developer-handbook, FreeBSD 2000A] ] An active committer is a committer who has made an average of one commit per month during that time. It is worth noting that there are no technical barriers to prevent someone, once having gained commit privileges to the main- or a sub-project, to make commits in parts of that project's source the committer did not specifically get permission to modify. However, when wanting to make modifications to parts a committer has not been involved in before, they should read the logs to see what has happened in this area before, and also read the MAINTAINERS file to see if the maintainer of this part has any special requests on how changes in the code should be made. @@ -707,7 +707,7 @@ By tradition, this is by adding their name to the committers list. Recall that a committer is considered to be someone who has committed code during the past 12 months. However, it is not until after 18 months of inactivity have passed that commit privileges are eligible to be revoked. -[crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] +[ crossref:dev-model[freebsd-expiration-policy, FreeBSD 2002H] ] There are, however, no automatic procedures for doing this. For reactions concerning commit privileges not triggered by time, see crossref:dev-model[process-reactions,section 1.5.8]. @@ -729,9 +729,9 @@ Roles in this process: . crossref:dev-model[role-maintainer, Maintainership] . crossref:dev-model[role-mentor, Mentor] -[crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] -[crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] -[crossref:dev-model[freebsd-new-account, FreeBSD, 2002I]] +[ crossref:dev-model[freebsd-bylaws, FreeBSD 2000A] ] +[ crossref:dev-model[freebsd-expiration-policy, FreeBSD 2002H] ] +[ crossref:dev-model[freebsd-new-account, FreeBSD 2002I] ] [[committing]] === Committing code @@ -782,8 +782,8 @@ Hats included in this process are: . crossref:dev-model[role-vendor, Vendor] . crossref:dev-model[role-reviewer, Reviewers] -[crossref:dev-model[freebsd-committer, FreeBSD, 2001]] -[crossref:dev-model[jorgensen2001, Jørgensen, 2001]] +[ crossref:dev-model[freebsd-committer, FreeBSD 2001] ] +[ crossref:dev-model[jorgensen2001, Jørgensen 2001] ] [[process-core-election]] === Core election @@ -824,16 +824,16 @@ Hats in core elections are: * crossref:dev-model[role-committer, Committer] * crossref:dev-model[role-election-manager, Election Manager] -[crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] -[crossref:dev-model[bsd-election2002, FreeBSD, 2002B]] -[crossref:dev-model[freebsd-election, FreeBSD, 2002G]] +[ crossref:dev-model[freebsd-bylaws, FreeBSD 2000A] ] +[ crossref:dev-model[bsd-election2002, FreeBSD 2002B] ] +[ crossref:dev-model[freebsd-election, FreeBSD 2002G] ] [[new-features]] === Development of new features Within the project there are sub-projects that are working on new features. These projects are generally done by one person -[crossref:dev-model[jorgensen2001, Jørgensen, 2001]]. +[ crossref:dev-model[jorgensen2001, Jørgensen 2001] ]. Every project is free to organise development as it sees fit. However, when the project is merged to the -CURRENT branch it must follow the project guidelines. When the code has been well tested in the -CURRENT branch and deemed stable enough and relevant to the -STABLE branch, it is merged to the -STABLE branch. @@ -870,7 +870,7 @@ footnote:[sendmail and named are examples of code that has been merged from othe The maintainer's job is to make sure the code is in sync with the project the code comes from if it is contributed code, and apply patches submitted by the community or write fixes to issues that are discovered. The main bulk of work that is put into the FreeBSD project is maintenance. -[crossref:dev-model[jorgensen2001, Jørgensen, 2001]] has made a figure showing the life cycle of changes. +[ crossref:dev-model[jorgensen2001, Jørgensen 2001] ] has made a figure showing the life cycle of changes. Jørgenssen's model for change integration @@ -952,13 +952,13 @@ The roles included in this process are: . crossref:dev-model[role-maintainer, Maintainership] . crossref:dev-model[role-bugbuster, Bugbuster] -[crossref:dev-model[freebsd-handle-pr, FreeBSD, 2002C]]. -[crossref:dev-model[freebsd-send-pr, FreeBSD, 2002D]] +[ crossref:dev-model[freebsd-handle-pr, FreeBSD 2002C] ]. +[ crossref:dev-model[freebsd-send-pr, FreeBSD 2002D] ]. [[process-reactions]] === Reacting to misbehavior -[crossref:dev-model[freebsd-committer, FreeBSD, 2001]] has a number of rules that committers should follow. +[ crossref:dev-model[freebsd-committer, FreeBSD 2001] ] has a number of rules that committers should follow. However, it happens that these rules are broken. The following rules exist in order to be able to react to misbehavior. They specify what actions will result in how long a suspension of the committer's commit privileges. @@ -968,7 +968,7 @@ They specify what actions will result in how long a suspension of the committer' * Commit wars - 5 days to all participating parties * Impolite or inappropriate behavior - 5 days -[crossref:dev-model[ref-freebsd-trenches, Lehey, 2002]] +[ crossref:dev-model[ref-freebsd-trenches, Lehey 2002] ] For the suspensions to be efficient, any single core member can implement a suspension before discussing it on the "core" mailing list. Repeat offenders can, with a 2/3 vote by core, receive harsher penalties, including permanent removal of commit privileges. @@ -1074,7 +1074,7 @@ The FreeBSD Project uses it to run 16 general lists, 60 technical lists, 4 limit It is also used for many mailing lists set up and used by other people and projects in the FreeBSD community. General lists are lists for the general public, technical lists are mainly for the development of specific areas of interest, and closed lists are for internal communication not intended for the general public. The majority of all the communication in the project goes through these 85 lists -[crossref:dev-model[ref-bsd-handbook, FreeBSD, 2003A], Appendix C]. +[ crossref:dev-model[ref-bsd-handbook, FreeBSD 2003A], Appendix C]. [[tool-pgp]] === Pretty Good Privacy @@ -1142,7 +1142,7 @@ Only documentation errors are corrected in the security branches. Like the ports sub-project, the Documentation project can appoint documentation committers without FreeBSD Core's approval. -[crossref:dev-model[freebsd-doceng-charter, FreeBSD, 2003B]]. +[ crossref:dev-model[freebsd-doceng-charter, FreeBSD 2003B] ]. The Documentation project has extref:{fdp-primer}[a primer]. This is used both to introduce new project members to the standard tools and syntaxes and to act as a reference when working on the project. diff --git a/documentation/content/en/books/developers-handbook/secure/_index.adoc b/documentation/content/en/books/developers-handbook/secure/_index.adoc index fab08ad88b..bbcf991dec 100644 --- a/documentation/content/en/books/developers-handbook/secure/_index.adoc +++ b/documentation/content/en/books/developers-handbook/secure/_index.adoc @@ -1,6 +1,6 @@ --- title: Chapter 3. Secure Programming -authors: +authors: - author: Murray Stokely prev: books/developers-handbook/tools next: books/developers-handbook/l10n @@ -157,7 +157,7 @@ int main() { Let us examine what the memory image of this process would look like if we were to input 160 spaces into our little program before hitting return. -[XXX figure here!] +[ XXX figure here! ] Obviously more malicious input can be devised to execute actual compiled instructions (such as exec(/bin/sh)). diff --git a/documentation/content/en/books/handbook/advanced-networking/_index.adoc b/documentation/content/en/books/handbook/advanced-networking/_index.adoc index 182c424c57..b2862f063d 100644 --- a/documentation/content/en/books/handbook/advanced-networking/_index.adoc +++ b/documentation/content/en/books/handbook/advanced-networking/_index.adoc @@ -136,7 +136,7 @@ These hosts are identified using the Routing Information Protocol (RIP), which c subnet:: FreeBSD will automatically add subnet routes for the local subnet. -In this example, `10.20.30.255` is the broadcast address for the subnet `10.20.30` and `example.com` is the domain name associated with that subnet. +In this example, `10.20.30.255` is the broadcast address for the subnet `10.20.30` and `example.com` is the domain name associated with that subnet. The designation `link#1` refers to the first Ethernet card in the machine. + Local network hosts and local subnets have their routes automatically configured by a daemon called man:routed[8]. @@ -1109,7 +1109,7 @@ This node is normally connected to the downstream Bluetooth HCI node and upstrea The default name for the L2CAP node is "devicel2cap". For more details refer to man:ng_l2cap[4]. -A useful command is man:l2ping[8], which can be used to ping other devices. +A useful command is man:l2ping[8], which can be used to ping other devices. Some Bluetooth implementations might not return all of the data sent to them, so `0 bytes` in the following example is normal. [source,shell] @@ -1164,7 +1164,7 @@ For the purposes of RFCOMM, a complete communication path involves two applicati RFCOMM is intended to cover applications that make use of the serial ports of the devices in which they reside. The communication segment is a direct connect Bluetooth link from one device to another. -RFCOMM is only concerned with the connection between the devices in the direct connect case, or between the device and a modem in the network case. +RFCOMM is only concerned with the connection between the devices in the direct connect case, or between the device and a modem in the network case. RFCOMM can support other configurations, such as modules that communicate via Bluetooth wireless technology on one side and provide a wired interface on the other side. In FreeBSD, RFCOMM is implemented at the Bluetooth sockets layer. @@ -1857,18 +1857,18 @@ With man:lagg[4], it is possible to configure a failover which prefers the Ether This is achieved by overriding the Ethernet interface's MAC address with that of the wireless interface. [NOTE] -**** +==== In theory, either the Ethernet or wireless MAC address can be changed to match the other. However, some popular wireless interfaces lack support for overriding the MAC address. We therefore recommend overriding the Ethernet MAC address for this purpose. -**** +==== [NOTE] -**** +==== If the driver for the wireless interface is not loaded in the `GENERIC` or custom kernel, and the computer is running FreeBSD {rel121-current}, load the corresponding [.filename]#.ko# in [.filename]#/boot/loader.conf# by adding `*driver_load="YES"*` to that file and rebooting. Another, better way is to load the driver in [.filename]#/etc/rc.conf# by adding it to `kld_list` (see man:rc.conf[5] for details) in that file and rebooting. This is needed because otherwise the driver is not loaded yet at the time the man:lagg[4] interface is set up. -**** +==== In this example, the Ethernet interface, _re0_, is the master and the wireless interface, _wlan0_, is the failover. The _wlan0_ interface was created from the _ath0_ physical wireless interface, and the Ethernet interface will be configured with the MAC address of the wireless interface. diff --git a/documentation/content/en/books/handbook/wayland/_index.adoc b/documentation/content/en/books/handbook/wayland/_index.adoc index e05df2004d..d9e78df6b1 100644 --- a/documentation/content/en/books/handbook/wayland/_index.adoc +++ b/documentation/content/en/books/handbook/wayland/_index.adoc @@ -641,7 +641,7 @@ To install `ly`, issue the following command: There will be some configuration hints presented, the import steps are to add the following lines to [.filename]#/etc/gettytab#: -[programlisting] +[.programlisting] .... Ly:\ :lo=/usr/local/bin/ly:\ @@ -650,7 +650,7 @@ Ly:\ And then modify the ttyv1 line in [.filename]#/etc/ttys# to match the following line: -[programlisting] +[.programlisting] .... ttyv1 "/usr/libexec/getty Ly" xterm onifexists secure .... diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index 8415ede9a4..a9ffe801b9 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -134,10 +134,10 @@ See below on how to use man:pkg-version[8] to compare versions. <.> `1.2` is before `1.2p1` as `2p1`, think "2, patch level 1" which is a version after any `2.X` but before `3`. [NOTE] -**** +===== In here, the `a`, `b`, and `p` are used as if meaning "alpha", "beta" or "pre-release" and "patch level", but they are only letters and are sorted alphabetically, so any letter can be used, and they will be sorted appropriately. -**** +===== ==== @@ -1546,9 +1546,9 @@ GH_TAGNAME= 2678d2b6a8ca3cf80cb4dbc8da557a2998e1b5c0 It will automatically have `MASTER_SITES` set to `GH` and `WRKSRC` to `${WRKDIR}/pkg-6dbb17b`. [TIP] -**** +==== `20260626` is the date of the commit referenced in `GH_TAGNAME`, not the date the [.filename]#Makefile# is edited, or the date the commit is made. -**** +==== ==== @@ -1645,7 +1645,7 @@ See crossref:makefiles[makefile-versions-ex-pkg-version, this section for how to .... [NOTE] -**** +===== If the requested commit is the same as a tag, a shorter description is shown by default. The longer version is equivalent: @@ -1658,7 +1658,7 @@ v0.7.3 v0.7.3-0-gc66c71d .... -**** +===== ==== @@ -1851,11 +1851,11 @@ It can also be found on GitHub. Each subdirectory that is a submodule is shown as `_directory @ hash_`, for example, `mongoose @ 2140e59`. [NOTE] -**** +===== While getting the information from GitHub seems more straightforward, the information found using `git submodule status` will provide more meaningful information. For example, here, ``lib/wxsqlite3``'s commit hash `fb66eb2` correspond to `v3.4.0`. Both can be used interchangeably, but when a tag is available, use it. -**** +===== Now that all the required information has been gathered, the [.filename]#Makefile# can be written (only GitHub-related lines are shown): diff --git a/documentation/content/en/books/porters-handbook/pkg-files/_index.adoc b/documentation/content/en/books/porters-handbook/pkg-files/_index.adoc index d4530108c9..ae5432e2ac 100644 --- a/documentation/content/en/books/porters-handbook/pkg-files/_index.adoc +++ b/documentation/content/en/books/porters-handbook/pkg-files/_index.adoc @@ -218,10 +218,10 @@ When a port is upgraded, the message displayed can be even more tailored to the .... [IMPORTANT] -**** +===== When displaying a message on upgrade, it is important to limit when it is being shown to the user. Most of the time it is by using `maximum_version` to limit its usage to upgrades from before a certain version when something specific needs to be done. -**** +===== ==== diff --git a/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc b/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc index 9c25913c38..a3d7547179 100644 --- a/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc +++ b/documentation/content/en/books/porters-handbook/quick-porting/_index.adoc @@ -284,9 +284,9 @@ Patch generated with `git format-patch` will include author identity and email a easier for developers to apply (with `git am`) and give proper credit. [IMPORTANT] -**** +==== To make it easier for committers to apply the patch on their working copy of the ports tree, please generate the [.filename]#.diff# from the base of your ports tree. -**** +==== ==== diff --git a/documentation/content/en/books/porters-handbook/testing/_index.adoc b/documentation/content/en/books/porters-handbook/testing/_index.adoc index c854994f6f..9cf5786d20 100644 --- a/documentation/content/en/books/porters-handbook/testing/_index.adoc +++ b/documentation/content/en/books/porters-handbook/testing/_index.adoc @@ -603,9 +603,9 @@ To build a set with a non default Perl version, for example, `5.20`, using a set DEFAULT_VERSIONS+= perl=5.20 .... [NOTE] -**** +===== Note the use of `+=` so that if the variable is already set in the default [.filename]#make.conf# its content will not be overwritten. -**** +===== ==== diff --git a/documentation/content/es/books/handbook/advanced-networking/_index.adoc b/documentation/content/es/books/handbook/advanced-networking/_index.adoc index 31a0325853..cc9fbc7116 100644 --- a/documentation/content/es/books/handbook/advanced-networking/_index.adoc +++ b/documentation/content/es/books/handbook/advanced-networking/_index.adoc @@ -1575,14 +1575,14 @@ Para los usuarios de portátiles, normalmente es deseable configurar el disposit Esto se consigue sobrescribiendo la dirección MAC del interfaz Ethernet con el de la interfaz inalámbrica. [NOTE] -**** +==== En teorÃa, cualquiera de las dos direcciones MAC (Ethernet o inalámbrica) se puede cambiar para igualarse a la otra. Sin embargo, algunas interfaces inalámbricas populares carecen del soporte para sobrescribir la dirección MAX. Por lo tanto para este propósito recomendamos sobrescribir la dirección MAC Ethernet. -**** +==== [NOTE] -**** +==== Si el controlador para el interfaz inalámbrico no está cargado en el kernel `GENERIC` o en el personalizado, y el ordenador está ejecutando FreeBSD{rel121-current}, carga el [.filename]#.ko# correspondiente en [.filename]#/boot/loader.conf# añadiendo `*driver_load="YES"*` a ese fichero y después reiniciando. Otra forma mejor es cargar el driver en [.filename]#/etc/rc.conf# añadiéndolo a `kld_list` (consulta man:rc.conf[5] para los detalles) en ese fichero y reiniciando. Esto es necesario porque de otra forma el controlador no está todavÃa cargado en el momento en el que se configura el interfaz man:lagg[4]. -**** +==== En este ejemplo, el interfaz Ethernet, _re0_, es el maestro y el interfaz inalámbrico, _wlan0_, es el recambio. El interfaz _wlan0_ ha sido creado a partir del interfaz inalámbrico fÃsico _ath0_, y el interfaz Ethernet se configurará con la dirección MAC del interfaz inalámbrico. Primero, levanta el interfaz inalámbrico (reemplaza _FR_ con tu código de paÃs de dos letras), pero no establezcas una dirección IP. Reemplaza _wlan0_ con el nombre del interfaz inalámbrico del sistema: diff --git a/documentation/content/pl/books/handbook/advanced-networking/_index.adoc b/documentation/content/pl/books/handbook/advanced-networking/_index.adoc index dc8b9310d8..b8c0f6d09c 100644 --- a/documentation/content/pl/books/handbook/advanced-networking/_index.adoc +++ b/documentation/content/pl/books/handbook/advanced-networking/_index.adoc @@ -304,16 +304,16 @@ Connecting a computer to an existing wireless network is a very common situation .... % ifconfig | grep -B3 -i wireless .... -+ ++ On FreeBSD 11 or higher, use this command instead: + [source,shell] .... % sysctl net.wlan.devices .... -+ ++ If a wireless adapter is not listed, an additional kernel module might be required, or it might be a model not supported by FreeBSD. -+ ++ This example shows the Atheros `ath0` wireless adapter. . Add an entry for this network to [.filename]#/etc/wpa_supplicant.conf#. If the file does not exist, create it. Replace _myssid_ and _mypsk_ with the SSID and PSK provided by the network administrator. + @@ -1226,7 +1226,7 @@ This section describes a number of steps to help troubleshoot common wireless ne * If the access point is not listed when scanning, check that the configuration has not limited the wireless device to a limited set of channels. * If the device cannot associate with an access point, verify that the configuration matches the settings on the access point. This includes the authentication scheme and any security protocols. Simplify the configuration as much as possible. If using a security protocol such as WPA or WEP, configure the access point for open authentication and no security to see if traffic will pass. -+ ++ Debugging support is provided by man:wpa_supplicant[8]. Try running this utility manually with `-dd` and look at the system logs. * Once the system can associate with the access point, diagnose the network configuration using tools like man:ping[8]. * There are many lower-level debugging tools. Debugging messages can be enabled in the 802.11 protocol support layer using man:wlandebug[8]. For example, to enable console messages related to scanning for access points and the 802.11 protocol handshakes required to arrange communication: @@ -1236,7 +1236,7 @@ Debugging support is provided by man:wpa_supplicant[8]. Try running this utility # wlandebug -i wlan0 +scan+auth+debug+assoc net.wlan.0.debug: 0 => 0xc80000<assoc,auth,scan> .... -+ ++ Many useful statistics are maintained by the 802.11 layer and `wlanstats`, found in [.filename]#/usr/src/tools/tools/net80211#, will dump this information. These statistics should display all errors identified by the 802.11 layer. However, some errors are identified in the device drivers that lie below the 802.11 layer so they may not show up. To diagnose device-specific problems, refer to the drivers' documentation. If the above information does not help to clarify the problem, submit a problem report and include output from the above tools. @@ -2075,14 +2075,14 @@ For laptop users, it is usually desirable to configure the wireless device as a This is achieved by overriding the Ethernet interface's MAC address with that of the wireless interface. [NOTE] -**** +==== In theory, either the Ethernet or wireless MAC address can be changed to match the other. However, some popular wireless interfaces lack support for overriding the MAC address. We therefore recommend overriding the Ethernet MAC address for this purpose. -**** +==== [NOTE] -**** +==== If the driver for the wireless interface is not loaded in the `GENERIC` or custom kernel, and the computer is running FreeBSD {rel121-current}, load the corresponding [.filename]#.ko# in [.filename]#/boot/loader.conf# by adding `*driver_load="YES"*` to that file and rebooting. Another, better way is to load the driver in [.filename]#/etc/rc.conf# by adding it to `kld_list` (see man:rc.conf[5] for details) in that file and rebooting. This is needed because otherwise the driver is not loaded yet at the time the man:lagg[4] interface is set up. -**** +==== In this example, the Ethernet interface, _re0_, is the master and the wireless interface, _wlan0_, is the failover. The _wlan0_ interface was created from the _ath0_ physical wireless interface, and the Ethernet interface will be configured with the MAC address of the wireless interface. First, determine the MAC address of the wireless interface: @@ -2261,7 +2261,7 @@ Received 264951 bytes in 0.1 seconds # Device Mountpoint FSType Options Dump Pass myhost.example.com:/b/tftpboot/FreeBSD/install / nfs ro 0 0 .... -+ ++ Replace _myhost.example.com_ with the hostname or IP address of the NFS server. In this example, the root file system is mounted read-only in order to prevent NFS clients from potentially deleting the contents of the root file system. . Set the root password in the PXE environment for client machines which are PXE booting : + @@ -2368,7 +2368,7 @@ image::pxe-nfs.png[] tftp> get FreeBSD/install/boot/pxeboot Received 264951 bytes in 0.1 seconds .... -+ ++ The `BUGS` sections in man:tftpd[8] and man:tftp[1] document some limitations with TFTP. . Make sure that the root file system can be mounted via NFS. To test this example configuration: + diff --git a/documentation/content/ru/books/dev-model/_index.adoc b/documentation/content/ru/books/dev-model/_index.adoc index 280822e773..15c8f1669d 100644 --- a/documentation/content/ru/books/dev-model/_index.adoc +++ b/documentation/content/ru/books/dev-model/_index.adoc @@ -1,6 +1,6 @@ --- authors: - - + - author: 'Niklas Saers' bookOrder: 45 copyright: '2002-2005 Niklas Saers' @@ -76,7 +76,7 @@ toc::[] [.abstract-title] ÐÑедиÑловие -Ðо наÑÑоÑÑего моменÑа пÑÐ¾ÐµÐºÑ FreeBSD вÑпÑÑÑил ÑÑд опиÑаннÑÑ Ð¼ÐµÑодик Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑазлиÑнÑÑ ÑаÑÑей ÑабоÑÑ. Ðднако, из-за ÑаÑÑÑÑего ÑиÑла ÑÑаÑÑников пÑоекÑа, Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ð° Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа, обобÑаÑÑÐ°Ñ ÐµÐ³Ð¾ ÑÑÑÑкÑÑÑÑ. footnote:[ÐÑо ÑоглаÑÑеÑÑÑ Ñ Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼ ÐÑÑкÑа, ÑоглаÑно коÑоÑÐ¾Ð¼Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ нового Ñеловека в задеÑживаÑÑийÑÑ Ð¿ÑÐ¾ÐµÐºÑ ÑÐ´ÐµÐ»Ð°ÐµÑ ÐµÐ³Ð¾ еÑÑ Ð±Ð¾Ð»ÐµÐµ задеÑжаннÑм, поÑколÑÐºÑ ÑвелиÑÐ¸Ñ Ð¿Ð¾ÑÑебноÑÑÑ Ð² коммÑникаÑии. ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа â ÑÑо инÑÑÑÑÐ¼ÐµÐ½Ñ Ð´Ð»Ñ ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÑебноÑÑи в коммÑникаÑии.] ÐÐ°Ð½Ð½Ð°Ñ ÑÑаÑÑÑ Ð¿ÑедоÑÑавлÑÐµÑ ÑакÑÑ Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа и пеÑедаÑÑÑ Ñ Ð² пÑÐ¾ÐµÐºÑ Ð´Ð¾ÐºÑменÑаÑии FreeBSD, где она Ð¼Ð¾Ð¶ÐµÑ ÑазвиваÑÑÑÑ Ð²Ð¼ÐµÑÑе Ñ Ð¿ÑоекÑом, ÑÑÐ¾Ð±Ñ Ð² лÑбой Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð²Ñемени оÑÑажаÑÑ ÑпоÑоб его ÑабоÑÑ. Ðна оÑнована на диÑÑеÑÑаÑии [crossref:dev-model[thesis, Saers,2003]]. +Ðо наÑÑоÑÑего моменÑа пÑÐ¾ÐµÐºÑ FreeBSD вÑпÑÑÑил ÑÑд опиÑаннÑÑ Ð¼ÐµÑодик Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑазлиÑнÑÑ ÑаÑÑей ÑабоÑÑ. Ðднако, из-за ÑаÑÑÑÑего ÑиÑла ÑÑаÑÑников пÑоекÑа, Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ð° Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа, обобÑаÑÑÐ°Ñ ÐµÐ³Ð¾ ÑÑÑÑкÑÑÑÑ. footnote:[ÐÑо ÑоглаÑÑеÑÑÑ Ñ Ð·Ð°ÐºÐ¾Ð½Ð¾Ð¼ ÐÑÑкÑа, ÑоглаÑно коÑоÑÐ¾Ð¼Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ нового Ñеловека в задеÑживаÑÑийÑÑ Ð¿ÑÐ¾ÐµÐºÑ ÑÐ´ÐµÐ»Ð°ÐµÑ ÐµÐ³Ð¾ еÑÑ Ð±Ð¾Ð»ÐµÐµ задеÑжаннÑм, поÑколÑÐºÑ ÑвелиÑÐ¸Ñ Ð¿Ð¾ÑÑебноÑÑÑ Ð² коммÑникаÑии. ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа â ÑÑо инÑÑÑÑÐ¼ÐµÐ½Ñ Ð´Ð»Ñ ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÑебноÑÑи в коммÑникаÑии.] ÐÐ°Ð½Ð½Ð°Ñ ÑÑаÑÑÑ Ð¿ÑедоÑÑавлÑÐµÑ ÑакÑÑ Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа и пеÑедаÑÑÑ Ñ Ð² пÑÐ¾ÐµÐºÑ Ð´Ð¾ÐºÑменÑаÑии FreeBSD, где она Ð¼Ð¾Ð¶ÐµÑ ÑазвиваÑÑÑÑ Ð²Ð¼ÐµÑÑе Ñ Ð¿ÑоекÑом, ÑÑÐ¾Ð±Ñ Ð² лÑбой Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð²Ñемени оÑÑажаÑÑ ÑпоÑоб его ÑабоÑÑ. Ðна оÑнована на диÑÑеÑÑаÑии [ crossref:dev-model[thesis, Saers,2003]]. Я Ñ Ð¾Ñел Ð±Ñ Ð¿Ð¾Ð±Ð»Ð°Ð³Ð¾Ð´Ð°ÑиÑÑ ÑледÑÑÑÐ¸Ñ Ð»Ñдей за Ñо, ÑÑо они наÑли вÑÐµÐ¼Ñ Ð¾Ð±ÑÑÑниÑÑ Ð¼Ð½Ðµ непонÑÑнÑе моменÑÑ Ð¸ пÑовеÑиÑÑ Ð´Ð¾ÐºÑменÑ. @@ -98,15 +98,15 @@ toc::[] [[overview]] == ÐÐ±Ð·Ð¾Ñ -ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа â ÑÑо ÑпоÑоб ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°ÐºÐ»Ð°Ð´Ð½ÑÑ ÑаÑÑ Ð¾Ð´Ð¾Ð² на коммÑникаÑии в пÑоекÑе. Ðак показано в [crossref:dev-model[brooks, Brooks, 1995]], ÑвелиÑение ÑиÑла ÑÑаÑÑников пÑоекÑа пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº ÑкÑпоненÑиалÑÐ½Ð¾Ð¼Ñ ÑоÑÑÑ ÐºÐ¾Ð¼Ð¼ÑникаÑий в пÑоекÑе. Ðа поÑледние Ð³Ð¾Ð´Ñ FreeBSD знаÑиÑелÑно ÑвелиÑил как колиÑеÑÑво акÑивнÑÑ Ð¿Ð¾Ð»ÑзоваÑелей, Ñак и коммиÑÑеÑов, ÑÑо ÑооÑвеÑÑÑвенно пÑивело к ÑоÑÑÑ ÐºÐ¾Ð¼Ð¼ÑникаÑий. ÐÐ°Ð½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ ÑнизиÑÑ ÑÑи накладнÑе ÑаÑÑ Ð¾Ð´Ñ Ð·Ð° ÑÑÑÑ Ð¿ÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð°ÐºÑÑалÑного опиÑÐ°Ð½Ð¸Ñ Ð¿ÑоекÑа. +ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа â ÑÑо ÑпоÑоб ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°ÐºÐ»Ð°Ð´Ð½ÑÑ ÑаÑÑ Ð¾Ð´Ð¾Ð² на коммÑникаÑии в пÑоекÑе. Ðак показано в [ crossref:dev-model[brooks, Brooks, 1995]], ÑвелиÑение ÑиÑла ÑÑаÑÑников пÑоекÑа пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº ÑкÑпоненÑиалÑÐ½Ð¾Ð¼Ñ ÑоÑÑÑ ÐºÐ¾Ð¼Ð¼ÑникаÑий в пÑоекÑе. Ðа поÑледние Ð³Ð¾Ð´Ñ FreeBSD знаÑиÑелÑно ÑвелиÑил как колиÑеÑÑво акÑивнÑÑ Ð¿Ð¾Ð»ÑзоваÑелей, Ñак и коммиÑÑеÑов, ÑÑо ÑооÑвеÑÑÑвенно пÑивело к ÑоÑÑÑ ÐºÐ¾Ð¼Ð¼ÑникаÑий. ÐÐ°Ð½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ ÑнизиÑÑ ÑÑи накладнÑе ÑаÑÑ Ð¾Ð´Ñ Ð·Ð° ÑÑÑÑ Ð¿ÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð°ÐºÑÑалÑного опиÑÐ°Ð½Ð¸Ñ Ð¿ÑоекÑа. -Ðо вÑÐµÐ¼Ñ Ð²ÑбоÑов в Core в 2002 Ð³Ð¾Ð´Ñ ÐаÑк ÐÑÑÑей заÑвил: «Я пÑоÑив длинного Ñвода пÑавил, Ñак как ÑÑо ÑдовлеÑвоÑÑÐµÑ ÑклонноÑÑи к ÑÑиÑпÑÑденÑии и пÑоÑивоÑеÑÐ¸Ñ ÑÐµÑ Ð½Ð¾ÑенÑÑиÑноÑÑи, в коÑоÑой пÑÐ¾ÐµÐºÑ Ñак нÑждаеÑÑÑ.» [crossref:dev-model[bsd-election2002, FreeBSD, 2002B]]. ÐÑа Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа не пÑедназнаÑена Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¾Ð¿ÑавдÑваÑÑ Ñоздание огÑаниÑений Ð´Ð»Ñ ÑазÑабоÑÑиков, а ÑлÑÐ¶Ð¸Ñ Ð¸Ð½ÑÑÑÑменÑом Ð´Ð»Ñ Ð¾Ð±Ð»ÐµÐ³ÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¾ÑдинаÑии. Ðна пÑизвана опиÑÑваÑÑ Ð¿ÑоекÑ, Ð´Ð°Ð²Ð°Ñ Ð¾Ð±Ð·Ð¾Ñ ÑÐ ¾Ð³Ð¾, как вÑполнÑÑÑÑÑ ÑазлиÑнÑе пÑоÑеÑÑÑ. ÐÑо введение в Ñо, как ÑабоÑÐ°ÐµÑ Ð¿ÑÐ¾ÐµÐºÑ FreeBSD. +Ðо вÑÐµÐ¼Ñ Ð²ÑбоÑов в Core в 2002 Ð³Ð¾Ð´Ñ ÐаÑк ÐÑÑÑей заÑвил: «Я пÑоÑив длинного Ñвода пÑавил, Ñак как ÑÑо ÑдовлеÑвоÑÑÐµÑ ÑклонноÑÑи к ÑÑиÑпÑÑденÑии и пÑоÑивоÑеÑÐ¸Ñ ÑÐµÑ Ð½Ð¾ÑенÑÑиÑноÑÑи, в коÑоÑой пÑÐ¾ÐµÐºÑ Ñак нÑждаеÑÑÑ.» [ crossref:dev-model[bsd-election2002, FreeBSD, 2002B]]. ÐÑа Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа не пÑедназнаÑена Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¾Ð¿ÑавдÑваÑÑ Ñоздание огÑаниÑений Ð´Ð»Ñ ÑазÑабоÑÑиков, а ÑлÑÐ¶Ð¸Ñ Ð¸Ð½ÑÑÑÑменÑом Ð´Ð»Ñ Ð¾Ð±Ð»ÐµÐ³ÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¾ÑдинаÑии. Ðна пÑизвана опиÑÑваÑÑ Ð¿ÑоекÑ, Ð´Ð°Ð²Ð°Ñ Ð¾Ð±Ð·Ð¾Ñ Ñ Ð¾Ð³Ð¾, как вÑполнÑÑÑÑÑ ÑазлиÑнÑе пÑоÑеÑÑÑ. ÐÑо введение в Ñо, как ÑабоÑÐ°ÐµÑ Ð¿ÑÐ¾ÐµÐºÑ FreeBSD. -ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа FreeBSD бÑÐ´ÐµÑ Ð¾Ð¿Ð¸Ñана по ÑоÑÑоÑÐ½Ð¸Ñ Ð½Ð° 1 иÑÐ»Ñ 2004 года. Ðна оÑнована на ÑабоÑе ÐилÑÑа ÐоÑгенÑена [crossref:dev-model[jorgensen2001, Jørgensen, 2001]], оÑиÑиалÑнÑÑ Ð´Ð¾ÐºÑменÑÐ°Ñ FreeBSD, обÑÑждениÑÑ Ð² ÑпиÑÐºÐ°Ñ ÑаÑÑÑлки FreeBSD и инÑеÑвÑÑ Ñ ÑазÑабоÑÑиками. +ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑоекÑа FreeBSD бÑÐ´ÐµÑ Ð¾Ð¿Ð¸Ñана по ÑоÑÑоÑÐ½Ð¸Ñ Ð½Ð° 1 иÑÐ»Ñ 2004 года. Ðна оÑнована на ÑабоÑе ÐилÑÑа ÐоÑгенÑена [ crossref:dev-model[jorgensen2001, Jørgensen, 2001]], оÑиÑиалÑнÑÑ Ð´Ð¾ÐºÑменÑÐ°Ñ FreeBSD, обÑÑждениÑÑ Ð² ÑпиÑÐºÐ°Ñ ÑаÑÑÑлки FreeBSD и инÑеÑвÑÑ Ñ ÑазÑабоÑÑиками. ÐоÑле опÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸ÑполÑзÑемÑÑ ÑеÑминов в ÑÑом докÑменÑе бÑÐ´ÐµÑ Ð¾Ð¿Ð¸Ñана оÑганизаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÑÑÑкÑÑÑа (вклÑÑÐ°Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ñолей и линии коммÑникаÑии), ÑаÑÑмоÑÑена Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¼ÐµÑодологии, а поÑле пÑедÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½ÑÑÑÑменÑов, иÑполÑзÑемÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ Ð¿ÑоÑеÑÑов, бÑдÑÑ Ð¾Ð¿Ð¸ÑÐ°Ð½Ñ Ð¾Ð¿ÑеделÑннÑе пÑоÑеÑÑÑ. РзаклÑÑение бÑдÑÑ Ð¿ÑедÑÑÐ°Ð²Ð»ÐµÐ½Ñ Ð¾ÑновнÑе подпÑоекÑÑ Ð¿ÑоекÑа FreeBSD. -[crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2002A]] Ð Ð°Ð·Ð´ÐµÐ»Ñ 1.2 и 1.3 опиÑÑваÑÑ Ð²Ð¸Ð´ÐµÐ½Ð¸Ðµ и аÑÑ Ð¸ÑекÑÑÑнÑе пÑинÑÐ¸Ð¿Ñ Ð¿ÑоекÑа. Ðидение ÑÑоÑмÑлиÑовано как: "СоздаÑÑ Ð½Ð°Ð¸Ð»ÑÑÑий Ð¿Ð°ÐºÐµÑ Ð¾Ð¿ÐµÑаÑионной ÑиÑÑемÑ, подобной UNIX®, Ñ Ð´Ð¾Ð»Ð¶Ð½Ñм Ñважением к оÑигиналÑной идеологии пÑогÑаммнÑÑ Ð¸Ð½ÑÑÑÑменÑов, а Ñакже к ÑдобÑÑÐ²Ñ Ð¸ÑполÑзованиÑ, пÑоизводиÑелÑноÑÑи и ÑÑабилÑноÑÑи." ÐÑÑ Ð¸ÑекÑÑÑнÑе пÑинÑÐ¸Ð¿Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÑÑ Ð¾Ð¿ÑеделиÑÑ, Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑ Ð»Ð¸ пÑоблема, коÑоÑÑÑ ÐºÑо-Ñо Ñ Ð¾ÑÐµÑ ÑеÑиÑÑ, в ÑаР¼ÐºÐ°Ñ пÑоекÑа +[ crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2002A]] Ð Ð°Ð·Ð´ÐµÐ»Ñ 1.2 и 1.3 опиÑÑваÑÑ Ð²Ð¸Ð´ÐµÐ½Ð¸Ðµ и аÑÑ Ð¸ÑекÑÑÑнÑе пÑинÑÐ¸Ð¿Ñ Ð¿ÑоекÑа. Ðидение ÑÑоÑмÑлиÑовано как: "СоздаÑÑ Ð½Ð°Ð¸Ð»ÑÑÑий Ð¿Ð°ÐºÐµÑ Ð¾Ð¿ÐµÑаÑионной ÑиÑÑемÑ, подобной UNIX®, Ñ Ð´Ð¾Ð»Ð¶Ð½Ñм Ñважением к оÑигиналÑной идеологии пÑогÑаммнÑÑ Ð¸Ð½ÑÑÑÑменÑов, а Ñакже к ÑдобÑÑÐ²Ñ Ð¸ÑполÑзованиÑ, пÑоизводиÑелÑноÑÑи и ÑÑабилÑноÑÑи." ÐÑÑ Ð¸ÑекÑÑÑнÑе пÑинÑÐ¸Ð¿Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÑÑ Ð¾Ð¿ÑеделиÑÑ, Ð½Ð°Ñ Ð¾Ð´Ð¸ÑÑÑ Ð»Ð¸ пÑоблема, коÑоÑÑÑ ÐºÑо-Ñо Ñ Ð¾ÑÐµÑ ÑеÑиÑÑ, в Ñа Ð¼ÐºÐ°Ñ Ð¿ÑоекÑа [[definitions]] == ÐпÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ @@ -114,7 +114,7 @@ toc::[] [[ref-activity]] === ÐкÑивноÑÑÑ -"ÐкÑивноÑÑÑ" â ÑÑо ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑабоÑÑ, вÑполнÑемÑй в Ñ Ð¾Ð´Ðµ пÑоекÑа [crossref:dev-model[ref-pmbok, PMI, 2000]]. У Ð½ÐµÑ ÐµÑÑÑ ÑезÑлÑÑаÑ, коÑоÑÑй ведÑÑ Ðº доÑÑÐ¸Ð¶ÐµÐ½Ð¸Ñ Ñели. Такой ÑезÑлÑÑÐ°Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð»Ð¸Ð±Ð¾ Ð²Ñ Ð¾Ð´Ð¾Ð¼ Ð´Ð»Ñ Ð´ÑÑгой акÑивноÑÑи, либо ÑаÑÑÑÑ Ð¿Ð¾ÑÑавки пÑоÑеÑÑа. +"ÐкÑивноÑÑÑ" â ÑÑо ÑÐ»ÐµÐ¼ÐµÐ½Ñ ÑабоÑÑ, вÑполнÑемÑй в Ñ Ð¾Ð´Ðµ пÑоекÑа [ crossref:dev-model[ref-pmbok, PMI, 2000]]. У Ð½ÐµÑ ÐµÑÑÑ ÑезÑлÑÑаÑ, коÑоÑÑй ведÑÑ Ðº доÑÑÐ¸Ð¶ÐµÐ½Ð¸Ñ Ñели. Такой ÑезÑлÑÑÐ°Ñ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð»Ð¸Ð±Ð¾ Ð²Ñ Ð¾Ð´Ð¾Ð¼ Ð´Ð»Ñ Ð´ÑÑгой акÑивноÑÑи, либо ÑаÑÑÑÑ Ð¿Ð¾ÑÑавки пÑоÑеÑÑа. [[def-process]] === ÐÑоÑеÑÑ @@ -129,7 +129,7 @@ toc::[] [[ref-outcome]] === РезÑлÑÑÐ°Ñ -«РезÑлÑÑаÑ» â ÑÑо конеÑнÑй пÑодÑÐºÑ Ð¿ÑоÑеÑÑа. ÐÑо Ñиноним понÑÑÐ¸Ñ Â«Ð¿Ð¾ÑÑавлÑемÑй ÑезÑлÑÑаÑ», коÑоÑÑй опÑеделÑеÑÑÑ ÐºÐ°Ðº «лÑбой измеÑимÑй, оÑÑзаемÑй, пÑовеÑÑемÑй ÑезÑлÑÑаÑ, иÑог или ÑлеменÑ, коÑоÑÑй должен бÑÑÑ Ð¿ÑоизведÑн Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¿ÑоекÑа или его ÑаÑÑи. ЧаÑÑо иÑполÑзÑеÑÑÑ Ð² более Ñзком ÑмÑÑле в оÑноÑении внеÑнего поÑÑавлÑемого ÑезÑлÑÑаÑа, коÑоÑÑй Ð¿Ð¾Ð´Ð»ÐµÐ¶Ð¸Ñ ÑÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ ÑпонÑоÑом пÑоекÑа или заказÑиком» ÑоглаÑно [crossref:dev-model[ref-pmbok , PMI, 2000]]. ÐÑимеÑами ÑезÑлÑÑаÑов ÑвлÑÑÑÑÑ Ð¿ÑогÑаммное обеÑпеÑение, пÑинÑÑое ÑеÑение или напиÑаннÑй оÑÑÑÑ. +«РезÑлÑÑаÑ» â ÑÑо конеÑнÑй пÑодÑÐºÑ Ð¿ÑоÑеÑÑа. ÐÑо Ñиноним понÑÑÐ¸Ñ Â«Ð¿Ð¾ÑÑавлÑемÑй ÑезÑлÑÑаÑ», коÑоÑÑй опÑеделÑеÑÑÑ ÐºÐ°Ðº «лÑбой измеÑимÑй, оÑÑзаемÑй, пÑовеÑÑемÑй ÑезÑлÑÑаÑ, иÑог или ÑлеменÑ, коÑоÑÑй должен бÑÑÑ Ð¿ÑоизведÑн Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¿ÑоекÑа или его ÑаÑÑи. ЧаÑÑо иÑполÑзÑеÑÑÑ Ð² более Ñзком ÑмÑÑле в оÑноÑении внеÑнего поÑÑавлÑемого ÑезÑлÑÑаÑа, коÑоÑÑй Ð¿Ð¾Ð´Ð»ÐµÐ¶Ð¸Ñ ÑÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ ÑпонÑоÑом пÑоекÑа или заказÑиком» ÑоглаÑно [ crossref:dev-model[ref-pmbo k, PMI, 2000]]. ÐÑимеÑами ÑезÑлÑÑаÑов ÑвлÑÑÑÑÑ Ð¿ÑогÑаммное обеÑпеÑение, пÑинÑÑое ÑеÑение или напиÑаннÑй оÑÑÑÑ. [[ref-freebsd]] === FreeBSD @@ -179,27 +179,27 @@ toc::[] | ÐолиÑеÑÑво лÑдей |ÐÑновнÑе ÑÑаÑÑники -| +| |9 |ÐоммиÑÑеÑÑ |ÐазовÑй |164 -| +| |Docs |45 -| +| |ÐоÑÑÑ |166 -| +| |Total |374 |УÑаÑÑники -| +| |~3000 |=== @@ -234,7 +234,7 @@ toc::[] |пÑогÑаммиÑование |ÑеÑензиÑование -| +| |ÑеÑензиÑование |пÑедваÑиÑелÑÐ½Ð°Ñ Ð¿ÑовеÑка пеÑед коммиÑом @@ -253,11 +253,11 @@ toc::[] |пÑогÑаммиÑование |Ñелиз Ð´Ð»Ñ Ð¿ÑоизводÑÑва -| +| |пÑогÑаммиÑование |=== -"Релиз Ð´Ð»Ñ ÑазÑабоÑки" â ÑÑо веÑка FreeBSD-CURRENT ("-CURRENT"), а "Ñелиз Ð´Ð»Ñ Ð¿ÑоизводÑÑва" â веÑка FreeBSD-STABLE ("-STABLE") [crossref:dev-model[jorgensen2001, Jørgensen, 2001]]. +"Релиз Ð´Ð»Ñ ÑазÑабоÑки" â ÑÑо веÑка FreeBSD-CURRENT ("-CURRENT"), а "Ñелиз Ð´Ð»Ñ Ð¿ÑоизводÑÑва" â веÑка FreeBSD-STABLE ("-STABLE") [ crossref:dev-model[jorgensen2001, Jørgensen, 2001]]. ÐÑо Ð¼Ð¾Ð´ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ изменениÑ, коÑоÑÐ°Ñ Ð¿Ð¾ÐºÐ°Ð·ÑваеÑ, ÑÑо поÑле напиÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð° ÑазÑабоÑÑики иÑÑÑ ÑеÑензиÑование ÑообÑеÑÑва и пÑÑаÑÑÑÑ Ð¸Ð½ÑегÑиÑоваÑÑ ÑÑо изменение в Ñвои ÑобÑÑвеннÑе ÑиÑÑемÑ. ÐоÑле инÑегÑаÑии Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² веÑÑÐ¸Ñ ÑазÑабоÑки, назÑваемÑÑ FreeBSD-CURRENT, оно ÑеÑÑиÑÑеÑÑÑ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ полÑзоваÑелÑми и ÑазÑабоÑÑиками ÑообÑеÑÑва FreeBSD. ÐоÑле доÑÑаÑоÑного ÑеÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ð½Ð¾ обÑединÑеÑÑÑ Ñ Ð¿ÑоизводÑÑвенной веÑÑией, назÑваемой FreeBSD-STABLE. ÐÑ Ð»Ð¸ ÐºÐ°Ð¶Ð´Ð°Ñ ÑÑÐ°Ð´Ð¸Ñ Ð½Ðµ завеÑÑена ÑÑпеÑно, ÑазÑабоÑÑÐ¸ÐºÑ Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ð¾ веÑнÑÑÑÑÑ, внеÑÑи Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² код и Ð¿ÐµÑ ÐµÐ·Ð°Ð¿ÑÑÑиÑÑ Ð¿ÑоÑеÑÑ. ÐнÑегÑаÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² -CURRENT или -STABLE назÑваеÑÑÑ Ð²Ñполнением коммиÑа. @@ -295,11 +295,11 @@ image::branches.png["ÐбÑаÑиÑеÑÑ Ðº ÑаблиÑе ниже Ð´Ð»Ñ Ñд | СледÑÑÑие миноÑнÑе вÑпÑÑки |... -| -| +| +| |3.0 Current (веÑка ÑазÑабоÑки) -| +| |ÐеÑки Releng 3: вÑпÑÑки Ñ 3.0 Release по 3.5 Release, ведÑÑие к вÑпÑÑÐºÑ 3.5.1 Release и поÑледÑÑÑей веÑке 3 Stable |4.0 Current (веÑка ÑазÑабоÑки) @@ -312,15 +312,15 @@ image::branches.png["ÐбÑаÑиÑеÑÑ Ðº ÑаблиÑе ниже Ð´Ð»Ñ Ñд |6.0 Current (веÑка ÑазÑабоÑки) |Релиз 5.3 -| +| |... -| -| +| +| |=== -ÐоÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ -CURRENT вÑегда обознаÑаеÑÑÑ ÐºÐ°Ðº -CURRENT, а поÑледний Ñелиз -STABLE вÑегда обознаÑаеÑÑÑ ÐºÐ°Ðº -STABLE. Ðа ÑÑом ÑиÑÑнке -STABLE оÑноÑиÑÑÑ Ðº 4-STABLE, а -CURRENT оÑноÑиÑÑÑ Ðº 5.0-CURRENT поÑле 5.0-RELEASE. [crossref:dev-model[freebsd-releng, FreeBSD, 2002E]] +ÐоÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ -CURRENT вÑегда обознаÑаеÑÑÑ ÐºÐ°Ðº -CURRENT, а поÑледний Ñелиз -STABLE вÑегда обознаÑаеÑÑÑ ÐºÐ°Ðº -STABLE. Ðа ÑÑом ÑиÑÑнке -STABLE оÑноÑиÑÑÑ Ðº 4-STABLE, а -CURRENT оÑноÑиÑÑÑ Ðº 5.0-CURRENT поÑле 5.0-RELEASE. [ crossref:dev-model[freebsd-releng, FreeBSD, 2002E]] «ÐÑновной вÑпÑÑк» вÑегда ÑоздаÑÑÑÑ Ð¸Ð· веÑки -CURRENT. Ðднако веÑка -CURRENT не обÑзаÑелÑно должна ÑазвеÑвлÑÑÑÑÑ Ð² ÑÑÐ¾Ñ Ð¼Ð¾Ð¼ÐµÐ½Ñ, а Ð¼Ð¾Ð¶ÐµÑ ÑоÑÑедоÑоÑиÑÑÑÑ Ð½Ð° ÑÑабилизаÑии. ÐÑимеÑом ÑÑого ÑвлÑеÑÑÑ Ñо, ÑÑо поÑле 3.0-RELEASE, 3.1-RELEASE Ñакже бÑл пÑодолжением веÑки -CURRENT, и -CURRENT не ÑÑал наÑÑоÑÑей веÑкой ÑазÑабоÑки до ÑÐµÑ Ð¿Ð¾Ñ, пока не бÑл вÑпÑÑен ÑÑÐ¾Ñ Ñелиз и не бÑла Ñоздана веÑка 3-STABLE. Ðогда -CURRENT Ñнова ÑÑановиÑÑÑ Ð²ÐµÑкой ÑазÑабоÑки, за ним Ð¼Ð¾Ð¶ÐµÑ ÑледоваÑÑ ÑолÑÐ ºÐ¾ оÑновной вÑпÑÑк. ÐжидаеÑÑÑ, ÑÑо веÑка 5-STABLE бÑÐ´ÐµÑ Ð¾Ñделена Ð¾Ñ 5.0-CURRENT пÑимеÑно на Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð²ÑпÑÑка 5.3-RELEASE. ТолÑко поÑле оÑÐ´ÐµÐ»ÐµÐ½Ð¸Ñ 5-STABLE веÑка ÑазÑабоÑки полÑÑÐ¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ 6.0-CURRENT. @@ -357,12 +357,12 @@ image::freebsd-code-model.png["ÐбÑаÑиÑеÑÑ Ðº паÑагÑаÑам ни [[role-contributor]] ==== УÑаÑÑник (конÑÑибÑÑÑоÑ) -УÑаÑÑник вноÑÐ¸Ñ Ð²ÐºÐ»Ð°Ð´ в пÑÐ¾ÐµÐºÑ FreeBSD в каÑеÑÑве ÑазÑабоÑÑика, авÑоÑа, оÑпÑавлÑÑ Ð¾ÑÑÑÑÑ Ð¾ пÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ñ Ð¸Ð»Ð¸ дÑÑгими ÑпоÑобами ÑпоÑобÑÑвÑÑ Ð¿ÑогÑеÑÑÑ Ð¿ÑоекÑа. УÑаÑÑник не Ð¸Ð¼ÐµÐµÑ Ð¾ÑобÑÑ Ð¿Ñивилегий в пÑоекÑе FreeBSD. [crossref:dev-model[freebsd-contributors, FreeBSD, 2002F]] +УÑаÑÑник вноÑÐ¸Ñ Ð²ÐºÐ»Ð°Ð´ в пÑÐ¾ÐµÐºÑ FreeBSD в каÑеÑÑве ÑазÑабоÑÑика, авÑоÑа, оÑпÑавлÑÑ Ð¾ÑÑÑÑÑ Ð¾ пÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ñ Ð¸Ð»Ð¸ дÑÑгими ÑпоÑобами ÑпоÑобÑÑвÑÑ Ð¿ÑогÑеÑÑÑ Ð¿ÑоекÑа. УÑаÑÑник не Ð¸Ð¼ÐµÐµÑ Ð¾ÑобÑÑ Ð¿Ñивилегий в пÑоекÑе FreeBSD. [ crossref:dev-model[freebsd-contributors, FreeBSD, 2002F]] [[role-committer]] ==== ÐоммиÑÑÐµÑ -Человек, обладаÑÑий Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ñми пÑивилегиÑми Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñвоего кода или докÑменÑаÑии в ÑепозиÑоÑий. ÐоммиÑÑÐµÑ ÑовеÑÑил ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð² ÑеÑение поÑÐ»ÐµÐ´Ð½Ð¸Ñ 12 меÑÑÑев. [crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2000A]] ÐкÑивнÑй коммиÑÑÐµÑ â ÑÑо коммиÑÑеÑ, коÑоÑÑй в ÑÑеднем ÑовеÑÑал один ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð² меÑÑÑ Ð² ÑеÑение ÑÑого вÑемени. +Человек, обладаÑÑий Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ñми пÑивилегиÑми Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñвоего кода или докÑменÑаÑии в ÑепозиÑоÑий. ÐоммиÑÑÐµÑ ÑовеÑÑил ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð² ÑеÑение поÑÐ»ÐµÐ´Ð½Ð¸Ñ 12 меÑÑÑев. [ crossref:dev-model[freebsd-developer-handbook, FreeBSD, 2000A]] ÐкÑивнÑй коммиÑÑÐµÑ â ÑÑо коммиÑÑеÑ, коÑоÑÑй в ÑÑеднем ÑовеÑÑал один ÐºÐ¾Ð¼Ð¼Ð¸Ñ Ð² меÑÑÑ Ð² ÑеÑение ÑÑого вÑемени. СÑÐ¾Ð¸Ñ Ð¾ÑмеÑиÑÑ, ÑÑо Ð½ÐµÑ ÑÐµÑ Ð½Ð¸ÑеÑÐºÐ¸Ñ Ð¿ÑепÑÑÑÑвий, коÑоÑÑе могли Ð±Ñ Ð¿Ð¾Ð¼ÐµÑаÑÑ ÐºÐ¾Ð¼Ñ-либо, полÑÑивÑÐµÐ¼Ñ Ð¿Ñава на коммиÑÑ Ð² оÑновном или подпÑоекÑе, делаÑÑ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑ Ð² ÑаÑÑÑÑ Ð¸ÑÑ Ð¾Ð´Ð½Ð¾Ð³Ð¾ кода пÑоекÑа, Ð´Ð»Ñ ÐºÐ¾ÑоÑÑÑ Ñ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑа Ð½ÐµÑ Ñвного ÑазÑеÑÐµÐ½Ð¸Ñ Ð½Ð° изменение. Ðднако, пÑи желании внеÑÑи Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ÑаÑÑи, Ñ ÐºÐ¾ÑоÑÑми коммиÑÑÐµÑ Ñанее не ÑабоÑал, ÑледÑÐµÑ Ð¸Ð·ÑÑиÑÑ Ð»Ð¾Ð³Ð¸, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð½ÑÑÑ, ÑÑо пÑоиÑÑ Ð¾Ð´Ð¸Ð»Ð¾ в ÑÑой облаÑÑи Ñанее, а Ñакже пÑоÑиÑаÑÑ Ñайл MAINTAINE RS, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ, еÑÑÑ Ð»Ð¸ Ñ ÑопÑовождаÑÑего ÑÑой ÑаÑÑи какие-либо оÑобÑе ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ðº внеÑÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ в код. @@ -553,7 +553,7 @@ image::proc-add-committer.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ д Ðогда ÑÑаÑÑник оÑпÑавлÑÐµÑ ÑÑÐ°Ð³Ð¼ÐµÐ½Ñ ÐºÐ¾Ð´Ð°, пÑинимаÑÑий коммиÑÑÐµÑ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑедложиÑÑ Ð¿ÑедоÑÑавиÑÑ ÑÑÐ¾Ð¼Ñ ÑÑаÑÑÐ½Ð¸ÐºÑ Ð¿Ñава на коммиÑ. ÐÑли он ÑекомендÑÐµÑ ÑÑо оÑновной команде (Core Team), команда пÑÐ¾Ð²Ð¾Ð´Ð¸Ñ Ð³Ð¾Ð»Ð¾Ñование по ÑÑой ÑекомендаÑии. ÐÑли голоÑование завеÑÑаеÑÑÑ Ð² полÑÐ·Ñ Ð¿ÑедложениÑ, Ð½Ð¾Ð²Ð¾Ð¼Ñ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑÑ Ð½Ð°Ð·Ð½Ð°ÑаеÑÑÑ Ð½Ð°ÑÑавник, и новÑй коммиÑÑÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ оÑпÑавиÑÑ Ñвои даннÑе админиÑÑÑаÑоÑам Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÑÑной запиÑи. ÐоÑле ÑÑого новÑй ко ммиÑÑÐµÑ Ð³Ð¾Ñов ÑделаÑÑ Ñвой пеÑвÑй коммиÑ. Ðо ÑÑадиÑии, ÑÑо делаеÑÑÑ Ð¿ÑÑÑм Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñвоего имени в Ñпи Ñок коммиÑÑеÑов. Ðапомним, ÑÑо коммиÑÑеÑом ÑÑиÑаеÑÑÑ ÑоÑ, кÑо за поÑледние 12 меÑÑÑев внÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² код. Ðднако пÑаво на коммиÑÑ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾Ñозвано ÑолÑко поÑле 18 меÑÑÑев неакÑивноÑÑи. -[crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] +[ crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] Ðднако не ÑÑÑеÑÑвÑÐµÑ Ð°Ð²ÑомаÑиÑеÑÐºÐ¸Ñ Ð¿ÑоÑедÑÑ Ð´Ð»Ñ ÑÑого. ÐÐ»Ñ Ð´ÐµÐ¹ÑÑвий, ÑвÑзаннÑÑ Ñ Ð¿ÑивилегиÑми коммиÑов, не вÑзваннÑÑ Ð²Ñеменем, Ñм. crossref:dev-model[process-reactions,Ñаздел 1.5.8]. .ÐÑоÑеÑÑ: Ñдаление коммиÑÑеÑа @@ -571,9 +571,9 @@ image::proc-rm-committer.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ дл . crossref:dev-model[role-maintainer, СопÑовождение] . crossref:dev-model[role-mentor, ÐаÑÑавник (Mentor)] -[crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] -[crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] -[crossref:dev-model[freebsd-new-account, FreeBSD, 2002I]] +[ crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] +[ crossref:dev-model[freebsd-expiration-policy, FreeBSD, 2002H]] +[ crossref:dev-model[freebsd-new-account, FreeBSD, 2002I]] [[committing]] === ÐÐ¾Ð¼Ð¼Ð¸Ñ ÐºÐ¾Ð´Ð° @@ -605,8 +605,8 @@ image::proc-contrib.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑам вÑÑе и ни . crossref:dev-model[role-vendor, ÐоÑÑавÑик] . crossref:dev-model[role-reviewer, РеÑензенÑÑ] -[crossref:dev-model[freebsd-committer, FreeBSD, 2001]] -[crossref:dev-model[jorgensen2001, Jørgensen, 2001]] +[ crossref:dev-model[freebsd-committer, FreeBSD, 2001]] +[ crossref:dev-model[jorgensen2001, Jørgensen, 2001]] [[process-core-election]] === ÐÑбоÑÑ Ð¾Ñновной ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ (Core Team) @@ -638,14 +638,14 @@ image::proc-elections.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ Ð´Ð»Ñ * crossref:dev-model[role-committer, ÐоммиÑÑеÑ] * crossref:dev-model[role-election-manager, ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð²ÑбоÑов] -[crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] -[crossref:dev-model[bsd-election2002, FreeBSD, 2002B]] -[crossref:dev-model[freebsd-election, FreeBSD, 2002G]] +[ crossref:dev-model[freebsd-bylaws, FreeBSD, 2000A]] +[ crossref:dev-model[bsd-election2002, FreeBSD, 2002B]] +[ crossref:dev-model[freebsd-election, FreeBSD, 2002G]] [[new-features]] === РазÑабоÑка новÑÑ ÑÑнкÑий -Ð ÑÐ°Ð¼ÐºÐ°Ñ Ð¿ÑоекÑа ÑÑÑеÑÑвÑÑÑ Ð¿Ð¾Ð´Ð¿ÑоекÑÑ, ÑабоÑаÑÑие над новÑми ÑÑнкÑиÑми. ÐÑи пÑоекÑÑ Ð¾Ð±ÑÑно вÑполнÑÑÑÑÑ Ð¾Ð´Ð½Ð¸Ð¼ Ñеловеком [crossref:dev-model[jorgensen2001, ÐоÑгенÑен, 2001]]. ÐаждÑй пÑÐ¾ÐµÐºÑ Ð²Ð¾Ð»ÐµÐ½ оÑганизовÑваÑÑ ÑазÑабоÑÐºÑ Ñак, как ÑÑиÑÐ°ÐµÑ Ð½ÑжнÑм. Ðднако, когда пÑÐ¾ÐµÐºÑ Ð¾Ð±ÑединÑеÑÑÑ Ñ Ð²ÐµÑвÑÑ -CURRENT, он должен ÑледоваÑÑ ÑÑководÑÑвам пÑоекÑа. Ðогда код Ñ Ð¾ÑоÑо пÑоÑеÑÑиÑован в веÑви -CURRENT и пÑизнан доÑÑаÑоÑно ÑÑабилÑнÑм и акÑÑалÑнÑм Ð´Ð»Ñ Ð²ÐµÑви -STABLE, он обÑединÑе ÑÑÑ Ñ Ð²ÐµÑвÑÑ -STABLE. +Ð ÑÐ°Ð¼ÐºÐ°Ñ Ð¿ÑоекÑа ÑÑÑеÑÑвÑÑÑ Ð¿Ð¾Ð´Ð¿ÑоекÑÑ, ÑабоÑаÑÑие над новÑми ÑÑнкÑиÑми. ÐÑи пÑоекÑÑ Ð¾Ð±ÑÑно вÑполнÑÑÑÑÑ Ð¾Ð´Ð½Ð¸Ð¼ Ñеловеком [ crossref:dev-model[jorgensen2001, ÐоÑгенÑен, 2001]]. ÐаждÑй пÑÐ¾ÐµÐºÑ Ð²Ð¾Ð»ÐµÐ½ оÑганизовÑваÑÑ ÑазÑабоÑÐºÑ Ñак, как ÑÑиÑÐ°ÐµÑ Ð½ÑжнÑм. Ðднако, когда пÑÐ¾ÐµÐºÑ Ð¾Ð±ÑединÑеÑÑÑ Ñ Ð²ÐµÑвÑÑ -CURRENT, он должен ÑледоваÑÑ ÑÑководÑÑвам пÑоекÑа. Ðогда код Ñ Ð¾ÑоÑо пÑоÑеÑÑиÑован в веÑви -CURRENT и пÑизнан доÑÑаÑоÑно ÑÑабилÑнÑм и акÑÑалÑнÑм Ð´Ð»Ñ Ð²ÐµÑви -STABLE, он обÑединÑÐ µÑÑÑ Ñ Ð²ÐµÑвÑÑ -STABLE. ТÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоекÑа опÑеделÑÑÑÑÑ Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñми ÑазÑабоÑÑиков, запÑоÑами ÑообÑеÑÑва в виде пÑÑмÑÑ Ð¾Ð±ÑаÑений по поÑÑе, оÑÑÑÑов о пÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ñ (Problem Reports), коммеÑÑеÑким ÑинанÑиÑованием ÑазÑабоÑки ÑÑнкÑионалÑноÑÑи или вкладами наÑÑного ÑообÑеÑÑва. ÐожеланиÑ, коÑоÑÑе Ð²Ñ Ð¾Ð´ÑÑ Ð² Ð·Ð¾Ð½Ñ Ð¾ÑвеÑÑÑвенноÑÑи ÑазÑабоÑÑика, пеÑедаÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑазÑабоÑÑикÑ, коÑоÑÑй ÑаÑÑÑавлÑÐµÑ Ð¿ÑиоÑиÑеÑÑ Ð¼ÐµÐ¶Ð´Ñ Ð·Ð°Ð¿ÑоÑом и Ñвоими ÑобÑÑвеннÑми пожеланиÑми. РаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð½Ñ Ð¹ ÑпоÑоб оÑганизаÑии ÑÑого пÑоÑеÑÑа â ведение ÑпиÑка Ð·Ð°Ð´Ð°Ñ (TODO-list), поддеÑживаемого пÑоекÑом. ÐадаÑи, нРµ Ð²Ñ Ð¾Ð´ÑÑие в ÑÑÑ-либо Ð·Ð¾Ð½Ñ Ð¾ÑвеÑÑÑвенноÑÑи, ÑобиÑаÑÑÑÑ Ð² ÑпиÑÐºÐ°Ñ TODO, пока кÑо-нибÑÐ´Ñ Ð½Ðµ возÑÐ¼ÐµÑ Ð½Ð° ÑÐµÐ±Ñ Ð¾ÑвеÑÑÑвенноÑÑÑ Ð·Ð° Ð¸Ñ Ð²Ñполнение. ÐÑе запÑоÑÑ, Ð¸Ñ ÑаÑпÑеделение и оÑÑлеживание обÑабаÑÑваÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð¸Ð½ÑÑÑÑменÑа crossref:dev-model[tool-bugzilla, Bugzilla]. @@ -660,7 +660,7 @@ image::proc-elections.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ Ð´Ð»Ñ ÐÐ»Ñ Ð¿ÑоекÑа полезно, ÑÑÐ¾Ð±Ñ Ð·Ð° каждÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¸ÑÑ Ð¾Ð´Ð½Ð¾Ð³Ð¾ кода оÑвеÑал Ñ Ð¾ÑÑ Ð±Ñ Ð¾Ð´Ð¸Ð½ Ñеловек, коÑоÑÑй Ñ Ð¾ÑоÑо ÐµÑ Ð·Ð½Ð°ÐµÑ. ÐекоÑоÑÑе ÑаÑÑи кода имеÑÑ Ð½Ð°Ð·Ð½Ð°ÑеннÑÑ ÑопÑовождаÑÑÐ¸Ñ . ÐÑÑгие имеÑÑ ÑакÑиÑеÑÐºÐ¸Ñ ÑопÑовождаÑÑÐ¸Ñ , а некоÑоÑÑе ÑаÑÑи ÑиÑÑÐµÐ¼Ñ Ð½Ðµ имеÑÑ ÑопÑовождаÑÑÐ¸Ñ . СопÑовождаÑÑий обÑÑно ÑвлÑеÑÑÑ ÑÑаÑÑником подпÑоекÑа, коÑоÑÑй напиÑал и инÑегÑиÑовал код, или Ñем, кÑо поÑÑиÑовал его Ñ Ð¿Ð»Ð°ÑÑоÑмÑ, Ð´Ð»Ñ ÐºÐ¾ÑоÑой он бÑл напиÑан. footnote:[sendmail и nam ed â пÑимеÑÑ ÐºÐ¾Ð´Ð°, коÑоÑÑй бÑл обÑединÑн Ñ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð»Ð°ÑÑоÑм.] ÐадаÑа ÑопÑовождаÑÑего â ÑбедиÑÑÑÑ, ÑÑо код ÑÐ¸Ð½Ñ ÑонизиÑован Ñ Ð¿ÑоекÑом, из коÑоÑого он полÑÑен, еÑли ÑÑо ÑÑоÑонний код, а Ñакже пÑименÑÑÑ Ð¿Ð°ÑÑи, пÑедоÑÑавленнÑе ÑообÑеÑÑвом, или иÑпÑавлÑÑÑ Ð¾Ð±Ð½Ð°ÑÑженнÑе пÑоблемÑ. -ÐÑновной обÑÑм ÑабоÑÑ, вкладÑваемÑй в пÑÐ¾ÐµÐºÑ FreeBSD, ÑвÑзан Ñ ÑопÑовождением. [crossref:dev-model[jorgensen2001, Jørgensen, 2001]] пÑедоÑÑавлÑÐµÑ ÑÑ ÐµÐ¼Ñ, показÑваÑÑÑÑ Ð¶Ð¸Ð·Ð½ÐµÐ½Ð½Ñй Ñикл изменений. +ÐÑновной обÑÑм ÑабоÑÑ, вкладÑваемÑй в пÑÐ¾ÐµÐºÑ FreeBSD, ÑвÑзан Ñ ÑопÑовождением. [ crossref:dev-model[jorgensen2001, Jørgensen, 2001]] пÑедоÑÑавлÑÐµÑ ÑÑ ÐµÐ¼Ñ, показÑваÑÑÑÑ Ð¶Ð¸Ð·Ð½ÐµÐ½Ð½Ñй Ñикл изменений. ÐÐ¾Ð´ÐµÐ»Ñ ÐоÑгенÑÑена Ð´Ð»Ñ Ð¸Ð½ÑегÑаÑии изменений @@ -673,7 +673,7 @@ image::proc-elections.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ Ð´Ð»Ñ |пÑогÑаммиÑование |ÑеÑензиÑование -| +| |ÑеÑензиÑование |пÑедваÑиÑелÑÐ½Ð°Ñ Ð¿ÑовеÑка пеÑед коммиÑом @@ -692,7 +692,7 @@ image::proc-elections.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ Ð´Ð»Ñ |пÑогÑаммиÑование |Ñелиз Ð´Ð»Ñ Ð¿ÑоизводÑÑва -| +| |пÑогÑаммиÑование |=== @@ -720,20 +720,20 @@ image::proc-pr.png["ÐбÑаÑиÑеÑÑ Ðº абзаÑÑ Ð½Ð¸Ð¶Ðµ Ð´Ð»Ñ Ð²ÐµÑ . crossref:dev-model[role-maintainer, СопÑовождение] . crossref:dev-model[role-bugbuster, ÐÑпÑавиÑÐµÐ»Ñ Ð¾Ñибок (Bugbuster)] -[crossref:dev-model[freebsd-handle-pr, FreeBSD, 2002C]]. -[crossref:dev-model[freebsd-send-pr, FreeBSD, 2002D]] +[ crossref:dev-model[freebsd-handle-pr, FreeBSD, 2002C]]. +[ crossref:dev-model[freebsd-send-pr, FreeBSD, 2002D]] [[process-reactions]] === РеагиÑование на непÑавилÑное поведение -[crossref:dev-model[freebsd-committer, FreeBSD, 2001]] ÑодеÑÐ¶Ð¸Ñ ÑÑд пÑавил, коÑоÑÑм Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑÑ. Ðднако ÑлÑÑаеÑÑÑ, ÑÑо ÑÑи пÑавила наÑÑÑаÑÑÑÑ. СледÑÑÑие пÑавила ÑÑÑеÑÑвÑÑÑ Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¼Ð¾Ð¶Ð½Ð¾ бÑло ÑеагиÑоваÑÑ Ð½Ð° неподобаÑÑее поведение. Ðни опÑеделÑÑÑ, какие дейÑÑÐ²Ð¸Ñ Ð¿ÑиведÑÑ Ðº пÑиоÑÑановке пÑивилегий коммиÑÑеÑа на ÑÐ¾Ñ Ð¸Ð»Ð¸ иной ÑÑок. +[ crossref:dev-model[freebsd-committer, FreeBSD, 2001]] ÑодеÑÐ¶Ð¸Ñ ÑÑд пÑавил, коÑоÑÑм Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑÑ. Ðднако ÑлÑÑаеÑÑÑ, ÑÑо ÑÑи пÑавила наÑÑÑаÑÑÑÑ. СледÑÑÑие пÑавила ÑÑÑеÑÑвÑÑÑ Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¼Ð¾Ð¶Ð½Ð¾ бÑло ÑеагиÑоваÑÑ Ð½Ð° неподобаÑÑее поведение. Ðни опÑеделÑÑÑ, какие дейÑÑÐ²Ð¸Ñ Ð¿ÑиведÑÑ Ðº пÑиоÑÑановке пÑивилегий коммиÑÑеÑа на ÑÐ¾Ñ Ð¸Ð»Ð¸ иной ÑÑок. * СовеÑÑение коммиÑов во вÑÐµÐ¼Ñ Ð·Ð°Ð¼Ð¾Ñозки кода без одобÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Release Engineering â 2 Ð´Ð½Ñ * ÐÐ¾Ð¼Ð¼Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ в веÑÐºÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи без одобÑÐµÐ½Ð¸Ñ - 2 Ð´Ð½Ñ * ÐÐ¾Ð¹Ð½Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñов â 5 дней Ð´Ð»Ñ Ð²ÑÐµÑ ÑÑаÑÑвÑÑÑÐ¸Ñ ÑÑоÑон * Ðевежливое или неподобаÑÑее поведение â 5 дней -[crossref:dev-model[ref-freebsd-trenches, Lehey, 2002]] +[ crossref:dev-model[ref-freebsd-trenches, Lehey, 2002]] ÐÐ»Ñ ÑÑÑекÑивноÑÑи пÑиоÑÑановок лÑбой Ñлен оÑновной ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ (Core Team) Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑимениÑÑ Ð¿ÑиоÑÑÐ°Ð½Ð¾Ð²ÐºÑ Ð´Ð¾ обÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð° поÑÑовой ÑаÑÑÑлке "core". ÐовÑоÑнÑе наÑÑÑиÑели могÑÑ, пÑи 2/3 голоÑов Ð¾Ñ Ð¾Ñновной командÑ, полÑÑиÑÑ Ð±Ð¾Ð»ÐµÐµ ÑÑÑогие наказаниÑ, вклÑÑÐ°Ñ Ð¿Ð¾ÑÑоÑнное лиÑение пÑав на коммиÑÑ. (Ðднако поÑледнее вÑегда ÑаÑÑмаÑÑиваеÑÑÑ ÐºÐ°Ðº кÑайнÑÑ Ð¼ÐµÑа из-за пÑиÑÑÑей ÐµÐ¼Ñ ÑклонноÑÑи вÑзÑваÑÑ ÑпоÑÑ.) ÐÑе пÑиоÑÑановки пÑбликÑÑÑÑÑ Ð² поÑÑовой ÑаÑÑÑлке "de velopers", доÑÑÑпной ÑолÑко коммиÑÑеÑам. @@ -799,7 +799,7 @@ Bugzilla â ÑÑо база даннÑÑ Ð´Ð»Ñ ÑопÑовождениÑ, Ñ [[model-mailman]] === Mailman -Mailman - ÑÑо пÑогÑамма, коÑоÑÐ°Ñ Ð°Ð²ÑомаÑизиÑÑÐµÑ ÑпÑавление поÑÑовÑми ÑаÑÑÑлками. ÐÑÐ¾ÐµÐºÑ FreeBSD иÑполÑзÑÐµÑ ÐµÑ Ð´Ð»Ñ Ð²ÐµÐ´ÐµÐ½Ð¸Ñ 16 обÑÐ¸Ñ ÑаÑÑÑлок, 60 ÑÐµÑ Ð½Ð¸ÑеÑÐºÐ¸Ñ ÑаÑÑÑлок, 4 огÑаниÑеннÑÑ ÑаÑÑÑлок и 5 ÑаÑÑÑлок Ñ Ð»Ð¾Ð³Ð°Ð¼Ð¸ коммиÑов Git. Ðна Ñакже иÑполÑзÑеÑÑÑ Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¸Ñ Ð¿Ð¾ÑÑовÑÑ ÑаÑÑÑлок, ÑозданнÑÑ Ð¸ иÑполÑзÑемÑÑ Ð´ÑÑгими лÑдÑми и пÑоекÑами в ÑообÑеÑÑве FreeBSD. ÐбÑие ÑаÑÑÑлки пÑедназнаÑÐµÐ½Ñ Ð´Ð»Ñ ÑиÑокой пÑблики, ÑÐµÑ Ð½Ð¸ÑеÑкие ÑаÑÑÑлки в оÑновном пÑедназнаÑÐµÐ½Ñ Ð´Ð»Ñ ÑазÑабоÑки опÑеделÑннÑÑ Ð¾Ð±Ð»Ð°ÑÑей инÑеÑеÑов, а закÑÑÑÑе ÑаÑÑÑлки иÑполÑзÑÑÑÑÑ Ð´Ð»Ñ Ð²Ð½ÑÑÑенней комм ÑникаÑии, не пÑедназнаÑенной Ð´Ð»Ñ ÑиÑокой пÑблики. ÐолÑÑÐ°Ñ ÑаÑÑÑ Ð²Ñей коммÑникаÑии в пÑоекÑе пÑÐ¾Ñ Ð¾Ð´Ð¸Ñ ÑеÑез ÑÑи 85 ÑаÑÑÑлок [crossref:dev-model[ref-bsd-handbook, FreeBSD, 2003A], ÐÑиложение C]. +Mailman - ÑÑо пÑогÑамма, коÑоÑÐ°Ñ Ð°Ð²ÑомаÑизиÑÑÐµÑ ÑпÑавление поÑÑовÑми ÑаÑÑÑлками. ÐÑÐ¾ÐµÐºÑ FreeBSD иÑполÑзÑÐµÑ ÐµÑ Ð´Ð»Ñ Ð²ÐµÐ´ÐµÐ½Ð¸Ñ 16 обÑÐ¸Ñ ÑаÑÑÑлок, 60 ÑÐµÑ Ð½Ð¸ÑеÑÐºÐ¸Ñ ÑаÑÑÑлок, 4 огÑаниÑеннÑÑ ÑаÑÑÑлок и 5 ÑаÑÑÑлок Ñ Ð»Ð¾Ð³Ð°Ð¼Ð¸ коммиÑов Git. Ðна Ñакже иÑполÑзÑеÑÑÑ Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¸Ñ Ð¿Ð¾ÑÑовÑÑ ÑаÑÑÑлок, ÑозданнÑÑ Ð¸ иÑполÑзÑемÑÑ Ð´ÑÑгими лÑдÑми и пÑоекÑами в ÑообÑеÑÑве FreeBSD. ÐбÑие ÑаÑÑÑлки пÑедназнаÑÐµÐ½Ñ Ð´Ð»Ñ ÑиÑокой пÑблики, ÑÐµÑ Ð½Ð¸ÑеÑкие ÑаÑÑÑлки в оÑновном пÑедназнаÑÐµÐ½Ñ Ð´Ð»Ñ ÑазÑабоÑки опÑеделÑннÑÑ Ð¾Ð±Ð»Ð°ÑÑей инÑеÑеÑов, а закÑÑÑÑе ÑаÑÑÑлки иÑполÑзÑÑÑÑÑ Ð´Ð»Ñ Ð²Ð½ÑÑÑенней комм ÑникаÑии, не пÑедназнаÑенной Ð´Ð»Ñ ÑиÑокой пÑблики. ÐолÑÑÐ°Ñ ÑаÑÑÑ Ð²Ñей коммÑникаÑии в пÑоекÑе пÑÐ¾Ñ Ð¾Ð´Ð¸Ñ ÑеÑез ÑÑи 85 ÑаÑÑÑлок [ crossref:dev-model[ref-bsd-handbook, FreeBSD, 2003A], ÐÑиложение C]. [[tool-pgp]] === Pretty Good Privacy @@ -847,7 +847,7 @@ crossref:dev-model[fig-ports,image::portsstatus.svg] показÑÐ²Ð°ÐµÑ ÐºÐ¾Ð» Ðак и пÑÐ¾ÐµÐºÑ FreeBSD, докÑменÑаÑÐ¸Ñ Ñазделена на Ñе же веÑви. ÐÑо Ñделано Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ веÑÑии вÑегда бÑла обновлÑÐ½Ð½Ð°Ñ Ð´Ð¾ÐºÑменÑаÑиÑ. РвеÑвÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи иÑпÑавлÑÑÑÑÑ ÑолÑко оÑибки в докÑменÑаÑии. -Ðак и подпÑÐ¾ÐµÐºÑ ports, пÑÐ¾ÐµÐºÑ Documentation Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð·Ð½Ð°ÑаÑÑ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑов докÑменÑаÑии без одобÑÐµÐ½Ð¸Ñ Ð¾Ñновной ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ FreeBSD (Core Team). [crossref:dev-model[freebsd-doceng-charter, FreeBSD, 2003B]]. +Ðак и подпÑÐ¾ÐµÐºÑ ports, пÑÐ¾ÐµÐºÑ Documentation Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð·Ð½Ð°ÑаÑÑ ÐºÐ¾Ð¼Ð¼Ð¸ÑÑеÑов докÑменÑаÑии без одобÑÐµÐ½Ð¸Ñ Ð¾Ñновной ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ FreeBSD (Core Team). [ crossref:dev-model[freebsd-doceng-charter, FreeBSD, 2003B]]. ÐÑÐ¾ÐµÐºÑ Ð´Ð¾ÐºÑменÑаÑии вклÑÑÐ°ÐµÑ Ð² ÑÐµÐ±Ñ extref:{fdp-primer}[вводное ÑÑководÑÑво]. Ðно иÑполÑзÑеÑÑÑ ÐºÐ°Ðº Ð´Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²ÑÑ ÑÑаÑÑников пÑоекÑа Ñо ÑÑандаÑÑнÑми инÑÑÑÑменÑами и ÑинÑакÑиÑом, Ñак и в каÑеÑÑве ÑпÑавоÑника пÑи ÑабоÑе над пÑоекÑом. diff --git a/documentation/content/ru/books/developers-handbook/secure/_index.adoc b/documentation/content/ru/books/developers-handbook/secure/_index.adoc index db6613bffa..2ad0f536ae 100644 --- a/documentation/content/ru/books/developers-handbook/secure/_index.adoc +++ b/documentation/content/ru/books/developers-handbook/secure/_index.adoc @@ -1,6 +1,6 @@ --- authors: - - + - author: 'Murray Stokely' description: 'ÐезопаÑное пÑогÑаммиÑование в FreeBSD' next: books/developers-handbook/l10n @@ -78,37 +78,37 @@ endif::[] |=== |`strcpy`(char *dest, const char *src) -| +| ÐÐ¾Ð¶ÐµÑ Ð¿ÐµÑеполниÑÑ Ð±ÑÑÐµÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ *** 1231 LINES SKIPPED ***