diff options
| author | Vladlen Popolitov <vladlen@FreeBSD.org> | 2026-08-13 14:03:31 +0000 |
|---|---|---|
| committer | Vladlen Popolitov <vladlen@FreeBSD.org> | 2026-08-13 14:03:31 +0000 |
| commit | 7262c7f7c0444007febd1e53cf2a991a9118d652 (patch) | |
| tree | 79b002e937e1a982d41ced0f2800e025fdeb628f | |
| parent | f49917cd05955ba85f0adcad7da7308cae3f27d9 (diff) | |
update translation of articles/ a-f to Russian
Differential Revision: https://reviews.freebsd.org/D58807
14 files changed, 2786 insertions, 2675 deletions
diff --git a/documentation/content/ru/articles/building-products/_index.adoc b/documentation/content/ru/articles/building-products/_index.adoc index dc11701019..64dee188d5 100644 --- a/documentation/content/ru/articles/building-products/_index.adoc +++ b/documentation/content/ru/articles/building-products/_index.adoc @@ -130,7 +130,7 @@ FreeBSD предоставляет инструменты для создани [[freebsd-technologies]] === Технологии -В проекте FreeBSD поддерживается большое количество технологий. Ниже приведен их выбор: +В проекте FreeBSD поддерживается большое количество технологий. Ниже приведён их выбор: * Полная система, способная самостоятельно осуществлять кросс-хостинг для link:https://www.FreeBSD.org/platforms/[множества архитектур:] * Модульное симметричное многопроцессорное ядро с загружаемыми модулями и гибкой, удобной системой настройки. @@ -191,7 +191,7 @@ image::freebsd-branches.png[] Проекты с открытым исходным кодом, такие как FreeBSD, предлагают готовый код очень высокого качества. -Хотя доступ к качественному исходному коду может снизить затраты на начальную разработку, в долгосрочной перспективе затраты на управление изменениями становятся преобладающими. По мере того как вычислительные среды меняются с годами и обнаруживаются новые уязвимости безопасности, ваш продукт также должен меняться и адаптироваться. Использование открытого исходного кода лучше рассматривать не как разовое мероприятие, а как __непрерывный процесс__. Лучшие проекты для сотрудничества — это те, которые __активны__; т.е. имеют активное сообщество, четкие цели и прозрачный стиль работы. +Хотя доступ к качественному исходному коду может снизить затраты на начальную разработку, в долгосрочной перспективе затраты на управление изменениями становятся преобладающими. По мере того как вычислительные среды меняются с годами и обнаруживаются новые уязвимости безопасности, ваш продукт также должен меняться и адаптироваться. Использование открытого исходного кода лучше рассматривать не как разовое мероприятие, а как __непрерывный процесс__. Лучшие проекты для сотрудничества — это те, которые __активны__; т.е. имеют активное сообщество, чёткие цели и прозрачный стиль работы. * FreeBSD имеет активное сообщество разработчиков. На момент написания этого документа в мире насчитываются тысячи участников со всех обитаемых континентов, а также более 300 человек с правом записи в исходные репозитории проекта. * Цели проекта FreeBSD описаны в crossref:building-products[Hub1994,"Участие в проекте FreeBSD"]: @@ -258,7 +258,7 @@ This speeds up arg reduction by a factor of 2 for |x| between 3*pi/4 and + *Отслеживание исходного кода FreeBSD.* Проект упрощает зеркалирование своего SVN-репозитория с помощью extref:{committers-guide}[svnsync, svn-advanced-use-setting-up-svnsync]. Наличие полной истории исходного кода полезно при отладке сложных проблем и даёт ценное понимание намерений оригинальных разработчиков. Используйте систему контроля версий, которая позволяет легко объединять изменения между основной кодовой базой FreeBSD и вашим внутренним кодом. + -crossref:building-products[fig-svn-blame, Аннотированный листинг исходного кода, сгенерированный с помощью `svn blame`] показывает часть аннотированного листинга файла, на который ссылается журнал изменений в crossref:building-products[fig-change-log, Пример записи в журнале изменений]. Происхождение каждой строки исходного кода чётко видно. Аннотированные листинги, показывающие историю каждого файла, входящего в состав FreeBSD, https://svnweb.freebsd.org/[доступны в интернете]. +crossref:building-products[fig-svn-blame, "Аннотированный листинг исходного кода, сгенерированный с помощью `svn blame`"] показывает часть аннотированного листинга файла, на который ссылается журнал изменений в crossref:building-products[fig-change-log, Пример записи в журнале изменений]. Происхождение каждой строки исходного кода чётко видно. Аннотированные листинги, показывающие историю каждого файла, входящего в состав FreeBSD, https://svnweb.freebsd.org/[доступны в интернете]. + [.programlisting] .... diff --git a/documentation/content/ru/articles/building-products/_index.po b/documentation/content/ru/articles/building-products/_index.po index 1913a83c98..09e42ab8bd 100644 --- a/documentation/content/ru/articles/building-products/_index.po +++ b/documentation/content/ru/articles/building-products/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2024-12-29 08:30-0500\n" -"PO-Revision-Date: 2026-04-05 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-07-06 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlesbuilding-products_index/ru/>\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" #. type: YAML Front Matter: description @@ -32,12 +32,12 @@ msgid "Building Products with FreeBSD" msgstr "Создание продуктов на основе FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:46 +#: documentation/content/en/articles/building-products/_index.adoc:45 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:50 +#: documentation/content/en/articles/building-products/_index.adoc:49 msgid "" "The FreeBSD project is a worldwide, volunteer based, and collaborative " "project, which develops a portable and high-quality operating system. The " @@ -55,7 +55,7 @@ msgstr "" "продуктов." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:54 +#: documentation/content/en/articles/building-products/_index.adoc:53 msgid "" "This article examines the issues in using FreeBSD code in appliances and " "software products. It highlights the characteristics of FreeBSD that make " @@ -70,18 +70,18 @@ msgstr "" "сотрудничающих с проектом FreeBSD." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:56 +#: documentation/content/en/articles/building-products/_index.adoc:55 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/building-products/_index.adoc:60 +#: documentation/content/en/articles/building-products/_index.adoc:59 #, no-wrap msgid "Introduction" msgstr "Введение" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:67 +#: documentation/content/en/articles/building-products/_index.adoc:66 msgid "" "FreeBSD today is well-known as a high-performance server operating system. " "It is deployed on millions of web servers and internet-facing hosts " @@ -101,7 +101,7 @@ msgstr "" "FreeBSD как набор строительных блоков])." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:69 +#: documentation/content/en/articles/building-products/_index.adoc:68 msgid "" "In this article we look at the link:https://www.FreeBSD.org/[FreeBSD " "project] as a software engineering resource-as a collection of building " @@ -112,7 +112,7 @@ msgstr "" "блоков и процессов, которые можно использовать для создания продуктов." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:72 +#: documentation/content/en/articles/building-products/_index.adoc:71 msgid "" "While FreeBSD's source is distributed freely to the public, to fully enjoy " "the benefits of the project's work, organizations need to _collaborate_ with " @@ -127,34 +127,29 @@ msgstr "" "следует избегать при этом." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:75 +#: documentation/content/en/articles/building-products/_index.adoc:74 #, no-wrap msgid "" "*Caveat Reader.* The author believes that the characteristics of the FreeBSD Project listed in this article were substantially true at the time the article was conceived and written (2005).\n" "However, the reader should keep in mind that the practices and processes used by open-source communities can change over time, and that the information in this article should therefore be taken as indicative rather than normative.\n" msgstr "" -"*Предупреждение для читателя.* Автор считает, что перечисленные в этой " -"статье характеристики проекта FreeBSD были в основном верны на момент " -"написания статьи (2005 год).\n" -"Однако читателю следует учитывать, что практики и процессы, используемые " -"сообществами открытого исходного кода, могут меняться со временем, поэтому " -"информацию в этой статье следует рассматривать как ориентировочную, а не " -"нормативную.\n" +"*Предупреждение для читателя.* Автор считает, что перечисленные в этой статье характеристики проекта FreeBSD были в основном верны на момент написания статьи (2005 год).\n" +"Однако читателю следует учитывать, что практики и процессы, используемые сообществами открытого исходного кода, могут меняться со временем, поэтому информацию в этой статье следует рассматривать как ориентировочную, а не нормативную.\n" #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:76 +#: documentation/content/en/articles/building-products/_index.adoc:75 #, no-wrap msgid "Target Audience" msgstr "Целевая аудитория" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:79 +#: documentation/content/en/articles/building-products/_index.adoc:78 msgid "" "This document would be of interest to the following broad groups of people:" msgstr "Этот документ может быть интересен следующим широким группам людей:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:81 +#: documentation/content/en/articles/building-products/_index.adoc:80 msgid "" "Decision makers in product companies looking at ways to improve their " "product quality, reduce their time to market and lower engineering costs in " @@ -165,16 +160,16 @@ msgstr "" "инженерные затраты в долгосрочной перспективе." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:82 +#: documentation/content/en/articles/building-products/_index.adoc:81 msgid "" -"Technology consultants looking for best-practices in leveraging \"open-" -"source\"." +"Technology consultants looking for best-practices in leveraging \"open-source" +"\"." msgstr "" "Консультанты по технологиям, ищущие передовые методы использования " "\"открытого исходного кода\"." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:83 +#: documentation/content/en/articles/building-products/_index.adoc:82 msgid "" "Industry observers interested in understanding the dynamics of open-source " "projects." @@ -183,7 +178,7 @@ msgstr "" "представители отрасли." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:84 +#: documentation/content/en/articles/building-products/_index.adoc:83 msgid "" "Software developers seeking to use FreeBSD and looking for ways to " "contribute back." @@ -192,31 +187,31 @@ msgstr "" "ищущие способы внести свой вклад." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:85 +#: documentation/content/en/articles/building-products/_index.adoc:84 #, no-wrap msgid "Article Goals" msgstr "Цели статьи" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:88 +#: documentation/content/en/articles/building-products/_index.adoc:87 msgid "After reading this article you should have:" msgstr "Прочитав эту статью, вы должны:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:90 +#: documentation/content/en/articles/building-products/_index.adoc:89 msgid "" "An understanding of the goals of the FreeBSD Project and its organizational " "structure." msgstr "Понимание целей проекта FreeBSD и его организационной структуры." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:91 +#: documentation/content/en/articles/building-products/_index.adoc:90 msgid "" "An understanding of its development model and release engineering processes." msgstr "Понимание модели разработки и процессов выпуска релизов." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:92 +#: documentation/content/en/articles/building-products/_index.adoc:91 msgid "" "An understanding of how conventional corporate software development " "processes differ from that used in the FreeBSD project." @@ -225,7 +220,7 @@ msgstr "" "программного обеспечения отличаются от используемых в проекте FreeBSD." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:93 +#: documentation/content/en/articles/building-products/_index.adoc:92 msgid "" "Awareness of the communication channels used by the project and the level of " "transparency you can expect." @@ -234,7 +229,7 @@ msgstr "" "прозрачности, который вы можете ожидать." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:94 +#: documentation/content/en/articles/building-products/_index.adoc:93 msgid "" "Awareness of optimal ways of working with the project-how best to reduce " "engineering costs, improve time to market, manage security vulnerabilities, " @@ -247,18 +242,18 @@ msgstr "" "развития проекта FreeBSD." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:95 +#: documentation/content/en/articles/building-products/_index.adoc:94 #, no-wrap msgid "Article Structure" msgstr "Структура статьи" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:98 +#: documentation/content/en/articles/building-products/_index.adoc:97 msgid "The rest of the article is structured as follows:" msgstr "Остальная часть статьи структурирована следующим образом:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:100 +#: documentation/content/en/articles/building-products/_index.adoc:99 msgid "" "crossref:building-products[freebsd-intro, FreeBSD as a set of building " "blocks] introduces the FreeBSD project, explores its organizational " @@ -269,7 +264,7 @@ msgstr "" "структуру, ключевые технологии и процессы разработки релизов." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:101 +#: documentation/content/en/articles/building-products/_index.adoc:100 msgid "" "crossref:building-products[freebsd-collaboration, Collaborating with " "FreeBSD] describes ways to collaborate with the FreeBSD project. It examines " @@ -282,23 +277,23 @@ msgstr "" "добровольными проектами, такими как FreeBSD." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:102 +#: documentation/content/en/articles/building-products/_index.adoc:101 msgid "crossref:building-products[conclusion, Conclusion] concludes." msgstr "crossref:building-products[conclusion, Заключение] завершает." #. type: Title == -#: documentation/content/en/articles/building-products/_index.adoc:104 +#: documentation/content/en/articles/building-products/_index.adoc:103 #, no-wrap msgid "FreeBSD as a set of building blocks" msgstr "FreeBSD как набор строительных блоков" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:107 +#: documentation/content/en/articles/building-products/_index.adoc:106 msgid "FreeBSD makes an excellent foundation on which to build products:" msgstr "FreeBSD представляет собой отличную основу для создания продуктов:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:110 +#: documentation/content/en/articles/building-products/_index.adoc:109 msgid "" "FreeBSD source code is distributed under a liberal BSD license facilitating " "its adoption in commercial products crossref:building-products[Mon2005,\"Why " @@ -311,7 +306,7 @@ msgstr "" "вашего открытого проекта\"] с минимальными сложностями." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:111 +#: documentation/content/en/articles/building-products/_index.adoc:110 msgid "" "The FreeBSD project has excellent engineering practices that can be " "leveraged." @@ -320,7 +315,7 @@ msgstr "" "использовать." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:112 +#: documentation/content/en/articles/building-products/_index.adoc:111 msgid "" "The project offers exceptional transparency into its workings, allowing " "organizations using its code to plan effectively for the future." @@ -329,7 +324,7 @@ msgstr "" "организациям, использующим его код, эффективно планировать будущее." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:115 +#: documentation/content/en/articles/building-products/_index.adoc:114 msgid "" "The culture of the FreeBSD project, carried over from the Computer Science " "Research Group at The University of California, Berkeley crossref:building-" @@ -345,7 +340,7 @@ msgstr "" "технологий." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:118 +#: documentation/content/en/articles/building-products/_index.adoc:117 msgid "" "crossref:building-products[GoldGab2005,\"Innovation Happens Elsewhere: Open " "Source as Business Strategy\"] examines the business reasons for using open-" @@ -353,31 +348,32 @@ msgid "" "components in their products include a shorter time to market, lower " "development costs and lower development risks." msgstr "" -"crossref:building-products[GoldGab2005,\"Инновации происходят в другом месте:" -" открытое ПО как бизнес-стратегия\"] подробно рассматривает бизнес-причины " -"использования открытого ПО. Для организаций преимущества использования " -"компонентов FreeBSD в своих продуктах включают сокращение времени выхода на " -"рынок, снижение затрат на разработку и уменьшение рисков разработки." +"crossref:building-products[GoldGab2005,\"Инновации происходят в другом " +"месте: открытое ПО как бизнес-стратегия\"] подробно рассматривает бизнес-" +"причины использования открытого ПО. Для организаций преимущества " +"использования компонентов FreeBSD в своих продуктах включают сокращение " +"времени выхода на рынок, снижение затрат на разработку и уменьшение рисков " +"разработки." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:119 +#: documentation/content/en/articles/building-products/_index.adoc:118 #, no-wrap msgid "Building with FreeBSD" msgstr "Сборка с FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:122 +#: documentation/content/en/articles/building-products/_index.adoc:121 msgid "Here are a few ways organizations have used FreeBSD:" msgstr "Вот несколько способов, как организации использовали FreeBSD:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:124 +#: documentation/content/en/articles/building-products/_index.adoc:123 msgid "As an upstream source for tested code for libraries and utilities." msgstr "" "В качестве вышестоящего источника для проверенного кода библиотек и утилит." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:126 +#: documentation/content/en/articles/building-products/_index.adoc:125 msgid "" "By being \"downstream\" of the project, organizations leverage the new " "features, bug fixes and testing that the upstream code receives." @@ -386,7 +382,7 @@ msgstr "" "функции, исправления ошибок и тестирование, которые получает вышестоящий код." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:127 +#: documentation/content/en/articles/building-products/_index.adoc:126 msgid "" "As an embedded OS (for example, for an OEM router and firewall device). In " "this model, organizations use a customized FreeBSD kernel and application " @@ -402,7 +398,7 @@ msgstr "" "вышестоящего кода, а также от тестирования, которое проходит базовая система." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:129 +#: documentation/content/en/articles/building-products/_index.adoc:128 msgid "" "FreeBSD ships with a self-hosting development environment that allows easy " "creation of such configurations." @@ -411,7 +407,7 @@ msgstr "" "создавать подобные конфигурации." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:130 +#: documentation/content/en/articles/building-products/_index.adoc:129 msgid "" "As a Unix compatible environment for the management functions of high-end " "storage and networking devices, running on a separate processor \"blade\"." @@ -421,7 +417,7 @@ msgstr "" "отдельном процессорном \"лезвии\"." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:134 +#: documentation/content/en/articles/building-products/_index.adoc:133 msgid "" "FreeBSD provides the tools for creating dedicated OS and application program " "images. Its implementation of a BSD unix API is mature and tested. FreeBSD " @@ -434,7 +430,7 @@ msgstr "" "разработки для других компонентов высокопроизводительных устройств." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:135 +#: documentation/content/en/articles/building-products/_index.adoc:134 msgid "" "As a vehicle to get widespread testing and support from a worldwide team of " "developers for non-critical \"intellectual property\"." @@ -444,7 +440,7 @@ msgstr "" "собственности\"." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:139 +#: documentation/content/en/articles/building-products/_index.adoc:138 msgid "" "In this model, organizations contribute useful infrastructural frameworks to " "the FreeBSD project (for example, see man:netgraph[3]). The widespread " @@ -460,7 +456,7 @@ msgstr "" "инфраструктуры, от которых выигрывает и сама организация-вкладчик." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:140 +#: documentation/content/en/articles/building-products/_index.adoc:139 msgid "" "As a development environment supporting cross-development for embedded OSes " "like http://www.rtems.com/[RTEMS] and http://ecos.sourceware.org/[eCOS]." @@ -469,7 +465,7 @@ msgstr "" "таких как http://www.rtems.com/[RTEMS] и http://ecos.sourceware.org/[eCOS]." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:142 +#: documentation/content/en/articles/building-products/_index.adoc:141 msgid "" "There are many full-fledged development environments in the {numports}-" "strong collection of applications ported and packaged with FreeBSD." @@ -479,7 +475,7 @@ msgstr "" "разработки." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:143 +#: documentation/content/en/articles/building-products/_index.adoc:142 msgid "" "As a way to support a Unix-like API in an otherwise proprietary OS, " "increasing its palatability for application developers." @@ -488,7 +484,7 @@ msgstr "" "её привлекательность для разработчиков приложений." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:147 +#: documentation/content/en/articles/building-products/_index.adoc:146 msgid "" "Here parts of FreeBSD's kernel and application programs are \"ported\" to " "run alongside other tasks in the proprietary OS. The availability of a " @@ -507,31 +503,31 @@ msgstr "" "затраты на поддержание актуальности остаются низкими." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:149 +#: documentation/content/en/articles/building-products/_index.adoc:148 #, no-wrap msgid "Technologies" msgstr "Технологии" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:153 +#: documentation/content/en/articles/building-products/_index.adoc:152 msgid "" "There are a large number of technologies supported by the FreeBSD project. " "A selection of these are listed below:" msgstr "" "В проекте FreeBSD поддерживается большое количество технологий. Ниже " -"приведен их выбор:" +"приведён их выбор:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:155 +#: documentation/content/en/articles/building-products/_index.adoc:154 msgid "" "A complete system that can cross-host itself for link:https://www.FreeBSD." "org/platforms/[many architectures:]" msgstr "" -"Полная система, способная самостоятельно осуществлять кросс-хостинг для " -"link:https://www.FreeBSD.org/platforms/[множества архитектур:]" +"Полная система, способная самостоятельно осуществлять кросс-хостинг для link:" +"https://www.FreeBSD.org/platforms/[множества архитектур:]" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:156 +#: documentation/content/en/articles/building-products/_index.adoc:155 msgid "" "A modular symmetric multiprocessing capable kernel, with loadable kernel " "modules and a flexible and easy to use configuration system." @@ -540,7 +536,7 @@ msgstr "" "гибкой, удобной системой настройки." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:157 +#: documentation/content/en/articles/building-products/_index.adoc:156 msgid "" "Support for emulation of Linux(TM) and SVR4 binaries at near machine speeds. " "Support for binary Windows(TM) (NDIS) network drivers." @@ -549,7 +545,7 @@ msgstr "" "скоростью. Поддержка бинарных сетевых драйверов Windows(TM) (NDIS)." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:158 +#: documentation/content/en/articles/building-products/_index.adoc:157 msgid "" "Libraries for many programming tasks: archivers, FTP and HTTP support, " "thread support, in addition to a full POSIX(TM) like programming environment." @@ -559,16 +555,16 @@ msgstr "" "аналогичная POSIX(TM)." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:159 +#: documentation/content/en/articles/building-products/_index.adoc:158 msgid "" "Security features: Mandatory Access Control (man:mac[9]), jails (man:" "jail[2]), ACLs, and in-kernel cryptographic device support." msgstr "" -"Безопасность: Принудительное управление доступом (man:mac[9]), клетки " -"(man:jail[2]), ACL и поддержка криптографических устройств в ядре." +"Безопасность: Принудительное управление доступом (man:mac[9]), клетки (man:" +"jail[2]), ACL и поддержка криптографических устройств в ядре." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:160 +#: documentation/content/en/articles/building-products/_index.adoc:159 msgid "" "Networking features: firewall-ing, QoS management, high-performance TCP/IP " "networking with support for many extensions." @@ -577,7 +573,7 @@ msgstr "" "высокопроизводительные TCP/IP сети с поддержкой множества расширений." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:162 +#: documentation/content/en/articles/building-products/_index.adoc:161 msgid "" "FreeBSD's in-kernel Netgraph (man:netgraph[4]) framework allows kernel " "networking modules to be connected together in flexible ways." @@ -586,7 +582,7 @@ msgstr "" "соединять модули сетевого ядра между собой." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:163 +#: documentation/content/en/articles/building-products/_index.adoc:162 msgid "" "Support for storage technologies: Fibre Channel, SCSI, software and hardware " "RAID, ATA and SATA." @@ -595,23 +591,19 @@ msgstr "" "аппаратный RAID, ATA и SATA." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:167 +#: documentation/content/en/articles/building-products/_index.adoc:166 #, no-wrap msgid "" "FreeBSD supports a number of filesystems, and its native UFS2 filesystem\n" "supports soft updates, snapshots and very large filesystem sizes (16TB per\n" "\t\tfilesystem) crossref:building-products[McKu1999,\"Soft Updates: A Technique for Eliminating Most Synchronous Writes in the Fast Filesystem\"].\n" msgstr "" -"FreeBSD поддерживает множество файловых систем, а его родная файловая " -"система UFS2\n" -"поддерживает мягкие обновления, снимки и очень большие размеры файловых " -"систем (16TB на\n" -"файловую систему) crossref:building-products[McKu1999,\"Soft Updates: A " -"Technique for Eliminating Most Synchronous Writes in the Fast Filesystem\"]." -"\n" +"FreeBSD поддерживает множество файловых систем, а его родная файловая система UFS2\n" +"поддерживает мягкие обновления, снимки и очень большие размеры файловых систем (16TB на\n" +"файловую систему) crossref:building-products[McKu1999,\"Soft Updates: A Technique for Eliminating Most Synchronous Writes in the Fast Filesystem\"].\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:169 +#: documentation/content/en/articles/building-products/_index.adoc:168 msgid "" "FreeBSD's in-kernel GEOM (man:geom[4]) framework allows kernel storage " "modules to be composed in flexible ways." @@ -620,7 +612,7 @@ msgstr "" "комбинировать модули хранения данных." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:170 +#: documentation/content/en/articles/building-products/_index.adoc:169 msgid "" "Over {numports} ported applications, both commercial and open-source, " "managed via the FreeBSD ports collection." @@ -629,29 +621,29 @@ msgstr "" "открытым исходным кодом, управляемых через коллекцию портов FreeBSD." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:171 +#: documentation/content/en/articles/building-products/_index.adoc:170 #, no-wrap msgid "Organizational Structure" msgstr "Организационная структура" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:174 +#: documentation/content/en/articles/building-products/_index.adoc:173 msgid "FreeBSD's organizational structure is non-hierarchical." msgstr "Организационная структура FreeBSD не является иерархической." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:176 +#: documentation/content/en/articles/building-products/_index.adoc:175 msgid "" "There are essentially two kinds of contributors to FreeBSD, general users of " "FreeBSD, and developers with write access (known as _committers_ in the " "jargon) to the source base." msgstr "" "Существует два основных типа участников FreeBSD: обычные пользователи " -"FreeBSD и разработчики с правом записи (известные в жаргоне как _коммиттеры_)" -" в исходную базу." +"FreeBSD и разработчики с правом записи (известные в жаргоне как " +"_коммиттеры_) в исходную базу." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:180 +#: documentation/content/en/articles/building-products/_index.adoc:179 msgid "" "There are many thousands of contributors in the first group; the vast " "majority of contributions to FreeBSD come from individuals in this group. " @@ -661,25 +653,25 @@ msgid "" "them learn the ropes." msgstr "" "В первой группе участвуют тысячи разработчиков; подавляющее большинство " -"вкладов в FreeBSD поступает от участников этой группы. Права на коммит (" -"доступ на запись) в репозиторий предоставляются тем, кто регулярно вносит " +"вкладов в FreeBSD поступает от участников этой группы. Права на коммит " +"(доступ на запись) в репозиторий предоставляются тем, кто регулярно вносит " "вклад в проект. Права на коммит связаны с дополнительными обязанностями, и " "новым коммиттерам назначаются наставники, чтобы помочь им освоиться." #. type: Block title -#: documentation/content/en/articles/building-products/_index.adoc:181 +#: documentation/content/en/articles/building-products/_index.adoc:180 #, no-wrap msgid "FreeBSD Organization" msgstr "Организация FreeBSD" #. type: Target for macro image -#: documentation/content/en/articles/building-products/_index.adoc:182 +#: documentation/content/en/articles/building-products/_index.adoc:181 #, no-wrap msgid "freebsd-organization.png" msgstr "freebsd-organization.png" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:185 +#: documentation/content/en/articles/building-products/_index.adoc:184 msgid "" "Conflict resolution is performed by a nine member \"Core Team\" that is " "elected from the group of committers." @@ -688,7 +680,7 @@ msgstr "" "которая избирается из группы коммиттеров." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:190 +#: documentation/content/en/articles/building-products/_index.adoc:189 msgid "" "FreeBSD does not have \"corporate\" committers. Individual committers are " "required to take responsibility for the changes they introduce to the code. " @@ -697,13 +689,13 @@ msgid "" "responsibilities for committers." msgstr "" "В FreeBSD нет \"корпоративных\" коммиттеров. Отдельные коммиттеры обязаны " -"нести ответственность за изменения, которые они вносят в код. В extref" -":{committers-guide}[Руководстве коммиттера FreeBSD] crossref:building-" +"нести ответственность за изменения, которые они вносят в код. В extref:" +"{committers-guide}[Руководстве коммиттера FreeBSD] crossref:building-" "products[ComGuide,\"Руководство коммиттера\"] описаны правила и обязанности " "коммиттеров." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:193 +#: documentation/content/en/articles/building-products/_index.adoc:192 msgid "" "FreeBSD's project model is examined in detail in crossref:building-" "products[Nik2005,\"A project model for the FreeBSD Project\"]." @@ -712,13 +704,13 @@ msgstr "" "products[Nik2005,\"Модель проекта для FreeBSD\"]." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:194 +#: documentation/content/en/articles/building-products/_index.adoc:193 #, no-wrap msgid "FreeBSD Release Engineering Processes" msgstr "Процессы разработки релизов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:199 +#: documentation/content/en/articles/building-products/_index.adoc:198 msgid "" "FreeBSD's release engineering processes play a major role in ensuring that " "its released versions are of a high quality. At any point of time, " @@ -731,7 +723,7 @@ msgstr "" "freebsd-branches, Ветви релизов FreeBSD]):" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:201 +#: documentation/content/en/articles/building-products/_index.adoc:200 msgid "" "New features and disruptive code enters on the development branch, also " "known as the _-CURRENT_ branch." @@ -740,7 +732,7 @@ msgstr "" "известную как ветка _-CURRENT_." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:202 +#: documentation/content/en/articles/building-products/_index.adoc:201 msgid "" "_-STABLE_ branches are code lines that are branched from HEAD at regular " "intervals. Only tested code is allowed onto a -STABLE branch. New features " @@ -752,7 +744,7 @@ msgstr "" "стабилизации в ветке -CURRENT." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:203 +#: documentation/content/en/articles/building-products/_index.adoc:202 msgid "" "_-RELEASE_ branches are maintained by the FreeBSD security team. Only bug " "fixes for critical issues are permitted onto -RELEASE branches." @@ -761,19 +753,19 @@ msgstr "" "RELEASE допускаются только исправления ошибок для критических проблем." #. type: Block title -#: documentation/content/en/articles/building-products/_index.adoc:205 +#: documentation/content/en/articles/building-products/_index.adoc:204 #, no-wrap msgid "FreeBSD Release Branches" msgstr "Ветви выпусков FreeBSD" #. type: Target for macro image -#: documentation/content/en/articles/building-products/_index.adoc:206 +#: documentation/content/en/articles/building-products/_index.adoc:205 #, no-wrap msgid "freebsd-branches.png" msgstr "freebsd-branches.png" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:209 +#: documentation/content/en/articles/building-products/_index.adoc:208 msgid "" "Code lines are kept alive for as long as there is user and developer " "interest in them." @@ -782,7 +774,7 @@ msgstr "" "пользователей и разработчиков." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:212 +#: documentation/content/en/articles/building-products/_index.adoc:211 msgid "" "Machine architectures are grouped into \"tiers\"; _Tier 1_ architectures are " "fully supported by the project's release engineering and security teams, " @@ -794,25 +786,25 @@ msgstr "" "Архитектуры машин разделены на «уровни»: архитектуры _Уровня 1_ полностью " "поддерживаются командами разработки выпусков и безопасности проекта, " "архитектуры _Уровня 2_ поддерживаются по мере возможностей, а " -"экспериментальные архитектуры составляют _Уровень 3_. Список extref" -":{committers-guide}[поддерживаемых архитектур, archs] является частью " +"экспериментальные архитектуры составляют _Уровень 3_. Список extref:" +"{committers-guide}[поддерживаемых архитектур, archs] является частью " "коллекции документации FreeBSD." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:215 +#: documentation/content/en/articles/building-products/_index.adoc:214 msgid "" "The release engineering team publishes a link:https://www.FreeBSD.org/releng/" "[road map] for future releases of FreeBSD on the project's web site. The " "dates laid down in the road map are not deadlines; FreeBSD is released when " "its code and documentation are ready." msgstr "" -"Команда разработки релизов публикует link:https://www.FreeBSD.org/releng/[" -"дорожную карту] будущих выпусков FreeBSD на веб-сайте проекта. Указанные в " +"Команда разработки релизов публикует link:https://www.FreeBSD.org/releng/" +"[дорожную карту] будущих выпусков FreeBSD на веб-сайте проекта. Указанные в " "дорожной карте даты не являются крайними сроками; FreeBSD выпускается, когда " "его код и документация готовы." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:218 +#: documentation/content/en/articles/building-products/_index.adoc:217 msgid "" "FreeBSD's release engineering processes are described in crossref:building-" "products[RelEngDoc,\"FreeBSD Release Engineering\"]." @@ -821,13 +813,13 @@ msgstr "" "products[RelEngDoc,\"Инженерия релизов FreeBSD\"]." #. type: Title == -#: documentation/content/en/articles/building-products/_index.adoc:220 +#: documentation/content/en/articles/building-products/_index.adoc:219 #, no-wrap msgid "Collaborating with FreeBSD" msgstr "Сотрудничество с FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:223 +#: documentation/content/en/articles/building-products/_index.adoc:222 msgid "" "Open-source projects like FreeBSD offer finished code of a very high quality." msgstr "" @@ -835,7 +827,7 @@ msgstr "" "очень высокого качества." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:228 +#: documentation/content/en/articles/building-products/_index.adoc:227 msgid "" "While access to quality source code can reduce the cost of initial " "development, in the long-term the costs of managing change begin to " @@ -853,11 +845,11 @@ msgstr "" "продукт также должен меняться и адаптироваться. Использование открытого " "исходного кода лучше рассматривать не как разовое мероприятие, а как " "__непрерывный процесс__. Лучшие проекты для сотрудничества — это те, которые " -"__активны__; т.е. имеют активное сообщество, четкие цели и прозрачный стиль " +"__активны__; т.е. имеют активное сообщество, чёткие цели и прозрачный стиль " "работы." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:230 +#: documentation/content/en/articles/building-products/_index.adoc:229 msgid "" "FreeBSD has an active developer community around it. At the time of writing " "there are many thousands of contributors from every populated continent in " @@ -870,7 +862,7 @@ msgstr "" "репозитории проекта." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:232 +#: documentation/content/en/articles/building-products/_index.adoc:231 msgid "" "The goals of the FreeBSD project are crossref:building-products[Hub1994," "\"Contributing to the FreeBSD Project\"]:" @@ -879,7 +871,7 @@ msgstr "" "в проекте FreeBSD\"]:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:234 +#: documentation/content/en/articles/building-products/_index.adoc:233 msgid "" "To develop a high-quality operating system for popular computer hardware, " "and," @@ -888,12 +880,12 @@ msgstr "" "компьютерного оборудования и," #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:235 +#: documentation/content/en/articles/building-products/_index.adoc:234 msgid "To make our work available to all under a liberal license." msgstr "Сделать нашу работу доступной для всех под либеральной лицензией." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:237 +#: documentation/content/en/articles/building-products/_index.adoc:236 msgid "" "FreeBSD enjoys an open and transparent working culture. Nearly all " "discussion in the project happens by email, on link:https://lists.freebsd." @@ -910,13 +902,13 @@ msgstr "" "проекте открыто для всех." #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:239 +#: documentation/content/en/articles/building-products/_index.adoc:238 #, no-wrap msgid "Understanding FreeBSD culture" msgstr "Понимание культуры FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:242 +#: documentation/content/en/articles/building-products/_index.adoc:241 msgid "" "To be able to work effectively with the FreeBSD project, you need to " "understand the project's culture." @@ -925,7 +917,7 @@ msgstr "" "культуру." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:245 +#: documentation/content/en/articles/building-products/_index.adoc:244 msgid "" "Volunteer driven projects operate under different rules than for-profit " "corporates. A common mistake that companies make when venturing into the " @@ -936,7 +928,7 @@ msgstr "" "исходного кода, — недооценка этих различий." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:251 +#: documentation/content/en/articles/building-products/_index.adoc:250 #, no-wrap msgid "" "*Motivation.* Most contributions to FreeBSD are done voluntarily without\n" @@ -948,25 +940,17 @@ msgstr "" "*Мотивация.* Большинство вкладов в FreeBSD делается добровольно,\n" "без денежного вознаграждения. Факторы, мотивирующие людей, сложны и\n" "варьируются от альтруизма до интереса к решению задач, которые FreeBSD\n" -"пытается решить. В таких условиях «элегантность никогда не бывает " -"опциональной»\n" -"crossref:building-products[Nor1993,\"Tutorial on Good Lisp Programming " -"Style\"].\n" +"пытается решить. В таких условиях «элегантность никогда не бывает опциональной»\n" +"crossref:building-products[Nor1993,\"Tutorial on Good Lisp Programming Style\"].\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:253 +#: documentation/content/en/articles/building-products/_index.adoc:252 #, no-wrap msgid "*The Long Term View.* FreeBSD traces its roots back nearly twenty years to the work of the Computer Science Research Group at the University of California Berkeley.footnote:[FreeBSD's source repository contains a history of the project since its inception, and there are CDROMs available that contain earlier code from the CSRG.] A number of the original CSRG developers remain associated with the project.\n" -msgstr "" -"*Долгосрочная перспектива.* FreeBSD ведёт свою историю почти двадцать лет " -"назад, к работе Исследовательской группы по информатике (Computer Science " -"Research Group) в Университете Калифорнии, Беркли.footnote:[Исходный " -"репозиторий FreeBSD содержит историю проекта с момента его создания, а также " -"доступны CD-ROM с более ранним кодом от CSRG.] Некоторые из оригинальных " -"разработчиков CSRG до сих пор связаны с проектом.\n" +msgstr "*Долгосрочная перспектива.* FreeBSD ведёт свою историю почти двадцать лет назад, к работе Исследовательской группы по информатике (Computer Science Research Group) в Университете Калифорнии, Беркли.footnote:[Исходный репозиторий FreeBSD содержит историю проекта с момента его создания, а также доступны CD-ROM с более ранним кодом от CSRG.] Некоторые из оригинальных разработчиков CSRG до сих пор связаны с проектом.\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:255 +#: documentation/content/en/articles/building-products/_index.adoc:254 msgid "" "The project values long-term perspectives crossref:building-products[Nor2001," "\"Teach Yourself Programming in Ten Years\"]. A frequent acronym encountered " @@ -977,28 +961,24 @@ msgstr "" "аббревиатура — DTRT, что означает «Do The Right Thing» (сделай правильно)." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:258 +#: documentation/content/en/articles/building-products/_index.adoc:257 #, no-wrap msgid "" "*Development Processes.* Computer programs are tools for communication: at one level programmers communicate their intentions using a precise notation to a tool (a compiler) that translates their instructions to executable code.\n" "At another level, the same notation is used for communication of intent between two programmers.\n" msgstr "" -"*Процессы разработки.* Компьютерные программы — это инструменты для общения: " -"на одном уровне программисты передают свои намерения, используя точную " -"нотацию, инструменту (компилятору), который преобразует их инструкции в " -"исполняемый код.\n" -"На другом уровне та же нотация используется для передачи намерений между " -"двумя программистами.\n" +"*Процессы разработки.* Компьютерные программы — это инструменты для общения: на одном уровне программисты передают свои намерения, используя точную нотацию, инструменту (компилятору), который преобразует их инструкции в исполняемый код.\n" +"На другом уровне та же нотация используется для передачи намерений между двумя программистами.\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:264 +#: documentation/content/en/articles/building-products/_index.adoc:263 msgid "" "Formal specifications and design documents are seldom used in the project. " "Clear and well-written code and well-written change logs (crossref:building-" "products[fig-change-log, A sample change log entry]) are used in their " -"place. FreeBSD development happens by \"rough consensus and running " -"code\"crossref:building-products[Carp1996,\"The Architectural Principles of " -"the Internet\"]." +"place. FreeBSD development happens by \"rough consensus and running code" +"\"crossref:building-products[Carp1996,\"The Architectural Principles of the " +"Internet\"]." msgstr "" "Формальные спецификации и проектные документы редко используются в проекте. " "Вместо них применяются понятный и хорошо написанный код, а также хорошо " @@ -1008,7 +988,7 @@ msgstr "" "products[Carp1996,\"Архитектурные принципы Интернета\"]." #. type: delimited block . 4 -#: documentation/content/en/articles/building-products/_index.adoc:270 +#: documentation/content/en/articles/building-products/_index.adoc:269 #, no-wrap msgid "" "r151864 | bde | 2005-10-29 09:34:50 -0700 (Sat, 29 Oct 2005) | 13 lines\n" @@ -1020,7 +1000,7 @@ msgstr "" " M /head/lib/msun/src/e_rem_pio2f.c\n" #. type: delimited block . 4 -#: documentation/content/en/articles/building-products/_index.adoc:280 +#: documentation/content/en/articles/building-products/_index.adoc:279 #, no-wrap msgid "" "Use double precision to simplify and optimize arg reduction for small\n" @@ -1044,7 +1024,7 @@ msgstr "" "double version.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/building-products/_index.adoc:283 +#: documentation/content/en/articles/building-products/_index.adoc:282 #, no-wrap msgid "" "This speeds up arg reduction by a factor of 2 for |x| between 3*pi/4 and\n" @@ -1054,13 +1034,13 @@ msgstr "" "2^7*pi/4, and by a factor of 7 for |x| between 2^7*pi/4 and 2^19*pi/4.\n" #. type: Block title -#: documentation/content/en/articles/building-products/_index.adoc:284 +#: documentation/content/en/articles/building-products/_index.adoc:283 #, no-wrap msgid "A sample change log entry [[fig-change-log]]" msgstr "Пример записи в журнале изменений [[fig-change-log]]" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:287 +#: documentation/content/en/articles/building-products/_index.adoc:286 msgid "" "Communication between programmers is enhanced by the use of a common coding " "standard man:style[9]." @@ -1069,24 +1049,23 @@ msgstr "" "стандарта кодирования man:style[9]." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:290 +#: documentation/content/en/articles/building-products/_index.adoc:289 #, no-wrap msgid "" "*Communication Channels.* FreeBSD's contributors are spread across the world.\n" "Email (and to a lesser extent, IRC) is the preferred means of communication in the project.\n" msgstr "" "*Каналы связи.* Участники проекта FreeBSD живут в разных уголках мира.\n" -"Электронная почта (и в меньшей степени IRC) — это предпочтительные способы " -"общения в проекте.\n" +"Электронная почта (и в меньшей степени IRC) — это предпочтительные способы общения в проекте.\n" #. type: Title === -#: documentation/content/en/articles/building-products/_index.adoc:291 +#: documentation/content/en/articles/building-products/_index.adoc:290 #, no-wrap msgid "Best Practices for collaborating with the FreeBSD project" msgstr "Лучшие практики для сотрудничества с проектом FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:294 +#: documentation/content/en/articles/building-products/_index.adoc:293 msgid "" "We now look at a few best practices for making the best use of FreeBSD in " "product development." @@ -1095,13 +1074,13 @@ msgstr "" "использования FreeBSD в разработке продуктов." #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:295 +#: documentation/content/en/articles/building-products/_index.adoc:294 #, no-wrap msgid "Plan for the long term" msgstr "Планируйте на долгосрочную перспективу" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:298 +#: documentation/content/en/articles/building-products/_index.adoc:297 msgid "" "Setup processes that help in tracking the development of FreeBSD. For " "example:" @@ -1110,20 +1089,13 @@ msgstr "" "Например:" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:300 +#: documentation/content/en/articles/building-products/_index.adoc:299 #, no-wrap msgid "*Track FreeBSD source code.* The project makes it easy to mirror its SVN repository using extref:{committers-guide}[svnsync, svn-advanced-use-setting-up-svnsync]. Having the complete history of the source is useful when debugging complex problems and offers valuable insight into the intentions of the original developers. Use a capable source control system that allows you to easily merge changes between the upstream FreeBSD code base and your own in-house code.\n" -msgstr "" -"*Отслеживание исходного кода FreeBSD.* Проект упрощает зеркалирование своего " -"SVN-репозитория с помощью extref:{committers-guide}[svnsync, svn-advanced-" -"use-setting-up-svnsync]. Наличие полной истории исходного кода полезно при " -"отладке сложных проблем и даёт ценное понимание намерений оригинальных " -"разработчиков. Используйте систему контроля версий, которая позволяет легко " -"объединять изменения между основной кодовой базой FreeBSD и вашим внутренним " -"кодом.\n" +msgstr "*Отслеживание исходного кода FreeBSD.* Проект упрощает зеркалирование своего SVN-репозитория с помощью extref:{committers-guide}[svnsync, svn-advanced-use-setting-up-svnsync]. Наличие полной истории исходного кода полезно при отладке сложных проблем и даёт ценное понимание намерений оригинальных разработчиков. Используйте систему контроля версий, которая позволяет легко объединять изменения между основной кодовой базой FreeBSD и вашим внутренним кодом.\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:305 +#: documentation/content/en/articles/building-products/_index.adoc:304 msgid "" "crossref:building-products[fig-svn-blame, An annotated source listing " "generated using `svn blame`] shows a portion of an annotated listing of the " @@ -1132,22 +1104,22 @@ msgid "" "clearly visible. Annotated listings showing the history of every file that " "is part of FreeBSD are https://svnweb.freebsd.org/[available on the web]." msgstr "" -"crossref:building-products[fig-svn-blame, Аннотированный листинг исходного " -"кода, сгенерированный с помощью `svn blame`] показывает часть " +"crossref:building-products[fig-svn-blame, \"Аннотированный листинг исходного " +"кода, сгенерированный с помощью `svn blame`\"] показывает часть " "аннотированного листинга файла, на который ссылается журнал изменений в " -"crossref:building-products[fig-change-log, Пример записи в журнале изменений]" -". Происхождение каждой строки исходного кода чётко видно. Аннотированные " -"листинги, показывающие историю каждого файла, входящего в состав FreeBSD, " -"https://svnweb.freebsd.org/[доступны в интернете]." +"crossref:building-products[fig-change-log, Пример записи в журнале " +"изменений]. Происхождение каждой строки исходного кода чётко видно. " +"Аннотированные листинги, показывающие историю каждого файла, входящего в " +"состав FreeBSD, https://svnweb.freebsd.org/[доступны в интернете]." #. type: delimited block . 4 -#: documentation/content/en/articles/building-products/_index.adoc:309 +#: documentation/content/en/articles/building-products/_index.adoc:308 #, no-wrap msgid "#REV #WHO #DATE #TEXT\n" msgstr "#REV #WHO #DATE #TEXT\n" #. type: delimited block . 4 -#: documentation/content/en/articles/building-products/_index.adoc:323 +#: documentation/content/en/articles/building-products/_index.adoc:322 #, no-wrap msgid "" "176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) #include <sys/cdefs.h>\n" @@ -1164,66 +1136,50 @@ msgid "" "176465 bde 2008-02-22 07:55:14 -0800 (Fri, 22 Feb 2008) \n" " 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) #include \"math.h\"\n" msgstr "" -"176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) #include <sys/" -"cdefs.h>\n" -"176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) __FBSDID(\"" -"$FreeBSD$\");\n" +"176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) #include <sys/cdefs.h>\n" +"176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) __FBSDID(\"$FreeBSD$\");\n" " 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) \n" -" 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) /* " -"__ieee754_rem_pio2f(x,y)\n" +" 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) /* __ieee754_rem_pio2f(x,y)\n" " 8870 rgrimes 1995-05-29 22:51:47 -0700 (Mon, 29 May 1995) *\n" -"176552 bde 2008-02-25 05:33:20 -0800 (Mon, 25 Feb 2008) * return the " -"remainder of x rem pi/2 in *y\n" -"176552 bde 2008-02-25 05:33:20 -0800 (Mon, 25 Feb 2008) * use double " -"precision for everything except passing x\n" -"152535 bde 2005-11-16 18:20:04 -0800 (Wed, 16 Nov 2005) * use " -"__kernel_rem_pio2() for large x\n" +"176552 bde 2008-02-25 05:33:20 -0800 (Mon, 25 Feb 2008) * return the remainder of x rem pi/2 in *y\n" +"176552 bde 2008-02-25 05:33:20 -0800 (Mon, 25 Feb 2008) * use double precision for everything except passing x\n" +"152535 bde 2005-11-16 18:20:04 -0800 (Wed, 16 Nov 2005) * use __kernel_rem_pio2() for large x\n" " 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) */\n" " 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) \n" -"176465 bde 2008-02-22 07:55:14 -0800 (Fri, 22 Feb 2008) #include " -"<float.h>\n" +"176465 bde 2008-02-22 07:55:14 -0800 (Fri, 22 Feb 2008) #include <float.h>\n" "176465 bde 2008-02-22 07:55:14 -0800 (Fri, 22 Feb 2008) \n" -" 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) #include " -"\"math.h\"\n" +" 2116 jkh 1994-08-19 02:40:01 -0700 (Fri, 19 Aug 1994) #include \"math.h\"\n" #. type: Block title -#: documentation/content/en/articles/building-products/_index.adoc:324 +#: documentation/content/en/articles/building-products/_index.adoc:323 #, no-wrap msgid "An annotated source listing generated using `svn blame` [[fig-svn-blame]]" -msgstr "" -"Аннотированный листинг исходного кода, сгенерированный с использованием `svn " -"blame` [[fig-svn-blame]]" +msgstr "Аннотированный листинг исходного кода, сгенерированный с использованием `svn blame` [[fig-svn-blame]]" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:327 +#: documentation/content/en/articles/building-products/_index.adoc:326 #, no-wrap msgid "*Use a gatekeeper.* Appoint a _gatekeeper_ to monitor FreeBSD development, to keep an eye out for changes that could potentially impact your products.\n" -msgstr "" -"*Используйте привратника.* Назначьте _привратника_ для отслеживания " -"разработки FreeBSD, чтобы следить за изменениями, которые могут потенциально " -"повлиять на ваши продукты.\n" +msgstr "*Используйте привратника.* Назначьте _привратника_ для отслеживания разработки FreeBSD, чтобы следить за изменениями, которые могут потенциально повлиять на ваши продукты.\n" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:330 +#: documentation/content/en/articles/building-products/_index.adoc:329 #, no-wrap msgid "" "*Report bugs upstream.* If you notice bug in the FreeBSD code that you are using, file a https://www.FreeBSD.org/support/bugreports/[bug report].\n" "This step helps ensure that you do not have to fix the bug the next time you take a code drop from upstream.\n" msgstr "" -"*Сообщайте об ошибках в вышестоящий проект.* Если вы заметили ошибку в коде " -"FreeBSD, который используете, заполните https://www.FreeBSD.org/support/" -"bugreports/[отчёт об ошибке].\n" -"Этот шаг помогает гарантировать, что вам не придётся исправлять ошибку в " -"следующий раз, когда вы получите обновление кода из вышестоящего проекта.\n" +"*Сообщайте об ошибках в вышестоящий проект.* Если вы заметили ошибку в коде FreeBSD, который используете, заполните https://www.FreeBSD.org/support/bugreports/[отчёт об ошибке].\n" +"Этот шаг помогает гарантировать, что вам не придётся исправлять ошибку в следующий раз, когда вы получите обновление кода из вышестоящего проекта.\n" #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:330 +#: documentation/content/en/articles/building-products/_index.adoc:329 #, no-wrap msgid "Leverage FreeBSD's release engineering efforts" msgstr "Используйте преимущества разработки релизов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:333 +#: documentation/content/en/articles/building-products/_index.adoc:332 msgid "" "Use code from a -STABLE development branch of FreeBSD. These development " "branches are formally supported by FreeBSD's release engineering and " @@ -1234,13 +1190,13 @@ msgstr "" "безопасности FreeBSD и содержат проверенный код." #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:334 +#: documentation/content/en/articles/building-products/_index.adoc:333 #, no-wrap msgid "Donate code to reduce costs" msgstr "Пожертвуйте код для снижения затрат" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:338 +#: documentation/content/en/articles/building-products/_index.adoc:337 msgid "" "A major proportion of the costs associated with developing products is that " "of doing maintenance. By donating non-critical code to the project, you " @@ -1256,13 +1212,13 @@ msgstr "" "производительности." #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:339 +#: documentation/content/en/articles/building-products/_index.adoc:338 #, no-wrap msgid "Get support effectively" msgstr "Получайте эффективную поддержку" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:344 +#: documentation/content/en/articles/building-products/_index.adoc:343 msgid "" "For products with tight deadlines, it is recommended that you hire or enter " "into a consulting agreement with a developer or firm with FreeBSD " @@ -1282,26 +1238,26 @@ msgstr "" "от BSD." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:348 +#: documentation/content/en/articles/building-products/_index.adoc:347 msgid "" "For less critical needs, you can ask for help on the link:https://lists." "freebsd.org/[project mailing lists]. A useful guide to follow when asking " "for help is given in crossref:building-products[Ray2004,\"How to ask " "questions the smart way\"]." msgstr "" -"Для менее критичных задач вы можете обратиться за помощью в " -"link:https://lists.freebsd.org/[списки рассылки проекта]. Полезное " -"руководство о том, как правильно задавать вопросы, приведено в crossref" -":building-products[Ray2004,\"Как правильно задавать вопросы\"]." +"Для менее критичных задач вы можете обратиться за помощью в link:https://" +"lists.freebsd.org/[списки рассылки проекта]. Полезное руководство о том, как " +"правильно задавать вопросы, приведено в crossref:building-products[Ray2004," +"\"Как правильно задавать вопросы\"]." #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:348 +#: documentation/content/en/articles/building-products/_index.adoc:347 #, no-wrap msgid "Publicize your involvement" msgstr "Распространите информацию о вашем участии" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:350 +#: documentation/content/en/articles/building-products/_index.adoc:349 msgid "" "You are not required to publicize your use of FreeBSD, but doing so helps " "both your effort as well as that of the project." @@ -1310,7 +1266,7 @@ msgstr "" "вашему делу, так и проекту." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:354 +#: documentation/content/en/articles/building-products/_index.adoc:353 msgid "" "Letting the FreeBSD community know that your company uses FreeBSD helps " "improve your chances of attracting high quality talent. A large roster of " @@ -1324,13 +1280,13 @@ msgstr "" "вашего будущего." #. type: Labeled list -#: documentation/content/en/articles/building-products/_index.adoc:354 +#: documentation/content/en/articles/building-products/_index.adoc:353 #, no-wrap msgid "Support FreeBSD developers" msgstr "Поддержите разработчиков FreeBSD" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:360 +#: documentation/content/en/articles/building-products/_index.adoc:359 msgid "" "Sometimes the most direct way to get a desired feature into FreeBSD is to " "support a developer who is already looking at a related problem. Help can " @@ -1344,13 +1300,13 @@ msgstr "" "поддержать разработчика, который уже занимается связанной проблемой. Помощь " "может варьироваться от пожертвования оборудования до прямой финансовой " "поддержки. В некоторых странах пожертвования проекту FreeBSD имеют налоговые " -"льготы. У проекта есть специальный link:https://www.FreeBSD.org/donations/[" -"представитель по пожертвованиям], который помогает донорам. Также проект " +"льготы. У проекта есть специальный link:https://www.FreeBSD.org/donations/" +"[представитель по пожертвованиям], который помогает донорам. Также проект " "поддерживает веб-страницу, где разработчики link:https://www.FreeBSD.org/" "donations/wantlist/[указывают свои потребности]." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:362 +#: documentation/content/en/articles/building-products/_index.adoc:361 msgid "" "As a policy the FreeBSD project extref:{contributors}[acknowledges] all " "contributions received on its web site." @@ -1360,13 +1316,13 @@ msgstr "" "благодарностью]." #. type: Title == -#: documentation/content/en/articles/building-products/_index.adoc:364 +#: documentation/content/en/articles/building-products/_index.adoc:363 #, no-wrap msgid "Conclusion" msgstr "Заключение" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:368 +#: documentation/content/en/articles/building-products/_index.adoc:367 msgid "" "The FreeBSD project's goals are to create and give away the source code for " "a high-quality operating system. By working with the FreeBSD project you " @@ -1379,7 +1335,7 @@ msgstr "" "различных сценариях разработки." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:372 +#: documentation/content/en/articles/building-products/_index.adoc:371 msgid "" "We examined the characteristics of the FreeBSD project that make it an " "excellent choice for being part of an organization's product strategy. We " @@ -1396,13 +1352,13 @@ msgstr "" "проектом." #. type: Title == -#: documentation/content/en/articles/building-products/_index.adoc:376 +#: documentation/content/en/articles/building-products/_index.adoc:375 #, no-wrap msgid "Bibliography" msgstr "Библиография" #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:379 +#: documentation/content/en/articles/building-products/_index.adoc:378 msgid "" "[[Carp1996]] [Carp1996] http://www.ietf.org/rfc/rfc1958.txt[The " "Architectural Principles of the Internet] B. Carpenter. The Internet " @@ -1413,7 +1369,7 @@ msgstr "" "Architecture Board.The Internet Architecture Board. Copyright(R) 1996 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:381 +#: documentation/content/en/articles/building-products/_index.adoc:380 msgid "" "[[ComGuide]] [ComGuide] extref:{committers-guide}[Committer's Guide] The " "FreeBSD Project. Copyright(R) 2005." @@ -1422,7 +1378,7 @@ msgstr "" "FreeBSD Project. Copyright(R) 2005 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:383 +#: documentation/content/en/articles/building-products/_index.adoc:382 msgid "" "[[GoldGab2005]] [GoldGab2005] http://dreamsongs.com/IHE/IHE.html[Innovation " "Happens Elsewhere: Open Source as Business Strategy] Ron Goldman. Richard " @@ -1433,7 +1389,7 @@ msgstr "" "Gabriel. Copyright(R) 2005 год. Morgan-Kaufmann." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:385 +#: documentation/content/en/articles/building-products/_index.adoc:384 msgid "" "[[Hub1994]] [Hub1994] extref:{contributing}[Contributing to the FreeBSD " "Project] Jordan Hubbard. Copyright(R) 1994-2005. The FreeBSD Project." @@ -1442,7 +1398,7 @@ msgstr "" "Project] Jordan Hubbard. Copyright(R) 1994-2005 гг. The FreeBSD Project." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:387 +#: documentation/content/en/articles/building-products/_index.adoc:386 msgid "" "[[McKu1999]] [McKu1999] http://www.usenix.org/publications/library/" "proceedings/usenix99/mckusick.html[Soft Updates: A Technique for Eliminating " @@ -1455,7 +1411,7 @@ msgstr "" "Ganger. Copyright(R) 1999 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:389 +#: documentation/content/en/articles/building-products/_index.adoc:388 msgid "" "[[McKu1999-1]] [McKu1999-1] http://www.oreilly.com/catalog/opensources/book/" "kirkmck.html[Twenty Years of Berkeley Unix: From AT&T-Owned to Freely " @@ -1470,7 +1426,7 @@ msgstr "" "Revolution] O'Reilly Inc.. Copyright(R) 1993 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:391 +#: documentation/content/en/articles/building-products/_index.adoc:390 msgid "" "[[Mon2005]] [Mon2005] extref:{bsdl-gpl}[Why you should use a BSD style " "license for your Open Source Project] Bruce Montague. The FreeBSD Project. " @@ -1481,7 +1437,7 @@ msgstr "" "Copyright(R) 2005 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:393 +#: documentation/content/en/articles/building-products/_index.adoc:392 msgid "" "[[Nik2005]] [Nik2005] extref:{dev-model}[A project model for the FreeBSD " "Project] Niklas Saers. Copyright(R) 2005. The FreeBSD Project." @@ -1490,7 +1446,7 @@ msgstr "" "Project] Niklas Saers. Copyright(R) 2005 год. The FreeBSD Project." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:395 +#: documentation/content/en/articles/building-products/_index.adoc:394 msgid "" "[[Nor1993]] [Nor1993] http://www.norvig.com/luv-slides.ps[Tutorial on Good " "Lisp Programming Style] Peter Norvig. Kent Pitman. Copyright(R) 1993." @@ -1499,7 +1455,7 @@ msgstr "" "Lisp Programming Style] Peter Norvig. Kent Pitman. Copyright(R) 1993 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:397 +#: documentation/content/en/articles/building-products/_index.adoc:396 msgid "" "[[Nor2001]] [Nor2001] http://www.norvig.com/21-days.html[Teach Yourself " "Programming in Ten Years] Peter Norvig. Copyright(R) 2001." @@ -1508,7 +1464,7 @@ msgstr "" "Programming in Ten Years] Peter Norvig. Copyright(R) 2001 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:399 +#: documentation/content/en/articles/building-products/_index.adoc:398 msgid "" "[[Ray2004]] [Ray2004] http://www.catb.org/~esr/faqs/smart-questions.html[How " "to ask questions the smart way] Eric Steven Raymond. Copyright(R) 2004." @@ -1517,7 +1473,7 @@ msgstr "" "to ask questions the smart way] Eric Steven Raymond. Copyright(R) 2004 год." #. type: Plain text -#: documentation/content/en/articles/building-products/_index.adoc:400 +#: documentation/content/en/articles/building-products/_index.adoc:399 msgid "" "[[RelEngDoc]] [RelEngDoc] extref:{releng}[FreeBSD Release Engineering] " "Murray Stokely. Copyright(R) 2001. The FreeBSD Project." diff --git a/documentation/content/ru/articles/committers-guide/_index.adoc b/documentation/content/ru/articles/committers-guide/_index.adoc index b5702862d3..0047243454 100644 --- a/documentation/content/ru/articles/committers-guide/_index.adoc +++ b/documentation/content/ru/articles/committers-guide/_index.adoc @@ -45,7 +45,7 @@ endif::[] В этом документе представлена информация для сообщества коммиттеров FreeBSD. Все новые коммиттеры должны прочитать этот документ перед началом работы, а существующим коммиттерам настоятельно рекомендуется периодически его пересматривать. -Почти все разработчики FreeBSD имеют права на коммит в один или несколько репозиториев. Однако некоторые разработчики не имеют таких прав, и часть информации здесь применима и к ним. (Например, некоторые люди имеют права только для работы с базой данных отчётов о проблемах.) Дополнительную информацию можно найти в crossref:committers-guide[non-committers, Вопросы, специфичные для разработчиков без прав на коммит]. +Почти все разработчики FreeBSD имеют права на коммит в один или несколько репозиториев. Однако некоторые разработчики не имеют таких прав, и часть информации здесь применима и к ним. (Например, некоторые люди имеют права только для работы с базой данных отчётов о проблемах.) Дополнительную информацию можно найти в разделе crossref:committers-guide[non-committers, "Вопросы, специфичные для разработчиков без прав на коммит"]. Этот документ также может быть интересен участникам сообщества FreeBSD, которые хотят узнать больше о том, как работает проект. @@ -178,7 +178,7 @@ You need a Passphrase to protect your secret key. Защитите закрытый ключ и парольную фразу. Если закрытый ключ или парольная фраза могли быть скомпрометированы или раскрыты, немедленно уведомите mailto:accounts@FreeBSD.org[accounts@FreeBSD.org] и отзовите ключ. -Фиксация нового ключа показана в crossref:committers-guide[commit-steps, Шаги для новых коммиттеров]. +Фиксация нового ключа показана в разделе crossref:committers-guide[commit-steps, Шаги для новых коммиттеров]. [[kerberos-ldap]] == Kerberos и LDAP веб-пароль для кластера FreeBSD @@ -243,10 +243,24 @@ You need a Passphrase to protect your secret key. === Политика активности коммиттеров в других деревьях +Коммиттерам доверяется использовать здравый смысл при работе вне своей основной области. Политика link:https://www.freebsd.org/ru/internal/cross-repo-commits/[Cross Repo Commit Policy] описывает общую структуру. Применяются следующие руководящие принципы: + +==== Общие рекомендации + +Эти изменения не требуют рецензирования или одобрения от коммиттера в целевом репозитории: + * Все коммиттеры могут изменять файлы [.filename]#src/share/misc/committers-*.dot#, [.filename]#src/usr.bin/calendar/calendars/calendar.freebsd# и [.filename]#ports/astro/xearth/files#. -* Документационные коммиттеры могут вносить изменения в документацию в файлы [.filename]#src#, такие как руководства, README, базы данных fortune, календарные файлы и исправления комментариев, без одобрения коммиттера src, при условии соблюдения обычных правил и внимания к коммитам. -* Любой коммиттер может вносить изменения в любое другое дерево с пометкой "Approved by" от некурируемого коммиттера с соответствующими правами. Курируемые коммиттеры (имеющие наставника) могут предоставлять пометку "Reviewed by", но не "Approved by". -* Коммиттеры могут получить дополнительный бит по обычному процессу: найти наставника, который предложит их srcmgr, doceng или portmgr, в зависимости от ситуации. После одобрения их добавят в 'access', и начнётся стандартный период наставничества, который будет включать продолжение отметки "Approved by" в течение некоторого времени. +* Все коммиттеры могут вносить изменения в документацию в файлы [.filename]#src#, такие как руководства, README, базы данных fortune, календарные файлы и исправления комментариев, при условии соблюдения обычных правил и внимания к коммитам. +* Очевидные тривиальные исправления — опечатки, битые ссылки и аналогичные простые правки — коммит может быть сделан любым коммиттером в любом репозитории (см. также <<doc-blanket-approval>>). +* Когда вы недавно сделали изменение, которое сломало сборку, и это изменение тривиально исправить, хотя откат и полное повторное рецензирование обычно лучше для всего, что не является тривиальным. + +==== Неочевидные изменения + +Для изменений, выходящих за рамки описанных здесь, коммиттеры должны запрашивать рецензирование у коммиттеров с соответствующими правами в целевом репозитории. При сомнениях запрашивайте рецензирование, даже если у вас есть права на коммит в этом репозитории. Всегда проверяйте сборку и тестовый запуск или читайте файлы, затронутые изменением. + +==== Получение дополнительных прав на внесение изменений + +Коммиттеры могут получить дополнительный бит по обычному процессу: найти наставника, который предложит их srcmgr, doceng или portmgr, в зависимости от ситуации. [[doc-blanket-approval]] ==== Неявное (по умолчанию) одобрение для документации @@ -421,9 +435,9 @@ FreeBSD-CURRENT использует ветку `main`. `main` — это ветка по умолчанию. -Для FreeBSD-STABLE названия веток включают `stable/12` и `stable/13`. +Для FreeBSD-STABLE названия веток включают `stable/{rel-latest-major}` и `stable/{rel-legacy-major}`. -Для FreeBSD-RELEASE, названия веток разработки выпусков включают `releng/12.4` и `releng/13.2`. +Для FreeBSD-RELEASE, названия веток разработки выпусков включают `releng/{rel-latest}` и `releng/{rel-legacy}`. https://www.freebsd.org/releng/[] отображает: @@ -432,8 +446,8 @@ https://www.freebsd.org/releng/[] отображает: Примеры: -* тег https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1] -* тег https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2]. +* тег https://cgit.freebsd.org/src/tag/?h=release/{rel-latest}.0[release/{rel-latest}.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/{rel-latest}[releng/{rel-latest}] +* тег https://cgit.freebsd.org/src/tag/?h=release/{rel-legacy}.0[release/{rel-legacy}.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/{rel-legacy}[releng/{rel-legacy}]. ===== Репозитории Пожалуйста, обратитесь к разделу crossref:committers-guide[admin,Административные детали] для получения актуальной информации о том, где взять исходные коды FreeBSD. Значение $URL ниже можно получить с этой страницы. @@ -742,21 +756,21 @@ Could not apply 646e0f9cda11... no color ls Для более подробного ознакомления с этой темой, см. довольно обширное руководство по адресу: https://www.freecodecamp.org/news/the-ultimate-guide-to-git-merge-and-git-rebase/. Этот ресурс будет полезен для решения проблем, которые возникают нечасто, но слишком специфичны для данного руководства. ===== Переключение на другую ветку FreeBSD -Если вы хотите перейти с ветки stable/12 на ветку current и у вас есть полный клон репозитория, будет достаточно выполнить следующую команду: +Если вы хотите перейти с ветки stable/{rel-latest-major} на ветку current и у вас есть полный клон репозитория, будет достаточно выполнить следующую команду: [source, shell] .... % git checkout main % # build and install here... .... -Однако, если у вас есть локальная ветка, есть несколько важных замечаний. Во-первых, перебазирование переписывает историю, поэтому вам, скорее всего, захочется сохранить её каким-либо образом. Во-вторых, переключение между ветками часто вызывает больше конфликтов. Если предположить, что приведённый выше пример относился к ветке stable/12, то для перехода на ветку `main` я бы рекомендовал следующее: -[source, shell] +Однако, если у вас есть локальная ветка, есть несколько важных замечаний. Во-первых, перебазирование переписывает историю, поэтому вам, скорее всего, захочется сохранить её каким-либо образом. Во-вторых, переключение между ветками часто вызывает больше конфликтов. Если предположить, что приведённый выше пример относился к ветке stable/{rel-latest-major}, то для перехода на ветку `main` я бы рекомендовал следующее: +[source, shell, subs=attributes] .... % git checkout no-color-ls -% git checkout -b no-color-ls-stable-12 # create another name for this branch -% git rebase -i stable/12 no-color-ls --onto main +% git checkout -b no-color-ls-stable-{rel-latest-major} # create another name for this branch +% git rebase -i stable/{rel-latest-major} no-color-ls --onto main .... -Что делает вышеописанное: извлекается ветка no-color-ls. Затем для неё создаётся новое имя (no-color-ls-stable-12) на случай, если потребуется вернуться к ней. После этого выполняется перебазирование на ветку `main`. Это позволит найти все коммиты в текущей ветке no-color-ls (вплоть до точки её ответвления от stable/12) и затем воспроизвести их на ветке `main`, создав там новую ветку no-color-ls (поэтому я и попросил вас создать резервное имя). +Что делает вышеописанное: извлекается ветка no-color-ls. Затем для неё создаётся новое имя (no-color-ls-stable-{rel-latest-major}) на случай, если потребуется вернуться к ней. После этого выполняется перебазирование на ветку `main`. Это позволит найти все коммиты в текущей ветке no-color-ls (вплоть до точки её ответвления от stable/{rel-latest-major}) и затем воспроизвести их на ветке `main`, создав там новую ветку no-color-ls (поэтому я и попросил вас создать резервное имя). [[mfc-with-git]] === Процедуры MFC (Merge From Current) @@ -766,17 +780,17 @@ Could not apply 646e0f9cda11... no color ls ==== Одиночный коммит MFC -[source, shell] +[source, shell, subs=attributes] .... -% git checkout stable/X +% git checkout stable/{rel-latest-major} % git cherry-pick -x $HASH --edit .... Для коммитов MFC, например, импорта от вендора, вам потребуется указать одного родителя для целей выборочного применения (cherry-pick). Обычно это будет «первый родитель» ветки, из которой вы применяете изменения, то есть: -[source, shell] +[source, shell, subs=attributes] .... -% git checkout stable/X +% git checkout stable/{rel-latest-major} % git cherry-pick -x $HASH -m 1 --edit .... @@ -793,9 +807,9 @@ MFC в ветки, требующие одобрения, требуют нем * Оставляйте обе строки "cherry picked from" в сообщении коммита. * Обязательно добавьте строку `Approved by:` при работе в редакторе. -[source, shell] +[source, shell, subs=attributes] .... -% git checkout releng/13.0 +% git checkout releng/{rel-latest-next} % git cherry-pick -x $HASH --edit .... @@ -854,9 +868,9 @@ MFC в ветки, требующие одобрения, требуют нем ==== Переделка MFC Если вы делаете MFC, и всё идёт ужасно неправильно, и вы хотите начать сначала, то самый простой способ — использовать `git reset --hard`, как показано ниже: -[source, shell] +[source, shell, subs=attributes] .... -% git reset --hard freebsd/stable/12 +% git reset --hard freebsd/stable/{rel-latest-major} .... хотя если у вас есть некоторые ревизии, которые вы хотите сохранить, а другие — нет, использование `git rebase -i` предпочтительнее. @@ -864,7 +878,7 @@ MFC в ветки, требующие одобрения, требуют нем При внесении исходных коммитов в стабильные и релизные ветки мы преследуем следующие цели: -* Четко обозначить прямые коммиты, отличая их от коммитов, вносящих изменения из другой ветки. +* Чётко обозначить прямые коммиты, отличая их от коммитов, вносящих изменения из другой ветки. * Избегать внесения известных нарушений в стабильные ветки и ветки выпуска релизов (releng). * Позволить разработчикам определять, какие изменения были или не были перенесены из одной ветки в другую. @@ -895,7 +909,7 @@ Git предоставляет встроенную поддержку этог Одной из областей, которая не была чётко задокументирована в Subversion (и даже в CVS), является форматирование метаданных в сообщениях журнала для коммитов MFC. Должны ли они включать метаданные из исходного коммита без изменений или должны быть изменены для отражения информации о самом коммите MFC? -Исторически практика различалась, хотя некоторые различия зависят от области. Например, MFC, относящиеся к PR, обычно включают поле PR в MFC, чтобы коммиты MFC включались в аудит-трекер системы отслеживания ошибок. В других областях ситуация менее ясна. Например, Phabricator показывает разницу последнего коммита, помеченного для обзора, поэтому включение URL-адресов Phabricator заменяет основной коммит на завершенные коммиты. Список рецензентов также неясен. Если рецензент одобрил изменение для `main`, означает ли это, что он одобрил коммит MFC? Верно ли это только для идентичного кода или лишь с незначительной доработкой? Очевидно, это неверно для более масштабных доработок. Даже для идентичного кода: что, если коммит не конфликтует, но вносит изменение ABI? Рецензент мог одобрить коммит для `main` из-за нарушения ABI, но может не одобрить слияние того же коммита в неизменном виде. Придется полагаться на собственное наилучшее суждение до тех пор, пока не будут согласованы четкие руководящие принципы. +Исторически практика различалась, хотя некоторые различия зависят от области. Например, MFC, относящиеся к PR, обычно включают поле PR в MFC, чтобы коммиты MFC включались в аудит-трекер системы отслеживания ошибок. В других областях ситуация менее ясна. Например, Phabricator показывает разницу последнего коммита, помеченного для обзора, поэтому включение URL-адресов Phabricator заменяет основной коммит на завершённые коммиты. Список рецензентов также неясен. Если рецензент одобрил изменение для `main`, означает ли это, что он одобрил коммит MFC? Верно ли это только для идентичного кода или лишь с незначительной доработкой? Очевидно, это неверно для более масштабных доработок. Даже для идентичного кода: что, если коммит не конфликтует, но вносит изменение ABI? Рецензент мог одобрить коммит для `main` из-за нарушения ABI, но может не одобрить слияние того же коммита в неизменном виде. Придется полагаться на собственное наилучшее суждение до тех пор, пока не будут согласованы чёткие руководящие принципы. Для MFC, регулируемых re@, добавляются новые поля метаданных, такие как тег Approved by для одобренных коммитов. Эти новые метаданные должны быть добавлены через `git commit --amend` или аналогичные средства после того, как исходный коммит будет проверен и одобрен. Мы также можем захотеть зарезервировать некоторые поля метаданных в коммитах MFC, такие как URL-адреса Phabricator, для использования re@ в будущем. @@ -2046,7 +2060,7 @@ example@freebsd.org:smtp.freebsd.org::587 Для коммиттеров: не коммитьте ничего без предварительного одобрения ментора. Задокументируйте это одобрение строкой `Approved by:` в сообщении коммита. -Когда наставник решает, что подопечный освоил основы и готов к самостоятельной фиксации изменений, наставник объявляет об этом, выполняя коммит в [.filename]#mentors#. Этот файл находится в сиротской ветке [.filename]#admin# каждого репозитория. Подробная информация о том, как получить доступ к этим веткам, доступна в crossref:committers-guide[admin-branch, ветке "admin"]. +Когда наставник решает, что подопечный освоил основы и готов к самостоятельной фиксации изменений, наставник объявляет об этом, выполняя коммит в [.filename]#mentors#. Этот файл находится в сиротской ветке [.filename]#admin# каждого репозитория. Подробная информация о том, как получить доступ к этим веткам, доступна в crossref:committers-guide[admin-branch, ветке `admin`]. [[pre-commit-review]] == Предварительная проверка перед коммитом @@ -2231,7 +2245,7 @@ a| * когда новый коммиттер находится под наставничеством * коммиты в область дерева, указанную в файле LOCKS (src) * во время цикла выпуска -* коммиты в репозиторий, где у вас нет права на коммит (например, коммиттер src делает коммит в docs) +* коммиты нетривиальных изменений в репозиторий, где у вас нет права на коммит (например, коммиттер src делает коммит в docs); для тривиальных изменений достаточно `Reviewed by:`. * коммиты в порт, поддерживаемый кем-то другим Во время наставничества получите одобрение наставника перед коммитом. Укажите имя пользователя наставника в этом поле и отметьте, что он является наставником: @@ -2405,9 +2419,9 @@ Relnotes: yes [[pref-license]] == Предпочтительная лицензия для новых файлов -Полная политика лицензирования проекта FreeBSD доступна по ссылке link:https://www.FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/software-license]. Остальная часть этого раздела предназначена для того, чтобы помочь вам начать работу. Как правило, если сомневаетесь — спрашивайте. Дать совет гораздо проще, чем исправлять дерево исходного кода. +Полная политика лицензирования проекта FreeBSD документирована в статье extref:{license-guide}[Лицензионные политики FreeBSD]. Остальная часть этого раздела предназначена для того, чтобы помочь вам начать работу. Как правило, если сомневаетесь — спрашивайте. Дать совет гораздо проще, чем исправлять дерево исходного кода. -Проект FreeBSD предлагает и использует следующий текст в качестве предпочтительной схемы лицензирования: +Маркировка только кодом SPDX строго предпочтительна. Проект FreeBSD использует следующий текст в качестве предпочтительной лицензии: [.programlisting] .... @@ -2415,13 +2429,12 @@ Relnotes: yes * Copyright (c) [year] [your name] * * SPDX-License-Identifier: BSD-2-Clause - * */ .... -Проект FreeBSD настоятельно не рекомендует использовать так называемую «рекламную оговорку» в новом коде. Из-за большого числа участников проекта FreeBSD соблюдение этой оговорки стало затруднительным для многих коммерческих вендоров. Если ваш код в дереве содержит рекламную оговорку, пожалуйста, рассмотрите возможность её удаления. Более того, пожалуйста, рассмотрите возможность использования вышеуказанной лицензии для вашего кода. +Предпочтительный порядок — сначала уведомление об авторских правах, затем SPDX-License-Identifier, но любой порядок допустим. Новые материалы для FreeBSD должны использовать лицензию BSD-2-Clause. Проект FreeBSD не допускает «рекламную оговорку» в новом коде. Если у вас есть код в дереве с рекламной оговоркой, пожалуйста, рассмотрите возможность перехода на лицензию без неё. -Проект FreeBSD не приветствует полностью новые лицензии и вариации стандартных лицензий. Новые лицензии требуют одобрения {core-email} для размещения в репозитории `src`. Чем больше различных лицензий используется в дереве, тем больше проблем это создаёт для тех, кто желает использовать этот код, обычно из-за непредвиденных последствий плохо сформулированной лицензии. +Проект FreeBSD не рекомендует полностью новые лицензии и вариации стандартных лицензий. Новые лицензии требуют одобрения {core-email}. Политика проекта требует, чтобы код под некоторыми не-BSD лицензиями размещался только в определённых разделах репозитория, а в некоторых случаях компиляция должна быть условной или даже отключена по умолчанию. Например, ядро GENERIC должно компилироваться только под лицензиями, идентичными или существенно схожими с лицензией BSD. Программное обеспечение под лицензиями GPL, APSL, CDDL и т.п. не должно компилироваться в GENERIC. @@ -2448,9 +2461,7 @@ Relnotes: yes [[spdx.tags]] == Теги SPDX в дереве -Проект использует теги https://spdx.dev[SPDX] в нашей исходной базе. На данный момент эти теги выделены отступами, чтобы автоматизированные средства могли программно извлекать лицензионные условия. Все теги _SPDX-License-Identifier_ в дереве следует считать информативными. Все файлы в дереве исходных кодов FreeBSD с этими тегами также содержат копию лицензии, регулирующей использование данного файла. Если возникает противоречие, руководствоваться следует дословным текстом лицензии. Проект старается следовать https://spdx.github.io/spdx-spec/v2.2.2/[Спецификации SPDX, версия 2.2]. Инструкцию, как помечать исходные файлы, и допустимые алгебраические выражения можно найти в https://spdx.github.io/spdx-spec/v2.2.2/SPDX-license-expressions/[Приложении D] и https://spdx.github.io/spdx-spec/v2.2.2/using-SPDX-short-identifiers-in-source-files/[Приложении E]. Проект берет идентификаторы из списка допустимых https://spdx.org/licenses/[кратких лицензионных идентификаторов] SPDX. Проект использует только тег _SPDX-License-Identifier_. - -По состоянию на март 2021 года примерно 25 000 из 90 000 файлов в дереве были помечены. +Проект использует теги https://spdx.dev[SPDX] в нашей базе исходного кода. Разметка исключительно на основе SPDX (без воспроизведения полного текста лицензии) настоятельно рекомендуется для новых файлов. Когда файл содержит только уведомление об авторских правах и тег SPDX-License-Identifier, тег SPDX определяет лицензию для этого файла. Когда файл содержит как тег SPDX-License-Identifier, так и полный дословный текст лицензии, тег SPDX носит информативный характер, а дословный текст лицензии имеет преимущественную силу в случае расхождений. Проект использует идентификаторы из списка допустимых https://spdx.org/licenses/[кратких идентификаторов лицензий] SPDX и применяет только тег _SPDX-License-Identifier_. Смотрите статью extref:{license-guide}[FreeBSD License Policies] для полной спецификации того, как выражения SPDX используются в коллекции программного обеспечения FreeBSD. [[developer.relations]] == Отношения с разработчиками @@ -2507,7 +2518,7 @@ Relnotes: yes ==== . Войдите, используя старую учётную запись. . Открыть новую ошибку. Выбрать `Services` в качестве продукта и `Bug Tracker` в качестве компонента. В описании ошибки перечислите аккаунты, которые нужно объединить. -. Войдите, используя учётную запись `FreeBSD.org`, и оставьте комментарий к только что созданной ошибке, чтобы подтвердить владение. Дополнительные сведения о том, как сгенерировать или установить пароль для вашей учётной записи `FreeBSD.org`, см. в crossref:committers-guide[kerberos-ldap, Kerberos и LDAP веб-пароль для кластера FreeBSD]. +. Войдите, используя учётную запись `FreeBSD.org`, и оставьте комментарий к только что созданной ошибке, чтобы подтвердить владение. Дополнительные сведения о том, как сгенерировать или установить пароль для вашей учётной записи `FreeBSD.org`, см. в разделе crossref:committers-guide[kerberos-ldap, Kerberos и LDAP веб-пароль для кластера FreeBSD]. . Если необходимо объединить более двух учётных записей, оставьте комментарии от каждой из них. ==== @@ -2775,7 +2786,7 @@ FreeBSD — это _открытый_ проект. Это означает, ч [[archs]] == Поддержка множественных архитектур -FreeBSD — это высокопортативная операционная система, предназначенная для работы на множестве различных типов аппаратных архитектур. Поддержание четкого разделения между машинозависимым (MD) и машинонезависимым (MI) кодом, а также минимизация MD-кода являются важной частью нашей стратегии по сохранению гибкости в отношении текущих тенденций в аппаратном обеспечении. Каждая новая аппаратная архитектура, поддерживаемая FreeBSD, существенно увеличивает затраты на поддержку кода, инструментальных средств и управление выпусками. Это также значительно повышает стоимость эффективного тестирования изменений в ядре. Таким образом, существует серьезная мотивация для разграничения уровней поддержки различных архитектур, оставаясь при этом сильными в нескольких ключевых архитектурах, которые рассматриваются как «целевая аудитория» FreeBSD. +FreeBSD — это высокопортативная операционная система, предназначенная для работы на множестве различных типов аппаратных архитектур. Поддержание чёткого разделения между машинозависимым (MD) и машинонезависимым (MI) кодом, а также минимизация MD-кода являются важной частью нашей стратегии по сохранению гибкости в отношении текущих тенденций в аппаратном обеспечении. Каждая новая аппаратная архитектура, поддерживаемая FreeBSD, существенно увеличивает затраты на поддержку кода, инструментальных средств и управление выпусками. Это также значительно повышает стоимость эффективного тестирования изменений в ядре. Таким образом, существует серьезная мотивация для разграничения уровней поддержки различных архитектур, оставаясь при этом сильными в нескольких ключевых архитектурах, которые рассматриваются как «целевая аудитория» FreeBSD. === Заявление об общих намерениях @@ -2808,7 +2819,7 @@ FreeBSD — это высокопортативная операционная * Официальные бинарные пакеты для стороннего программного обеспечения будут предоставлены командой портов. Для встраиваемых архитектур эти пакеты могут быть кросс-собранными на архитектуре другого типа. * Наиболее подходящие порты должны либо собираться, либо иметь соответствующие фильтры, чтобы предотвратить сборку неподходящих. * Новые функции, которые не являются специфичными для платформы, будут полностью работоспособны на всех архитектурах Уровня 1. -* Функции и прослойки совместимости, используемые программами, скомпилированными для старых стабильных веток, могут быть удалены в новых основных версиях. Такие изменения будут четко документированы в примечаниях к выпуску. +* Функции и прослойки совместимости, используемые программами, скомпилированными для старых стабильных веток, могут быть удалены в новых основных версиях. Такие изменения будут чётко документированы в примечаниях к выпуску. * Уровень 1 платформ должен быть полностью документирован. Основные операции будут описаны в Руководстве FreeBSD. * Уровень 1 платформ будет включен в дерево исходных кодов. * Платформы Уровня 1 должны быть самодостаточными, используя либо встроенный инструментарий, либо внешний инструментарий. Если требуется внешний инструментарий, будут предоставлены официальные бинарные пакеты для него. @@ -2825,7 +2836,7 @@ FreeBSD — это высокопортативная операционная * Уровень 1 архитектур должен обладать зрелой, здоровой экосистемой пользователей и активных разработчиков. * Разработчики должны иметь возможность собирать пакеты на широко доступных, невстраиваемых системах Уровня 1. Это может означать как нативные сборки, если невстраиваемые системы широко доступны для рассматриваемой платформы, так и кросс-сборки, выполняемые на другой архитектуре Уровня 1. * Изменения не должны нарушать ABI пользовательского пространства. Если изменение ABI необходимо, совместимость ABI для существующих бинарных файлов должна обеспечиваться с помощью версионирования символов или увеличения версий разделяемых библиотек. -* Изменения, которым сделано слияние в стабильные ветки, не должны нарушать защищенные части ABI ядра. Если требуется изменение ABI ядра, изменение должно быть модифицировано для сохранения функциональности существующих модулей ядра. +* Изменения, которым сделано слияние в стабильные ветки, не должны нарушать защищённые части ABI ядра. Если требуется изменение ABI ядра, изменение должно быть модифицировано для сохранения функциональности существующих модулей ядра. ==== Уровень 2: Развивающиеся и нишевые архитектуры @@ -2895,7 +2906,7 @@ FreeBSD — это высокопортативная операционная .... [TIP] ==== -Не забудьте crossref:committers-guide[port-commit-message-formats,настроить git-хуки для дерева портов, как описано здесь]; специальный хук был разработан для проверки [.filename]#Makefile# каждой категории. +Не забудьте crossref:committers-guide[port-commit-message-formats,"настроить git-хуки для дерева портов, как описано здесь"]; специальный хук был разработан для проверки [.filename]#Makefile# каждой категории. ==== [[ports-qa-add-new-extra]] @@ -3141,14 +3152,11 @@ FreeBSD — это высокопортативная операционная * crossref:committers-guide[rules, Большой список правил коммиттеров FreeBSD] [[google-analytics]] -== Информация о Google Analytics +== Информация об аналитике вебсайтов -По состоянию на 12 декабря 2012 года на сайте проекта FreeBSD был включен Google Analytics для сбора анонимной статистики использования сайта. +Вебсайт Проекта использует https://plausible.io/[Plausible Analytics] для сбора анонимной статистики использования сайта с 2022 года. -[NOTE] -==== -По состоянию на 3 марта 2022 года Google Analytics был удалён из проекта FreeBSD. -==== +Ранее, Google Analytics был включен с 12 декабря 2012 года по 3 марта 2022 года. [[misc]] == Разные вопросы @@ -3173,11 +3181,6 @@ FreeBSD — это высокопортативная операционная Признание в качестве квалифицированного инженера-программиста — это самая долговечная ценность. Кроме того, возможность работать с одними из лучших специалистов, о встрече с которыми мечтает любой инженер, — это отличный бонус! -[[benefits-freebsdmall]] -=== FreeBSD Mall - -Коммиттеры FreeBSD могут бесплатно получить набор из 4 CD или DVD на конференциях через http://www.freebsdmall.com[FreeBSD Mall, Inc.]. - [[benefits-gandi]] === `Gandi.net` @@ -3191,3 +3194,12 @@ Gandi предоставляет скидку E-rate всем разработч https://rsync.net[rsync.net] предоставляет облачное хранилище для резервного копирования вне офиса, оптимизированное для пользователей UNIX. Их сервис полностью работает на FreeBSD и ZFS. rsync.net предоставляет бесплатный аккаунт на 500 ГБ навсегда разработчикам FreeBSD. Просто зарегистрируйтесь по адресу https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd.html], используя ваш адрес `@freebsd.org`, чтобы получить этот бесплатный аккаунт. + +[[benefits-watchgoose]] +=== `Watchgoose` + +<a href="https://watchgoose.com/">Watchgoose</a> предоставляет размещённый мониторинг для задач cron и резервных копий, а также других запланированных и повторяющихся задач, которые могут отправлять сигнал о начале или завершении. + +Коммиттеры FreeBSD имеют право на бесплатный платный план, соответствующий их потребностям в мониторинге. Чтобы запросить доступ, создайте учетную запись на Watchgoose.com и отправьте письмо на mailto:support@watchgoose.com[support@watchgoose.com] с адреса в домене `@freebsd.org`, указав адрес электронной почты (из домена FreeBSD.org), использованный для учетной записи Watchgoose. + +См. https://watchgoose.com/open-source/[программу поддержки открытого исходного кода Watchgoose] для получения дополнительной информации. diff --git a/documentation/content/ru/articles/committers-guide/_index.po b/documentation/content/ru/articles/committers-guide/_index.po index cda5ef1e36..3c8496febc 100644 --- a/documentation/content/ru/articles/committers-guide/_index.po +++ b/documentation/content/ru/articles/committers-guide/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2026-05-09 23:29+0100\n" -"PO-Revision-Date: 2026-05-11 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-08-11 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlescommitters-guide_index/ru/>\n" @@ -32,12 +32,12 @@ msgid "Committer's Guide" msgstr "Руководство коммиттера" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:45 +#: documentation/content/en/articles/committers-guide/_index.adoc:44 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:48 +#: documentation/content/en/articles/committers-guide/_index.adoc:47 msgid "" "This document provides information for the FreeBSD committer community. All " "new committers should read this document before they start, and existing " @@ -49,7 +49,7 @@ msgstr "" "пересматривать." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:53 +#: documentation/content/en/articles/committers-guide/_index.adoc:52 msgid "" "Almost all FreeBSD developers have commit rights to one or more " "repositories. However, a few developers do not, and some of the information " @@ -62,11 +62,11 @@ msgstr "" "репозиториев. Однако некоторые разработчики не имеют таких прав, и часть " "информации здесь применима и к ним. (Например, некоторые люди имеют права " "только для работы с базой данных отчётов о проблемах.) Дополнительную " -"информацию можно найти в crossref:committers-guide[non-committers, Вопросы, " -"специфичные для разработчиков без прав на коммит]." +"информацию можно найти в разделе crossref:committers-guide[non-committers, " +"\"Вопросы, специфичные для разработчиков без прав на коммит\"]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:55 +#: documentation/content/en/articles/committers-guide/_index.adoc:54 msgid "" "This document may also be of interest to members of the FreeBSD community " "who want to learn more about how the project works." @@ -75,150 +75,150 @@ msgstr "" "которые хотят узнать больше о том, как работает проект." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:57 +#: documentation/content/en/articles/committers-guide/_index.adoc:56 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:61 +#: documentation/content/en/articles/committers-guide/_index.adoc:60 #, no-wrap msgid "Administrative Details" msgstr "Административные детали" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:68 +#: documentation/content/en/articles/committers-guide/_index.adoc:67 #, no-wrap msgid "_Login Methods_" msgstr "_Способ логина_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:70 +#: documentation/content/en/articles/committers-guide/_index.adoc:69 #, no-wrap msgid "man:ssh[1], protocol 2 only" msgstr "man:ssh[1], только протокол версии 2" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:71 +#: documentation/content/en/articles/committers-guide/_index.adoc:70 #, no-wrap msgid "_Main Shell Host_" msgstr "_Главный хост для входа в оболочку_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:73 +#: documentation/content/en/articles/committers-guide/_index.adoc:72 #, no-wrap msgid "`freefall.FreeBSD.org`" msgstr "`freefall.FreeBSD.org`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:74 +#: documentation/content/en/articles/committers-guide/_index.adoc:73 #, no-wrap msgid "_Reference Machines_" msgstr "_Референсные машины_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:76 +#: documentation/content/en/articles/committers-guide/_index.adoc:75 #, no-wrap msgid "`ref*.FreeBSD.org`, `universe*.freeBSD.org` (see also link:https://www.FreeBSD.org/internal/machines/[FreeBSD Project Hosts])" msgstr "`ref*.FreeBSD.org`, `universe*.freeBSD.org` (см. также ссылку link:https://www.FreeBSD.org/internal/machines/[Хосты проекта FreeBSD])" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:77 +#: documentation/content/en/articles/committers-guide/_index.adoc:76 #, no-wrap msgid "_SMTP Host_" msgstr "_Узел SMTP_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:79 +#: documentation/content/en/articles/committers-guide/_index.adoc:78 #, no-wrap msgid "`smtp.FreeBSD.org:587` (see also crossref:committers-guide[smtp-setup, SMTP Access Setup])." msgstr "`smtp.FreeBSD.org:587` (см. также crossref:committers-guide[smtp-setup, Настройка доступа SMTP])." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:80 +#: documentation/content/en/articles/committers-guide/_index.adoc:79 #, no-wrap msgid "`_src/_` Git Repository" msgstr "`_src/_` Git-репозиторий" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:82 +#: documentation/content/en/articles/committers-guide/_index.adoc:81 #, no-wrap msgid "`ssh://git@gitrepo.FreeBSD.org/src.git`" msgstr "`ssh://git@gitrepo.FreeBSD.org/src.git`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:83 +#: documentation/content/en/articles/committers-guide/_index.adoc:82 #, no-wrap msgid "`_doc/_` Git Repository" msgstr "`_doc/_` Git-репозиторий" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:85 +#: documentation/content/en/articles/committers-guide/_index.adoc:84 #, no-wrap msgid "`ssh://git@gitrepo.FreeBSD.org/doc.git`" msgstr "`ssh://git@gitrepo.FreeBSD.org/doc.git`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:86 +#: documentation/content/en/articles/committers-guide/_index.adoc:85 #, no-wrap msgid "`_ports/_` Git Repository" msgstr "`_ports/_` Git-репозиторий" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:88 +#: documentation/content/en/articles/committers-guide/_index.adoc:87 #, no-wrap msgid "`ssh://git@gitrepo.FreeBSD.org/ports.git`" msgstr "`ssh://git@gitrepo.FreeBSD.org/ports.git`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:89 +#: documentation/content/en/articles/committers-guide/_index.adoc:88 #, no-wrap msgid "_Internal Mailing Lists_" msgstr "_Внутренние списки рассылки_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:91 +#: documentation/content/en/articles/committers-guide/_index.adoc:90 #, no-wrap msgid "developers (technically called all-developers), doc-developers, doc-committers, ports-developers, ports-committers, src-developers, src-committers. (Each project repository has its own -developers and -committers mailing lists. Archives for these lists can be found in the files [.filename]#/local/mail/repository-name-developers-archive# and [.filename]#/local/mail/repository-name-committers-archive# on `freefall.FreeBSD.org`.)" msgstr "developers (технически называемый all-developers), doc-developers, doc-committers, ports-developers, ports-committers, src-developers, src-committers. (Каждый репозиторий проекта имеет свои собственные списки рассылки -developers и -committers. Архивы этих списков можно найти в файлах [.filename]#/local/mail/repository-name-developers-archive# и [.filename]#/local/mail/repository-name-committers-archive# на `freefall.FreeBSD.org`.)" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:92 +#: documentation/content/en/articles/committers-guide/_index.adoc:91 #, no-wrap msgid "_Core Team monthly reports_" msgstr "_Ежемесячные отчёты основной команды (Core Team)_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:94 +#: documentation/content/en/articles/committers-guide/_index.adoc:93 #, no-wrap msgid "[.filename]#/home/core/public/reports# on the `FreeBSD.org` cluster." msgstr "[.filename]#/home/core/public/reports# на кластере `FreeBSD.org`." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:95 +#: documentation/content/en/articles/committers-guide/_index.adoc:94 #, no-wrap msgid "_Ports Management Team monthly reports_" msgstr "_Ежемесячные отчёты команды управления портами_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:97 +#: documentation/content/en/articles/committers-guide/_index.adoc:96 #, no-wrap msgid "[.filename]#/home/portmgr/public/monthly-reports# on the `FreeBSD.org` cluster." msgstr "[.filename]#/home/portmgr/public/monthly-reports# в кластере `FreeBSD.org`." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:98 +#: documentation/content/en/articles/committers-guide/_index.adoc:97 #, no-wrap msgid "_Noteworthy `src/` Git Branches:_" msgstr "_Важные ветки Git в `src/`:_" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:99 +#: documentation/content/en/articles/committers-guide/_index.adoc:98 #, no-wrap msgid "`stable/n` (`n`-STABLE), `main` (-CURRENT)" msgstr "`stable/n` (`n`-STABLE), `main` (-CURRENT)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:103 +#: documentation/content/en/articles/committers-guide/_index.adoc:102 #, no-wrap msgid "" "man:ssh[1] is required to connect to the project hosts. For more information,\n" @@ -228,23 +228,23 @@ msgstr "" "можно найти в crossref:committers-guide[ssh.guide, Руководстве по быстрому началу работы с SSH].\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:105 +#: documentation/content/en/articles/committers-guide/_index.adoc:104 msgid "Useful links:" msgstr "Полезные ссылки:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:107 +#: documentation/content/en/articles/committers-guide/_index.adoc:106 msgid "link:https://www.FreeBSD.org/internal/[FreeBSD Project Internal Pages]" msgstr "" "link:https://www.FreeBSD.org/internal/[Внутренние страницы проекта FreeBSD]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:108 +#: documentation/content/en/articles/committers-guide/_index.adoc:107 msgid "link:https://www.FreeBSD.org/internal/machines/[FreeBSD Project Hosts]" msgstr "link:https://www.FreeBSD.org/internal/machines/[Узлы проекта FreeBSD]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:109 +#: documentation/content/en/articles/committers-guide/_index.adoc:108 msgid "" "link:https://www.FreeBSD.org/administration/[FreeBSD Project Administrative " "Groups]" @@ -253,13 +253,13 @@ msgstr "" "FreeBSD]" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:111 +#: documentation/content/en/articles/committers-guide/_index.adoc:110 #, no-wrap msgid "OpenPGP Keys for FreeBSD" msgstr "Ключи OpenPGP для FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:116 +#: documentation/content/en/articles/committers-guide/_index.adoc:115 msgid "" "Cryptographic keys conforming to the OpenPGP (__Pretty Good Privacy__) " "standard are used by the FreeBSD project to authenticate committers. " @@ -279,13 +279,13 @@ msgstr "" "Pretty_Good_Privacy[]." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:118 +#: documentation/content/en/articles/committers-guide/_index.adoc:117 #, no-wrap msgid "Creating a Key" msgstr "Создание ключа" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:122 +#: documentation/content/en/articles/committers-guide/_index.adoc:121 msgid "" "Existing keys can be used, but should be checked with [." "filename]#documentation/tools/checkkey.sh# first. In this case, make sure " @@ -296,7 +296,7 @@ msgstr "" "убедитесь, что у ключа есть FreeBSD user ID." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:124 +#: documentation/content/en/articles/committers-guide/_index.adoc:123 msgid "" "For those who do not yet have an OpenPGP key, or need a new key to meet " "FreeBSD security requirements, here we show how to generate one." @@ -306,7 +306,7 @@ msgstr "" "сгенерировать." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:129 +#: documentation/content/en/articles/committers-guide/_index.adoc:128 msgid "" "Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/." "gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key " @@ -320,7 +320,7 @@ msgstr "" "опциям GnuPG]):" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:136 +#: documentation/content/en/articles/committers-guide/_index.adoc:135 #, no-wrap msgid "" "# Sorted list of preferred algorithms for signing (strongest to weakest).\n" @@ -334,12 +334,12 @@ msgstr "" "default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BZIP2 ZLIB ZIP Uncompressed\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:138 +#: documentation/content/en/articles/committers-guide/_index.adoc:137 msgid "Generate a key:" msgstr "Сгенерировать ключ:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:145 +#: documentation/content/en/articles/committers-guide/_index.adoc:144 #, no-wrap msgid "" "% gpg --full-gen-key\n" @@ -353,7 +353,7 @@ msgstr "" "There is NO WARRANTY, to the extent permitted by law.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:166 +#: documentation/content/en/articles/committers-guide/_index.adoc:165 #, no-wrap msgid "" "Warning: using insecure memory!\n" @@ -399,7 +399,7 @@ msgstr "" "GnuPG needs to construct a user ID to identify your key.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:172 +#: documentation/content/en/articles/committers-guide/_index.adoc:171 #, no-wrap msgid "" "Real name: Chucky Daemon <.>\n" @@ -415,7 +415,7 @@ msgstr "" "\"Chucky Daemon <notreal@example.com>\"\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:175 +#: documentation/content/en/articles/committers-guide/_index.adoc:174 #, no-wrap msgid "" "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o\n" @@ -425,7 +425,7 @@ msgstr "" "You need a Passphrase to protect your secret key.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:178 +#: documentation/content/en/articles/committers-guide/_index.adoc:177 msgid "" "2048-bit keys with a three-year expiration provide adequate protection at " "present (2022-10)." @@ -434,7 +434,7 @@ msgstr "" "защиту на данный момент (2022-10)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:180 +#: documentation/content/en/articles/committers-guide/_index.adoc:179 msgid "" "A three year key lifespan is short enough to obsolete keys weakened by " "advancing computer power, but long enough to reduce key management problems." @@ -444,7 +444,7 @@ msgstr "" "достаточно велик, чтобы уменьшить проблемы управления ключами." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:182 +#: documentation/content/en/articles/committers-guide/_index.adoc:181 msgid "" "Use your real name here, preferably matching that shown on government-issued " "ID to make it easier for others to verify your identity. Text that may help " @@ -456,7 +456,7 @@ msgstr "" "идентифицировать вас, можно ввести в раздел `Комментарий`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:186 +#: documentation/content/en/articles/committers-guide/_index.adoc:185 msgid "" "After the email address is entered, a passphrase is requested. Methods of " "creating a secure passphrase are contentious. Rather than suggest a single " @@ -473,7 +473,7 @@ msgstr "" "wikipedia.org/wiki/Passphrase[]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:190 +#: documentation/content/en/articles/committers-guide/_index.adoc:189 msgid "" "Protect the private key and passphrase. If either the private key or " "passphrase may have been compromised or disclosed, immediately notify mailto:" @@ -484,22 +484,22 @@ msgstr "" "accounts@FreeBSD.org[accounts@FreeBSD.org] и отзовите ключ." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:192 +#: documentation/content/en/articles/committers-guide/_index.adoc:191 msgid "" "Committing the new key is shown in crossref:committers-guide[commit-steps, " "Steps for New Committers]." msgstr "" -"Фиксация нового ключа показана в crossref:committers-guide[commit-steps, " -"Шаги для новых коммиттеров]." +"Фиксация нового ключа показана в разделе crossref:committers-guide[commit-" +"steps, Шаги для новых коммиттеров]." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:194 +#: documentation/content/en/articles/committers-guide/_index.adoc:193 #, no-wrap msgid "Kerberos and LDAP web Password for FreeBSD Cluster" msgstr "Kerberos и LDAP веб-пароль для кластера FreeBSD" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:199 +#: documentation/content/en/articles/committers-guide/_index.adoc:198 msgid "" "The FreeBSD cluster requires a Kerberos password to access certain " "services. The Kerberos password also serves as the LDAP web password, since " @@ -512,12 +512,12 @@ msgstr "" "включают:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:201 +#: documentation/content/en/articles/committers-guide/_index.adoc:200 msgid "https://bugs.freebsd.org/bugzilla[Bugzilla]" msgstr "https://bugs.freebsd.org/bugzilla[Bugzilla]" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:203 +#: documentation/content/en/articles/committers-guide/_index.adoc:202 msgid "" "To create a new Kerberos account in the FreeBSD cluster, or to reset a " "Kerberos password for an existing account using a random password generator:" @@ -527,19 +527,19 @@ msgstr "" "случайных паролей:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:207 +#: documentation/content/en/articles/committers-guide/_index.adoc:206 #, no-wrap msgid "% ssh kpasswd.freebsd.org\n" msgstr "% ssh kpasswd.freebsd.org\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:212 +#: documentation/content/en/articles/committers-guide/_index.adoc:211 msgid "This must be done from a machine outside of the FreeBSD.org cluster." msgstr "" "Это должно быть выполнено с компьютера за пределами кластера FreeBSD.org." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:215 +#: documentation/content/en/articles/committers-guide/_index.adoc:214 msgid "" "A Kerberos password can also be set manually by logging into `freefall." "FreeBSD.org` and running:" @@ -548,13 +548,13 @@ msgstr "" "org` и выполнив:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:219 +#: documentation/content/en/articles/committers-guide/_index.adoc:218 #, no-wrap msgid "% kpasswd\n" msgstr "% kpasswd\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:225 +#: documentation/content/en/articles/committers-guide/_index.adoc:224 msgid "" "Unless the Kerberos-authenticated services of the FreeBSD.org cluster have " "been used previously, `Client unknown` will be shown. This error means that " @@ -567,13 +567,13 @@ msgstr "" "freebsd.org`, показанный выше, для инициализации учётной записи Kerberos." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:228 +#: documentation/content/en/articles/committers-guide/_index.adoc:227 #, no-wrap msgid "Commit Bit Types" msgstr "Типы битов коммита (прав на коммит)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:234 +#: documentation/content/en/articles/committers-guide/_index.adoc:233 msgid "" "The FreeBSD repository has a number of components which, when combined, " "support the basic operating system source, documentation, third party " @@ -599,79 +599,79 @@ msgstr "" "времени." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:240 +#: documentation/content/en/articles/committers-guide/_index.adoc:239 #, no-wrap msgid "__Committer Type__" msgstr "__Тип коммиттера__" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:241 +#: documentation/content/en/articles/committers-guide/_index.adoc:240 #, no-wrap msgid "__Responsible__" msgstr "__Ответственный__" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:243 +#: documentation/content/en/articles/committers-guide/_index.adoc:242 #, no-wrap msgid "__Tree Components__" msgstr "__Компоненты дерева исходного кода__" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:244 +#: documentation/content/en/articles/committers-guide/_index.adoc:243 #, no-wrap msgid "src" msgstr "src" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:245 +#: documentation/content/en/articles/committers-guide/_index.adoc:244 #, no-wrap msgid "srcmgr@" msgstr "srcmgr@" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:247 +#: documentation/content/en/articles/committers-guide/_index.adoc:246 #, no-wrap msgid "src/" msgstr "src/" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:248 +#: documentation/content/en/articles/committers-guide/_index.adoc:247 #, no-wrap msgid "doc" msgstr "doc" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:249 +#: documentation/content/en/articles/committers-guide/_index.adoc:248 #, no-wrap msgid "doceng@" msgstr "doceng@" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:251 +#: documentation/content/en/articles/committers-guide/_index.adoc:250 #, no-wrap msgid "doc/, ports/, src/ documentation" msgstr "документация doc/, ports/, src/" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:252 +#: documentation/content/en/articles/committers-guide/_index.adoc:251 #, no-wrap msgid "ports" msgstr "ports" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:253 +#: documentation/content/en/articles/committers-guide/_index.adoc:252 #, no-wrap msgid "portmgr@" msgstr "portmgr@" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:254 +#: documentation/content/en/articles/committers-guide/_index.adoc:253 #, no-wrap msgid "ports/" msgstr "ports/" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:259 +#: documentation/content/en/articles/committers-guide/_index.adoc:258 msgid "" "Commit bits allocated prior to the development of the notion of areas of " "authority may be appropriate for use in many parts of the tree. However, " @@ -693,7 +693,7 @@ msgstr "" "работающих с деревом." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:261 +#: documentation/content/en/articles/committers-guide/_index.adoc:260 msgid "" "Committers are encouraged to seek review for their work as part of the " "normal development process, regardless of the area of the tree where the " @@ -704,13 +704,41 @@ msgstr "" "происходит работа." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:262 +#: documentation/content/en/articles/committers-guide/_index.adoc:261 #, no-wrap msgid "Policy for Committer Activity in Other Trees" msgstr "Политика активности коммиттеров в других деревьях" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:265 +#: documentation/content/en/articles/committers-guide/_index.adoc:266 +msgid "" +"Committers are trusted to use good judgment when working outside their " +"primary area. The link:https://www.freebsd.org/internal/cross-repo-commits/" +"[Cross Repo Commit Policy] describes the overall framework. The following " +"guidelines apply:" +msgstr "" +"Коммиттерам доверяется использовать здравый смысл при работе вне своей " +"основной области. Политика link:https://www.freebsd.org/ru/internal/" +"cross-repo-commits/[Cross Repo Commit Policy] описывает общую структуру. " +"Применяются следующие руководящие принципы:" + +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:267 +#, no-wrap +msgid "General Guidelines" +msgstr "Общие рекомендации" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:270 +msgid "" +"These changes do not require review or approval from a committer in the " +"target repository:" +msgstr "" +"Эти изменения не требуют рецензирования или одобрения от коммиттера в " +"целевом репозитории:" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:272 msgid "" "All committers may modify [.filename]#src/share/misc/committers-*.dot#, [." "filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and [." @@ -721,53 +749,83 @@ msgstr "" "filename]#ports/astro/xearth/files#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:266 +#: documentation/content/en/articles/committers-guide/_index.adoc:273 msgid "" -"doc committers may commit documentation changes to [.filename]#src# files, " +"All committers may commit documentation changes to [.filename]#src# files, " "such as manual pages, READMEs, fortune databases, calendar files, and " -"comment fixes without approval from a src committer, subject to the normal " -"care and tending of commits." +"comment fixes, subject to the normal care and tending of commits." msgstr "" -"Документационные коммиттеры могут вносить изменения в документацию в файлы [." +"Все коммиттеры могут вносить изменения в документацию в файлы [." "filename]#src#, такие как руководства, README, базы данных fortune, " -"календарные файлы и исправления комментариев, без одобрения коммиттера src, " -"при условии соблюдения обычных правил и внимания к коммитам." +"календарные файлы и исправления комментариев, при условии соблюдения обычных " +"правил и внимания к коммитам." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:268 +#: documentation/content/en/articles/committers-guide/_index.adoc:274 msgid "" -"Any committer may make changes to any other tree with an \"Approved by\" " -"from a non-mentored committer with the appropriate bit. Mentored committers " -"can provide a \"Reviewed by\" but not an \"Approved by\"." +"Obvious trivial fixes — typos, broken links, and similar trivial corrections " +"— may be committed by any committer to any repository (see also <<doc-" +"blanket-approval>>)." msgstr "" -"Любой коммиттер может вносить изменения в любое другое дерево с пометкой " -"\"Approved by\" от некурируемого коммиттера с соответствующими правами. " -"Курируемые коммиттеры (имеющие наставника) могут предоставлять пометку " -"\"Reviewed by\", но не \"Approved by\"." +"Очевидные тривиальные исправления — опечатки, битые ссылки и аналогичные " +"простые правки — коммит может быть сделан любым коммиттером в любом " +"репозитории (см. также <<doc-blanket-approval>>)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:269 +#: documentation/content/en/articles/committers-guide/_index.adoc:275 +msgid "" +"When you have recently introduced a build breakage that's trivial to " +"resolve, though a revert and a full review usually is better for anything " +"non-trivial." +msgstr "" +"Когда вы недавно сделали изменение, которое сломало сборку, и это изменение " +"тривиально исправить, хотя откат и полное повторное рецензирование обычно " +"лучше для всего, что не является тривиальным." + +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:276 +#, no-wrap +msgid "Non-Obvious Changes" +msgstr "Неочевидные изменения" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:281 +msgid "" +"For changes beyond those described here, committers should seek review from " +"committers with the appropriate bit in the target repository. When in " +"doubt, seek review, even if you have a commit bit in the repo. Always test " +"build and test run or read files affected by the change." +msgstr "" +"Для изменений, выходящих за рамки описанных здесь, коммиттеры должны " +"запрашивать рецензирование у коммиттеров с соответствующими правами в " +"целевом репозитории. При сомнениях запрашивайте рецензирование, даже если у " +"вас есть права на коммит в этом репозитории. Всегда проверяйте сборку и " +"тестовый запуск или читайте файлы, затронутые изменением." + +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:282 +#, no-wrap +msgid "Acquiring Additional Commit Bits" +msgstr "Получение дополнительных прав на внесение изменений" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:285 msgid "" "Committers can acquire an additional bit by the usual process of finding a " -"mentor who will propose them to srcmgr, doceng, or portmgr, as appropriate. " -"When approved, they will be added to 'access' and the normal mentoring " -"period will ensue, which will involve a continuing of \"Approved by\" for " -"some period." +"mentor who will propose them to srcmgr, doceng, or portmgr, as appropriate." msgstr "" "Коммиттеры могут получить дополнительный бит по обычному процессу: найти " "наставника, который предложит их srcmgr, doceng или portmgr, в зависимости " -"от ситуации. После одобрения их добавят в 'access', и начнётся стандартный " -"период наставничества, который будет включать продолжение отметки \"Approved " -"by\" в течение некоторого времени." +"от ситуации." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:271 +#: documentation/content/en/articles/committers-guide/_index.adoc:287 #, no-wrap msgid "Documentation Implicit (Blanket) Approval" msgstr "Неявное (по умолчанию) одобрение для документации" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:275 +#: documentation/content/en/articles/committers-guide/_index.adoc:291 msgid "" "Some types of fixes have \"blanket approval\" from the {doceng}, allowing " "any committer to fix those categories of problems on any part of the doc " @@ -780,22 +838,22 @@ msgstr "" "коммиттера документации, если у автора нет прав на коммит в документацию." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:277 +#: documentation/content/en/articles/committers-guide/_index.adoc:293 msgid "Blanket approval applies to these types of fixes:" msgstr "Общее одобрение применяется к следующим типам исправлений:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:279 +#: documentation/content/en/articles/committers-guide/_index.adoc:295 msgid "Typos" msgstr "Опечатки" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:280 +#: documentation/content/en/articles/committers-guide/_index.adoc:296 msgid "Trivial fixes" msgstr "Тривиальные исправления" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:282 +#: documentation/content/en/articles/committers-guide/_index.adoc:298 msgid "" "Punctuation, URLs, dates, paths and file names with outdated or incorrect " "information, and other common mistakes that may confound the readers." @@ -805,7 +863,7 @@ msgstr "" "могут ввести читателей в заблуждение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:285 +#: documentation/content/en/articles/committers-guide/_index.adoc:301 msgid "" "Over the years, some implicit approvals were granted in the doc tree. This " "list shows the most common cases:" @@ -814,7 +872,7 @@ msgstr "" "список показывает наиболее распространённые из них:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:287 +#: documentation/content/en/articles/committers-guide/_index.adoc:303 msgid "" "Changes in [.filename]#documentation/content/en/books/porters-handbook/" "versions/_index.adoc#" @@ -823,7 +881,7 @@ msgstr "" "versions/_index.adoc#" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:289 +#: documentation/content/en/articles/committers-guide/_index.adoc:305 msgid "" "extref:{porters-handbook}versions/[__FreeBSD_version Values (Porter's " "Handbook)], mainly used for src committers." @@ -832,12 +890,12 @@ msgstr "" "созданию портов)], в основном используется коммиттерами src." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:290 +#: documentation/content/en/articles/committers-guide/_index.adoc:306 msgid "Changes in [.filename]#doc/shared/contrib-additional.adoc#" msgstr "Изменения в [.filename]#doc/shared/contrib-additional.adoc#" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:292 +#: documentation/content/en/articles/committers-guide/_index.adoc:308 msgid "" "extref:{contributors}[Additional FreeBSD Contributors, contrib-additional] " "maintenance." @@ -846,33 +904,33 @@ msgstr "" "FreeBSD, contrib-additional]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:293 +#: documentation/content/en/articles/committers-guide/_index.adoc:309 msgid "All link:#commit-steps[Steps for New Committers], doc related" msgstr "" "Все link:#commit-steps[Шаги для новых коммиттеров], связанные с документацией" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:294 +#: documentation/content/en/articles/committers-guide/_index.adoc:310 msgid "Security advisories; Errata Notices; Releases;" msgstr "Рекомендации по безопасности; Уведомления об ошибках; Релизы;" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:296 +#: documentation/content/en/articles/committers-guide/_index.adoc:312 msgid "Used by {security-officer} and {re}." msgstr "{security-officer} и {re} используют эти разделы." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:297 +#: documentation/content/en/articles/committers-guide/_index.adoc:313 msgid "Changes in [.filename]#website/content/en/donations/donors.adoc#" msgstr "Изменения в [.filename]#website/content/ru/donations/donors.adoc#" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:299 +#: documentation/content/en/articles/committers-guide/_index.adoc:315 msgid "Used by {donations}." msgstr "{donations} использует этот документ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:301 +#: documentation/content/en/articles/committers-guide/_index.adoc:317 msgid "" "Before any commit, a build test is necessary; see the 'Overview' and 'The " "FreeBSD Documentation Build Process' sections of the extref:{fdp-primer}" @@ -883,19 +941,19 @@ msgstr "" "[Руководства для новых участников проекта документации FreeBSD]." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:303 +#: documentation/content/en/articles/committers-guide/_index.adoc:319 #, no-wrap msgid "Git Primer" msgstr "Руководство по Git" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:306 +#: documentation/content/en/articles/committers-guide/_index.adoc:322 #, no-wrap msgid "Git basics" msgstr "Основы Git" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:313 +#: documentation/content/en/articles/committers-guide/_index.adoc:329 msgid "" "When one searches for \"Git Primer\" a number of good ones come up. Daniel " "Miessler's link:https://danielmiessler.com/study/git/[A git primer] and " @@ -921,7 +979,7 @@ msgstr "" "мировоззрения Git." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:315 +#: documentation/content/en/articles/committers-guide/_index.adoc:331 msgid "" "This document will assume that you've read through it and will try not to " "belabor the basics (though it will cover them briefly)." @@ -930,13 +988,13 @@ msgstr "" "повторять основы (хотя кратко их рассмотрит)." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:317 +#: documentation/content/en/articles/committers-guide/_index.adoc:333 #, no-wrap msgid "Git Mini Primer" msgstr "Мини-руководство по Git" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:320 +#: documentation/content/en/articles/committers-guide/_index.adoc:336 msgid "" "This primer is less ambitiously scoped than the old Subversion Primer, but " "should cover the basics." @@ -945,13 +1003,13 @@ msgstr "" "Subversion, но должно охватить основы." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:321 +#: documentation/content/en/articles/committers-guide/_index.adoc:337 #, no-wrap msgid "Scope" msgstr "Область применения" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:327 +#: documentation/content/en/articles/committers-guide/_index.adoc:343 msgid "" "If you want to download FreeBSD, compile it from sources, and generally keep " "up to date that way, this primer is for you. It covers getting the sources, " @@ -971,7 +1029,7 @@ msgstr "" "участием в проекте." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:331 +#: documentation/content/en/articles/committers-guide/_index.adoc:347 msgid "" "The goal of this section is to highlight those bits of Git needed to track " "sources. They assume a basic understanding of Git. There are many primers " @@ -984,13 +1042,13 @@ msgstr "" "book/en/v2[Книга по Git] предлагает одно из лучших изложений." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:333 +#: documentation/content/en/articles/committers-guide/_index.adoc:349 #, no-wrap msgid "Getting Started For Developers" msgstr "Начало работы для разработчиков" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:336 +#: documentation/content/en/articles/committers-guide/_index.adoc:352 msgid "" "This section describes the read-write access for committers to push the " "commits from developers or contributors." @@ -999,13 +1057,13 @@ msgstr "" "отправлять коммиты от разработчиков или контрибьюторов." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:338 +#: documentation/content/en/articles/committers-guide/_index.adoc:354 #, no-wrap msgid "Daily use" msgstr "Повседневное использование" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:343 +#: documentation/content/en/articles/committers-guide/_index.adoc:359 msgid "" "In the examples below, replace `${repo}` with the name of the desired " "FreeBSD repository: `doc`, `ports`, or `src`." @@ -1014,25 +1072,25 @@ msgstr "" "FreeBSD: `doc`, `ports` или `src`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:346 +#: documentation/content/en/articles/committers-guide/_index.adoc:362 msgid "Clone the repository:" msgstr "Клонировать репозиторий:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:350 +#: documentation/content/en/articles/committers-guide/_index.adoc:366 #, no-wrap msgid "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/${repo}.git\n" msgstr "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/${repo}.git\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:353 +#: documentation/content/en/articles/committers-guide/_index.adoc:369 msgid "Then you should have the official mirrors as your remote:" msgstr "" "В результате у вас в качестве удалённых (remote) должны быть официальные " "зеркала:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:359 +#: documentation/content/en/articles/committers-guide/_index.adoc:375 #, no-wrap msgid "" "% git remote -v\n" @@ -1044,12 +1102,12 @@ msgstr "" "freebsd https://git.freebsd.org/${repo}.git (push)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:362 +#: documentation/content/en/articles/committers-guide/_index.adoc:378 msgid "Configure the FreeBSD committer data:" msgstr "Настройка данных коммиттера FreeBSD:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:365 +#: documentation/content/en/articles/committers-guide/_index.adoc:381 msgid "" "The commit hook in repo.freebsd.org checks the \"Commit\" field matches the " "committer's information in FreeBSD.org. The easiest way to get the " @@ -1062,7 +1120,7 @@ msgstr "" "gitconfig.sh` на freefall:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:372 +#: documentation/content/en/articles/committers-guide/_index.adoc:388 #, no-wrap msgid "" "% gen-gitconfig.sh\n" @@ -1076,18 +1134,18 @@ msgstr "" "% git config user.email (your login)@FreeBSD.org\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:375 +#: documentation/content/en/articles/committers-guide/_index.adoc:391 msgid "Set the push URL:" msgstr "Установите URL для отправки (push URL):" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:379 +#: documentation/content/en/articles/committers-guide/_index.adoc:395 #, no-wrap msgid "% git remote set-url --push freebsd git@gitrepo.freebsd.org:${repo}.git\n" msgstr "% git remote set-url --push freebsd git@gitrepo.freebsd.org:${repo}.git\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:382 +#: documentation/content/en/articles/committers-guide/_index.adoc:398 msgid "" "Then you should have separated fetch and push URLs as the most efficient " "setup:" @@ -1096,7 +1154,7 @@ msgstr "" "отправки (push) как наиболее эффективная настройка:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:388 +#: documentation/content/en/articles/committers-guide/_index.adoc:404 #, no-wrap msgid "" "% git remote -v\n" @@ -1108,7 +1166,7 @@ msgstr "" "freebsd git@gitrepo.freebsd.org:${repo}.git (push)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:391 +#: documentation/content/en/articles/committers-guide/_index.adoc:407 msgid "" "Again, note that `gitrepo.freebsd.org` has been canonicalized to `repo." "freebsd.org`." @@ -1117,17 +1175,17 @@ msgstr "" "для `repo.freebsd.org`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:393 +#: documentation/content/en/articles/committers-guide/_index.adoc:409 msgid "Install commit message template hook:" msgstr "Установка хука для шаблона сообщения коммита:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:395 +#: documentation/content/en/articles/committers-guide/_index.adoc:411 msgid "For doc repository:" msgstr "Для репозитория документации:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:400 +#: documentation/content/en/articles/committers-guide/_index.adoc:416 #, no-wrap msgid "" "% cd .git/hooks\n" @@ -1137,23 +1195,23 @@ msgstr "" "% ln -s ../../.hooks/prepare-commit-msg\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:403 +#: documentation/content/en/articles/committers-guide/_index.adoc:419 msgid "For ports repository:" msgstr "Для репозитория портов:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:407 +#: documentation/content/en/articles/committers-guide/_index.adoc:423 #, no-wrap msgid "% git config --add core.hooksPath .hooks\n" msgstr "% git config --add core.hooksPath .hooks\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:410 +#: documentation/content/en/articles/committers-guide/_index.adoc:426 msgid "For src repository:" msgstr "Для репозитория src:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:415 +#: documentation/content/en/articles/committers-guide/_index.adoc:431 #, no-wrap msgid "" "% cd .git/hooks\n" @@ -1163,13 +1221,13 @@ msgstr "" "% ln -s ../../tools/tools/git/hooks/prepare-commit-msg\n" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:418 +#: documentation/content/en/articles/committers-guide/_index.adoc:434 #, no-wrap msgid "\"admin\" branch" msgstr "Ветка \"admin\"" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:421 +#: documentation/content/en/articles/committers-guide/_index.adoc:437 msgid "" "The `access` and `mentors` files are stored in an orphan branch, `internal/" "admin`, in each repository." @@ -1178,7 +1236,7 @@ msgstr "" "admin` в каждом репозитории." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:423 +#: documentation/content/en/articles/committers-guide/_index.adoc:439 msgid "" "Following example is how to check out the `internal/admin` branch to a local " "branch named `admin`:" @@ -1187,7 +1245,7 @@ msgstr "" "`internal/admin` в локальной ветке с именем `admin`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:429 +#: documentation/content/en/articles/committers-guide/_index.adoc:445 #, no-wrap msgid "" "% git config --add remote.freebsd.fetch '+refs/internal/*:refs/internal/*'\n" @@ -1199,19 +1257,19 @@ msgstr "" "% git checkout -b admin internal/admin\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:431 +#: documentation/content/en/articles/committers-guide/_index.adoc:447 msgid "Alternatively, you can add a worktree for the `admin` branch:" msgstr "" "В качестве альтернативы вы можете добавить рабочее дерево для ветки `admin`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:435 +#: documentation/content/en/articles/committers-guide/_index.adoc:451 #, no-wrap msgid "git worktree add -b admin ../${repo}-admin internal/admin\n" msgstr "git worktree add -b admin ../${repo}-admin internal/admin\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:439 +#: documentation/content/en/articles/committers-guide/_index.adoc:455 msgid "" "For browsing `internal/admin` branch on web: `https://cgit.freebsd.org/" "${repo}/log/?h=internal/admin`" @@ -1220,24 +1278,24 @@ msgstr "" "org/${repo}/log/?h=internal/admin`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:441 +#: documentation/content/en/articles/committers-guide/_index.adoc:457 msgid "For pushing, specify the full refspec:" msgstr "Для отправки (push) укажите полную спецификацию ссылки:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:445 +#: documentation/content/en/articles/committers-guide/_index.adoc:461 #, no-wrap msgid "git push freebsd HEAD:refs/internal/admin\n" msgstr "git push freebsd HEAD:refs/internal/admin\n" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:447 +#: documentation/content/en/articles/committers-guide/_index.adoc:463 #, no-wrap msgid "Keeping Current With The FreeBSD src Tree" msgstr "Как поддерживать актуальную копию дерева исходных кодов FreeBSD src" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:454 +#: documentation/content/en/articles/committers-guide/_index.adoc:470 msgid "" "First step: cloning a tree. This downloads the entire tree. There are two " "ways to download. Most people will want to do a deep clone of the " @@ -1250,82 +1308,90 @@ msgstr "" "потребоваться поверхностное клонирование." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:455 +#: documentation/content/en/articles/committers-guide/_index.adoc:471 #, no-wrap msgid "Branch Names" msgstr "Названия веток" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:457 +#: documentation/content/en/articles/committers-guide/_index.adoc:473 msgid "FreeBSD-CURRENT uses the `main` branch." msgstr "FreeBSD-CURRENT использует ветку `main`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:459 +#: documentation/content/en/articles/committers-guide/_index.adoc:475 msgid "`main` is the default branch." msgstr "`main` — это ветка по умолчанию." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:461 -msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`." -msgstr "Для FreeBSD-STABLE названия веток включают `stable/12` и `stable/13`." +#: documentation/content/en/articles/committers-guide/_index.adoc:477 +msgid "" +"For FreeBSD-STABLE, branch names include `stable/{rel-latest-major}` and " +"`stable/{rel-legacy-major}`." +msgstr "" +"Для FreeBSD-STABLE названия веток включают `stable/{rel-latest-major}` и `" +"stable/{rel-legacy-major}`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:463 +#: documentation/content/en/articles/committers-guide/_index.adoc:479 msgid "" -"For FreeBSD-RELEASE, release engineering branch names include `releng/12.4` " -"and `releng/13.2`." +"For FreeBSD-RELEASE, release engineering branch names include `releng/{rel-" +"latest}` and `releng/{rel-legacy}`." msgstr "" -"Для FreeBSD-RELEASE, названия веток разработки выпусков включают " -"`releng/12.4` и `releng/13.2`." +"Для FreeBSD-RELEASE, названия веток разработки выпусков включают `releng/" +"{rel-latest}` и `releng/{rel-legacy}`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:465 +#: documentation/content/en/articles/committers-guide/_index.adoc:481 msgid "https://www.freebsd.org/releng/[] shows:" msgstr "https://www.freebsd.org/releng/[] отображает:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:467 +#: documentation/content/en/articles/committers-guide/_index.adoc:483 msgid "`main` and `stable/⋯` branches open" msgstr "ветки `main` и `stable/⋯` открыты" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:468 +#: documentation/content/en/articles/committers-guide/_index.adoc:484 msgid "`releng/⋯` branches, each of which is frozen when a release is tagged." msgstr "" "ветки `releng/⋯`, каждая из которых замораживается при создании тега релиза." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:470 +#: documentation/content/en/articles/committers-guide/_index.adoc:486 msgid "Examples:" msgstr "Примеры:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:472 +#: documentation/content/en/articles/committers-guide/_index.adoc:488 msgid "" -"tag https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] on " -"the https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1] branch" +"tag https://cgit.freebsd.org/src/tag/?h=release/{rel-latest}.0[release/{rel-" +"latest}.0] on the https://cgit.freebsd.org/src/log/?h=releng/{rel-latest}" +"[releng/{rel-latest}] branch" msgstr "" -"тег https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] на " -"ветке https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1]" +"тег https://cgit.freebsd.org/src/tag/?h=release/{rel-latest}.0[release/{rel-" +"latest}.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/{rel-latest}[" +"releng/{rel-latest}]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:473 +#: documentation/content/en/articles/committers-guide/_index.adoc:489 msgid "" -"tag https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] on " -"the https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2] branch." +"tag https://cgit.freebsd.org/src/tag/?h=release/{rel-legacy}.0[release/{rel-" +"legacy}.0] on the https://cgit.freebsd.org/src/log/?h=releng/{rel-legacy}" +"[releng/{rel-legacy}] branch." msgstr "" -"тег https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] на " -"ветке https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2]." +"тег https://cgit.freebsd.org/src/tag/?h=release/{rel-legacy}.0[release/{rel-" +"legacy}.0] на ветке https://cgit.freebsd.org/src/log/?h=releng/{rel-legacy}[" +"releng/{rel-legacy}]." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:474 +#: documentation/content/en/articles/committers-guide/_index.adoc:490 #, no-wrap msgid "Repositories" msgstr "Репозитории" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:477 +#: documentation/content/en/articles/committers-guide/_index.adoc:493 msgid "" "Please see the crossref:committers-guide[admin,Administrative Details] for " "the latest information on where to get FreeBSD sources. $URL below can be " @@ -1337,7 +1403,7 @@ msgstr "" "страницы." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:480 +#: documentation/content/en/articles/committers-guide/_index.adoc:496 msgid "" "Note: The project doesn't use submodules as they are a poor fit for our " "workflows and development model. How we track changes in third-party " @@ -1350,13 +1416,13 @@ msgstr "" "правило, мало интересует обычного пользователя." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:481 +#: documentation/content/en/articles/committers-guide/_index.adoc:497 #, no-wrap msgid "Deep Clone" msgstr "Полный клон" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:485 +#: documentation/content/en/articles/committers-guide/_index.adoc:501 msgid "" "A deep clone pulls in the entire tree, as well as all the history and " "branches. It is the easiest to do. It also allows you to use Git's " @@ -1369,13 +1435,13 @@ msgstr "" "с единственной копией репозитория." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:488 +#: documentation/content/en/articles/committers-guide/_index.adoc:504 #, no-wrap msgid "% git clone -o freebsd $URL -b branch [<directory>]\n" msgstr "% git clone -o freebsd $URL -b branch [<directory>]\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:493 +#: documentation/content/en/articles/committers-guide/_index.adoc:509 msgid "" "will create a deep clone. `branch` should be one of the branches listed in " "the previous section. If no `branch` is given: the default (`main`) will be " @@ -1390,7 +1456,7 @@ msgstr "" "filename]#ports# или [.filename]#src#)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:498 +#: documentation/content/en/articles/committers-guide/_index.adoc:514 msgid "" "You will want a deep clone if you are interested in the history, plan on " "making local changes, or plan on working on more than one branch. It is the " @@ -1410,13 +1476,13 @@ msgstr "" "детальными версиями истории)." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:499 +#: documentation/content/en/articles/committers-guide/_index.adoc:515 #, no-wrap msgid "Shallow Clone" msgstr "Частичный клон" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:505 +#: documentation/content/en/articles/committers-guide/_index.adoc:521 msgid "" "A shallow clone copies just the most current code, but none or little of the " "history. This can be useful when you need to build a specific revision of " @@ -1432,13 +1498,13 @@ msgstr "" "обратите внимание на существенное ограничение этого подхода, описанное ниже." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:509 +#: documentation/content/en/articles/committers-guide/_index.adoc:525 #, no-wrap msgid "% git clone -o freebsd -b branch --depth 1 $URL [dir]\n" msgstr "% git clone -o freebsd -b branch --depth 1 $URL [dir]\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:514 +#: documentation/content/en/articles/committers-guide/_index.adoc:530 msgid "" "This clones the repository, but only has the most recent version in the " "repository. The rest of the history is not downloaded. Should you change " @@ -1449,7 +1515,7 @@ msgstr "" "вы можете выполнить `git fetch --unshallow`, чтобы получить старую историю." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:519 +#: documentation/content/en/articles/committers-guide/_index.adoc:535 msgid "" "When you make a shallow clone, you will lose the commit count in your uname " "output. This can make it more difficult to determine if your system needs " @@ -1460,20 +1526,20 @@ msgstr "" "выпуске бюллетеня безопасности." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:521 +#: documentation/content/en/articles/committers-guide/_index.adoc:537 #, no-wrap msgid "Building" msgstr "Сборка" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:525 +#: documentation/content/en/articles/committers-guide/_index.adoc:541 msgid "" "Once you've downloaded, building is done as described in the handbook, e.g.:" msgstr "" "После загрузки сборка выполняется так, как описано в Руководстве, например:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:532 +#: documentation/content/en/articles/committers-guide/_index.adoc:548 #, no-wrap msgid "" "% cd src\n" @@ -1489,12 +1555,12 @@ msgstr "" "% make installworld\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:534 +#: documentation/content/en/articles/committers-guide/_index.adoc:550 msgid "so that won't be covered in depth here." msgstr "так что здесь это не будет рассматриваться подробно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:537 +#: documentation/content/en/articles/committers-guide/_index.adoc:553 msgid "" "If you want to build a custom kernel, extref:{handbook}kernelconfig[the " "kernel config section, kernelconfig] of the FreeBSD Handbook recommends " @@ -1509,13 +1575,13 @@ msgstr "" "info/exclude." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:538 +#: documentation/content/en/articles/committers-guide/_index.adoc:554 #, no-wrap msgid "Updating" msgstr "Обновление" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:542 +#: documentation/content/en/articles/committers-guide/_index.adoc:558 msgid "" "To update both types of trees uses the same commands. This pulls in all the " "revisions since your last update." @@ -1524,13 +1590,13 @@ msgstr "" "загружает (pull) все изменения, сделанные после последнего обновления." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:545 +#: documentation/content/en/articles/committers-guide/_index.adoc:561 #, no-wrap msgid "% git pull --ff-only\n" msgstr "% git pull --ff-only\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:550 +#: documentation/content/en/articles/committers-guide/_index.adoc:566 msgid "" "will update the tree. In Git, a 'fast forward' merge is one that only needs " "to set a new branch pointer and doesn't need to re-create the commits. By " @@ -1545,7 +1611,7 @@ msgstr "" "локальные патчи." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:553 +#: documentation/content/en/articles/committers-guide/_index.adoc:569 msgid "" "See below for how to manage local changes. The simplest is to use `--" "autostash` on the `git pull` command, but more sophisticated options are " @@ -1556,13 +1622,13 @@ msgstr "" "варианты." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:554 +#: documentation/content/en/articles/committers-guide/_index.adoc:570 #, no-wrap msgid "Selecting a Specific Version" msgstr "Выбор конкретной версии" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:558 +#: documentation/content/en/articles/committers-guide/_index.adoc:574 msgid "" "In Git, `git checkout` checks out both branches and specific versions. " "Git's versions are the long hashes rather than a sequential number." @@ -1572,7 +1638,7 @@ msgstr "" "длинные хеши, а не последовательные номера." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:560 +#: documentation/content/en/articles/committers-guide/_index.adoc:576 msgid "" "When you checkout a specific version, just specify the hash you want on the " "command line (the git log command can help you decide which hash you might " @@ -1582,13 +1648,13 @@ msgstr "" "строке (команда `git log` может помочь вам определиться, какой хэш выбрать):" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:563 +#: documentation/content/en/articles/committers-guide/_index.adoc:579 #, no-wrap msgid "% git checkout 08b8197a74\n" msgstr "% git checkout 08b8197a74\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:566 +#: documentation/content/en/articles/committers-guide/_index.adoc:582 msgid "" "and you have that checked out. You will be greeted with a message similar " "to the following:" @@ -1596,13 +1662,13 @@ msgstr "" "и вам это скопировано (checkout). Вы увидите сообщение, похожее на следующее:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:569 +#: documentation/content/en/articles/committers-guide/_index.adoc:585 #, no-wrap msgid "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n" msgstr "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:573 +#: documentation/content/en/articles/committers-guide/_index.adoc:589 #, no-wrap msgid "" "You are in a 'detached HEAD' state. You can look around, make experimental\n" @@ -1614,8 +1680,8 @@ msgstr "" "state without impacting any branches by performing another checkout.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:576 -#: documentation/content/en/articles/committers-guide/_index.adoc:1745 +#: documentation/content/en/articles/committers-guide/_index.adoc:592 +#: documentation/content/en/articles/committers-guide/_index.adoc:1761 #, no-wrap msgid "" "If you want to create a new branch to retain commits you create, you may\n" @@ -1625,20 +1691,20 @@ msgstr "" "do so (now or later) by using -b with the checkout command again. Example:\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:578 -#: documentation/content/en/articles/committers-guide/_index.adoc:1747 +#: documentation/content/en/articles/committers-guide/_index.adoc:594 +#: documentation/content/en/articles/committers-guide/_index.adoc:1763 #, no-wrap msgid " git checkout -b <new-branch-name>\n" msgstr " git checkout -b <new-branch-name>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:580 +#: documentation/content/en/articles/committers-guide/_index.adoc:596 #, no-wrap msgid "HEAD is now at 08b8197a742a hook gpiokeys.4 to the build\n" msgstr "HEAD is now at 08b8197a742a hook gpiokeys.4 to the build\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:584 +#: documentation/content/en/articles/committers-guide/_index.adoc:600 msgid "" "where the last line is generated from the hash you are checking out and the " "first line of the commit message from that revision. The hash can be " @@ -1651,13 +1717,13 @@ msgstr "" "последователен в том, сколько цифр он отображает." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:585 +#: documentation/content/en/articles/committers-guide/_index.adoc:601 #, no-wrap msgid "Bisecting" msgstr "Бинарный поиск (bisect)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:589 +#: documentation/content/en/articles/committers-guide/_index.adoc:605 msgid "" "Sometimes, things go wrong. The last version worked, but the one you just " "updated to does not. A developer may ask you to bisect the problem to track " @@ -1668,7 +1734,7 @@ msgstr "" "проблемы, чтобы определить, какой коммит вызвал регрессию." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:594 +#: documentation/content/en/articles/committers-guide/_index.adoc:610 msgid "" "Git makes bisecting changes easy with a powerful `git bisect` command. " "Here's a brief outline of how to use it. For more information, you can view " @@ -1688,7 +1754,7 @@ msgstr "" "так далее, но это здесь не будет рассматриваться." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:601 +#: documentation/content/en/articles/committers-guide/_index.adoc:617 msgid "" "`git bisect start --first-parent` will start the bisection process. Next, " "you need to tell a range to go through. `git bisect good XXXXXX` will tell " @@ -1709,7 +1775,7 @@ msgstr "" "исходников FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:605 +#: documentation/content/en/articles/committers-guide/_index.adoc:621 msgid "" "If you want to know the last version you checked out, you should use `git " "reflog`:" @@ -1718,7 +1784,7 @@ msgstr "" "`git reflog`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:610 +#: documentation/content/en/articles/committers-guide/_index.adoc:626 #, no-wrap msgid "" "5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\n" @@ -1730,7 +1796,7 @@ msgstr "" "...\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:614 +#: documentation/content/en/articles/committers-guide/_index.adoc:630 msgid "" "shows me moving the working tree to the `main` branch (a816...) and then " "updating from upstream (to 5ef0...). In this case, bad would be HEAD (or " @@ -1747,7 +1813,7 @@ msgstr "" "обнаружили необходимость в бинарном поиске." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:618 +#: documentation/content/en/articles/committers-guide/_index.adoc:634 msgid "" "Set the 'good' version first, then set the bad (though the order doesn't " "matter). When you set the bad version, it will give you some statistics on " @@ -1758,7 +1824,7 @@ msgstr "" "статистику по процессу:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:625 +#: documentation/content/en/articles/committers-guide/_index.adoc:641 #, no-wrap msgid "" "% git bisect start --first-parent\n" @@ -1774,7 +1840,7 @@ msgstr "" "[c427b3158fd8225f6afc09e7e6f62326f9e4de7e] Fixup r361997 by balancing parens. Duh.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:634 +#: documentation/content/en/articles/committers-guide/_index.adoc:650 msgid "" "You would then build/install that version. If it's good you'd type `git " "bisect good` otherwise `git bisect bad`. If the version doesn't compile, " @@ -1796,13 +1862,13 @@ msgstr "" "ресурс на случай возникновения проблем или нестандартных ситуаций." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:636 +#: documentation/content/en/articles/committers-guide/_index.adoc:652 #, no-wrap msgid "Signing the commits, tags, and pushes, with GnuPG" msgstr "Подписание коммитов, тегов и отправок с помощью GnuPG" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:641 +#: documentation/content/en/articles/committers-guide/_index.adoc:657 msgid "" "Git knows how to sign commits, tags, and pushes. When you sign a Git commit " "or a tag, you can prove that the code you submitted came from you and wasn't " @@ -1815,7 +1881,7 @@ msgstr "" "подтвердить, что именно вы отправили код, а не кто-то другой." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:643 +#: documentation/content/en/articles/committers-guide/_index.adoc:659 msgid "" "A more in-depth documentation on signing commits and tags can be found in " "the https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work[Git Tools - " @@ -1826,7 +1892,7 @@ msgstr "" "Подписание вашей работы] книги по Git." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:645 +#: documentation/content/en/articles/committers-guide/_index.adoc:661 msgid "" "The rationale behind signing pushes can be found in the https://github.com/" "git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that " @@ -1837,7 +1903,7 @@ msgstr "" "эта функция]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:648 +#: documentation/content/en/articles/committers-guide/_index.adoc:664 msgid "" "The best way is to simply tell Git you always want to sign commits, tags, " "and pushes. You can do this by setting a few configuration variables:" @@ -1847,7 +1913,7 @@ msgstr "" "конфигурации:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:655 +#: documentation/content/en/articles/committers-guide/_index.adoc:671 #, no-wrap msgid "" "% git config --add user.signingKey LONG-KEY-ID\n" @@ -1862,7 +1928,7 @@ msgstr "" #. push.gpgSign should probably be set to `yes` once we enable it, or be set with --global, so that it is enabled for all repositories. #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:663 +#: documentation/content/en/articles/committers-guide/_index.adoc:679 msgid "" "To avoid possible collisions, make sure you give a long key id to Git. You " "can get the long id with: `gpg --list-secret-keys --keyid-format LONG`." @@ -1872,7 +1938,7 @@ msgstr "" "помощью команды: `gpg --list-secret-keys --keyid-format LONG`." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:669 +#: documentation/content/en/articles/committers-guide/_index.adoc:685 msgid "" "To use specific subkeys, and not have GnuPG to resolve the subkey to a " "primary key, attach `!` to the key. For example, to encrypt for the subkey " @@ -1883,13 +1949,13 @@ msgstr "" "`DEADBEEF` используйте `DEADBEEF!`." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:671 +#: documentation/content/en/articles/committers-guide/_index.adoc:687 #, no-wrap msgid "Verifying signatures" msgstr "Проверка подписей" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:674 +#: documentation/content/en/articles/committers-guide/_index.adoc:690 msgid "" "Commit signatures can be verified by running either `git verify-commit " "<commit hash>`, or `git log --show-signature`." @@ -1898,7 +1964,7 @@ msgstr "" "коммита>` или `git log --show-signature`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:676 +#: documentation/content/en/articles/committers-guide/_index.adoc:692 msgid "" "Tag signatures can be verified with `git verify-tag <tag name>`, or `git tag " "-v <tag name>`." @@ -1912,13 +1978,13 @@ msgstr "" #. Git pushes are a bit different, they live in a special ref in the repository. #. TODO: write how to verify them #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:685 +#: documentation/content/en/articles/committers-guide/_index.adoc:701 #, no-wrap msgid "Ports Considerations" msgstr "Особенности портов" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:688 +#: documentation/content/en/articles/committers-guide/_index.adoc:704 msgid "" "The ports tree operates the same way. The branch names are different and " "the repositories are in different locations." @@ -1927,7 +1993,7 @@ msgstr "" "репозитории расположены в других местах." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:691 +#: documentation/content/en/articles/committers-guide/_index.adoc:707 msgid "" "The cgit repository web interface for use with web browsers is at https://" "cgit.FreeBSD.org/ports/ . The production Git repository is at https://git." @@ -1940,7 +2006,7 @@ msgstr "" "`anongit@git.FreeBSD.org:ports.git`)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:695 +#: documentation/content/en/articles/committers-guide/_index.adoc:711 msgid "" "There is also a mirror on GitHub, see extref:{handbook}mirrors[External " "mirrors, mirrors] for an overview. The _latest_ branch is `main`. The " @@ -1951,13 +2017,13 @@ msgstr "" "_quarterly_ именуются `yyyyQn`, где 'yyyy' — год, а 'n' — квартал." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:697 +#: documentation/content/en/articles/committers-guide/_index.adoc:713 #, no-wrap msgid "Commit message formats" msgstr "Форматы сообщений коммитов" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:701 +#: documentation/content/en/articles/committers-guide/_index.adoc:717 msgid "" "A hook is available in the ports repository to help you write up your commit " "messages in https://cgit.freebsd.org/ports/tree/.hooks/prepare-commit-msg[." @@ -1970,7 +2036,7 @@ msgstr "" "команду ``git config --add core.hooksPath .hooks``." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:703 +#: documentation/content/en/articles/committers-guide/_index.adoc:719 msgid "" "The main point being that a commit message should be formatted in the " "following way:" @@ -1979,25 +2045,25 @@ msgstr "" "следующим образом:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:706 +#: documentation/content/en/articles/committers-guide/_index.adoc:722 #, no-wrap msgid "category/port: Summary.\n" msgstr "category/port: Summary.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:708 +#: documentation/content/en/articles/committers-guide/_index.adoc:724 #, no-wrap msgid "Description of why the changes where made.\n" msgstr "Description of why the changes where made (Объяснение, почему были сделаны изменения ).\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:710 +#: documentation/content/en/articles/committers-guide/_index.adoc:726 #, no-wrap msgid "PR:\t 12345\n" msgstr "PR:\t 12345\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:716 +#: documentation/content/en/articles/committers-guide/_index.adoc:732 msgid "" "The first line is the subject of the commit, it contains what port was " "changed, and a summary of the commit. It should contain 50 characters or " @@ -2007,13 +2073,13 @@ msgstr "" "и краткое описание коммита. Она должна содержать 50 символов или меньше." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:718 +#: documentation/content/en/articles/committers-guide/_index.adoc:734 msgid "A blank line should separate it from the rest of the commit message." msgstr "" "Пустая строка должна отделять его от остальной части сообщения о коммите." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:720 +#: documentation/content/en/articles/committers-guide/_index.adoc:736 msgid "" "The rest of the commit message should be wrapped at the 72 characters " "boundary." @@ -2022,7 +2088,7 @@ msgstr "" "символов." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:722 +#: documentation/content/en/articles/committers-guide/_index.adoc:738 msgid "" "Another blank line should be added if there are any metadata fields, so that " "they are easily distinguishable from the commit message." @@ -2031,13 +2097,13 @@ msgstr "" "метаданных, чтобы их можно было легко отличить от сообщения о коммите." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:724 +#: documentation/content/en/articles/committers-guide/_index.adoc:740 #, no-wrap msgid "Managing Local Changes" msgstr "Управление локальными изменениями" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:727 +#: documentation/content/en/articles/committers-guide/_index.adoc:743 msgid "" "This section addresses tracking local changes. If you have no local changes " "you can skip this section." @@ -2046,7 +2112,7 @@ msgstr "" "локальных изменений, вы можете пропустить этот раздел." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:733 +#: documentation/content/en/articles/committers-guide/_index.adoc:749 msgid "" "One item that is important for all of them: all changes are local until " "pushed. Unlike Subversion, Git uses a distributed model. For users, for " @@ -2065,13 +2131,13 @@ msgstr "" "ниже)." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:734 +#: documentation/content/en/articles/committers-guide/_index.adoc:750 #, no-wrap msgid "Keeping local changes" msgstr "Сохранение локальных изменений" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:741 +#: documentation/content/en/articles/committers-guide/_index.adoc:757 msgid "" "The simplest way to keep local changes (especially trivial ones) is to use " "`git stash`. In its simplest form, you use `git stash` to record the " @@ -2091,7 +2157,7 @@ msgstr "" "в man-странице git-stash (https://git-scm.com/docs/git-stash)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:745 +#: documentation/content/en/articles/committers-guide/_index.adoc:761 msgid "" "This method is suitable when you have tiny tweaks to the tree. When you " "have anything non trivial, you'll likely be better off keeping a local " @@ -2104,13 +2170,13 @@ msgstr "" "команду `git pull`: просто добавьте `--autostash` в командную строку." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:746 +#: documentation/content/en/articles/committers-guide/_index.adoc:762 #, no-wrap msgid "Keeping a local branch" msgstr "Сохранение локальной ветки" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:753 +#: documentation/content/en/articles/committers-guide/_index.adoc:769 msgid "" "It is much easier to keep a local branch with Git than Subversion. In " "Subversion you need to merge the commit, and resolve the conflicts. This is " @@ -2128,7 +2194,7 @@ msgstr "" "наименее гибкий." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:757 +#: documentation/content/en/articles/committers-guide/_index.adoc:773 msgid "" "In addition to merging, Git supports the concept of 'rebasing' which avoids " "these issues. The `git rebase` command replays all the commits of a branch " @@ -2142,12 +2208,12 @@ msgstr "" "использовании." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:759 +#: documentation/content/en/articles/committers-guide/_index.adoc:775 msgid "====== Create a branch" msgstr "====== Создать ветку" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:764 +#: documentation/content/en/articles/committers-guide/_index.adoc:780 msgid "" "Let's say you want to make a change to FreeBSD's ls command to never, ever " "do color. There are many reasons to do this, but this example will use that " @@ -2163,7 +2229,7 @@ msgstr "" "обычно происходит автоматически." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:786 +#: documentation/content/en/articles/committers-guide/_index.adoc:802 #, no-wrap msgid "" "% cd src\n" @@ -2209,7 +2275,7 @@ msgstr "" "% git commit ls.c\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:793 +#: documentation/content/en/articles/committers-guide/_index.adoc:809 msgid "" "The commit will pop you into an editor to describe what you've done. Once " "you enter that, you have your own **local** branch in the Git repo. Build " @@ -2228,12 +2294,12 @@ msgstr "" "подробных руководствах." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:795 +#: documentation/content/en/articles/committers-guide/_index.adoc:811 msgid "====== Time to update" msgstr "====== Время обновить" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:800 +#: documentation/content/en/articles/committers-guide/_index.adoc:816 msgid "" "When it is time to bring in a new version, it is almost the same as w/o the " "branches. You would update like you would above, but there is one extra " @@ -2248,7 +2314,7 @@ msgstr "" "операции перебазирования с чистого дерева (Git требует этого)." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:806 +#: documentation/content/en/articles/committers-guide/_index.adoc:822 #, no-wrap msgid "" "% git checkout main\n" @@ -2260,7 +2326,7 @@ msgstr "" "% git rebase -i main no-color-ls\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:811 +#: documentation/content/en/articles/committers-guide/_index.adoc:827 msgid "" "This will bring up an editor that lists all the commits in it. For this " "example, do not change it at all. This is typically what you are doing " @@ -2273,7 +2339,7 @@ msgstr "" "управления коммитами в ветке)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:813 +#: documentation/content/en/articles/committers-guide/_index.adoc:829 msgid "" "Once you are done with the above, you have to move the commits to ls.c " "forward from the old version of FreeBSD to the newer one." @@ -2282,7 +2348,7 @@ msgstr "" "c` со старой версии FreeBSD на новую." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:820 +#: documentation/content/en/articles/committers-guide/_index.adoc:836 msgid "" "Sometimes there are merge conflicts. That is OK. Do not panic. Instead, " "handle them the same as any other merge conflicts. To keep it simple, I " @@ -2295,7 +2361,7 @@ msgstr "" "Ссылка на полное руководство приведена в конце этого раздела." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:823 +#: documentation/content/en/articles/committers-guide/_index.adoc:839 msgid "" "Let's say the includes changes upstream in a radical shift to terminfo as " "well as a name change for the option. When you updated, you might see " @@ -2305,7 +2371,7 @@ msgstr "" "изменение названия опции. При обновлении вы можете увидеть следующее:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:833 +#: documentation/content/en/articles/committers-guide/_index.adoc:849 #, no-wrap msgid "" "Auto-merging bin/ls/ls.c\n" @@ -2327,12 +2393,12 @@ msgstr "" "Could not apply 646e0f9cda11... no color ls\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:835 +#: documentation/content/en/articles/committers-guide/_index.adoc:851 msgid "which looks scary." msgstr "что выглядит пугающе." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:837 +#: documentation/content/en/articles/committers-guide/_index.adoc:853 msgid "" "If you bring up an editor, you will see it is a typical 3-way merge conflict " "resolution that you may be familiar with from other source code systems (the " @@ -2343,7 +2409,7 @@ msgstr "" "управления исходным кодом (остальная часть ls.c опущена):" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:847 +#: documentation/content/en/articles/committers-guide/_index.adoc:863 #, no-wrap msgid "" " <<<<<<< HEAD\n" @@ -2365,12 +2431,12 @@ msgstr "" " >>>>>>> 646e0f9cda11... no color ls\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:850 +#: documentation/content/en/articles/committers-guide/_index.adoc:866 msgid "The new code is first, and your code is second." msgstr "Новый код идёт первым, а ваш код - вторым." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:852 +#: documentation/content/en/articles/committers-guide/_index.adoc:868 msgid "" "The right fix here is to just add a #undef COLORLS_NEW before #ifdef and " "then delete the old changes:" @@ -2379,7 +2445,7 @@ msgstr "" "`#ifdef`, а затем удалить старые изменения:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:857 +#: documentation/content/en/articles/committers-guide/_index.adoc:873 #, no-wrap msgid "" "#undef COLORLS_NEW\n" @@ -2391,17 +2457,17 @@ msgstr "" "#include <terminfo.h>\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:859 +#: documentation/content/en/articles/committers-guide/_index.adoc:875 msgid "save the file." msgstr "и сохранить файл." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:861 +#: documentation/content/en/articles/committers-guide/_index.adoc:877 msgid "The rebase was interrupted, so you have to complete it:" msgstr "Ребазирование было прервано, поэтому вам необходимо завершить его:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:865 +#: documentation/content/en/articles/committers-guide/_index.adoc:881 #, no-wrap msgid "" "% git add ls.c\n" @@ -2411,7 +2477,7 @@ msgstr "" "% git rebase --continue\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:870 +#: documentation/content/en/articles/committers-guide/_index.adoc:886 msgid "" "which tells Git that ls.c has been fixed and to continue the rebase " "operation. Since there was a conflict, you will get kicked into the editor " @@ -2424,7 +2490,7 @@ msgstr "" "по-прежнему корректно, просто закройте редактор." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:875 +#: documentation/content/en/articles/committers-guide/_index.adoc:891 msgid "" "If you get stuck during the rebase, do not panic. git rebase --abort will " "take you back to a clean slate. It is important, though, to start with an " @@ -2440,7 +2506,7 @@ msgstr "" "pick`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:878 +#: documentation/content/en/articles/committers-guide/_index.adoc:894 msgid "" "For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-" "to-git-merge-and-git-rebase/ provides a rather extensive treatment. It is a " @@ -2453,22 +2519,23 @@ msgstr "" "которые возникают нечасто, но слишком специфичны для данного руководства." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:879 +#: documentation/content/en/articles/committers-guide/_index.adoc:895 #, no-wrap msgid "Switching to a Different FreeBSD Branch" msgstr "Переключение на другую ветку FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:882 +#: documentation/content/en/articles/committers-guide/_index.adoc:898 msgid "" -"If you wish to shift from stable/12 to the current branch. If you have a " -"deep clone, the following will suffice:" +"If you wish to shift from stable/{rel-latest-major} to the current branch. " +"If you have a deep clone, the following will suffice:" msgstr "" -"Если вы хотите перейти с ветки stable/12 на ветку current и у вас есть " -"полный клон репозитория, будет достаточно выполнить следующую команду:" +"Если вы хотите перейти с ветки stable/{rel-latest-major} на ветку current и " +"у вас есть полный клон репозитория, будет достаточно выполнить следующую " +"команду:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:886 +#: documentation/content/en/articles/committers-guide/_index.adoc:902 #, no-wrap msgid "" "% git checkout main\n" @@ -2478,65 +2545,67 @@ msgstr "" "% # build and install here...\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:891 +#: documentation/content/en/articles/committers-guide/_index.adoc:907 msgid "" "If you have a local branch, though, there are one or two caveats. First, " "rebase will rewrite history, so you will likely want to do something to save " "it. Second, jumping branches tends to cause more conflicts. If we pretend " -"the example above was relative to stable/12, then to move to `main`, I'd " -"suggest the following:" +"the example above was relative to stable/{rel-latest-major}, then to move to " +"`main`, I'd suggest the following:" msgstr "" "Однако, если у вас есть локальная ветка, есть несколько важных замечаний. Во-" "первых, перебазирование переписывает историю, поэтому вам, скорее всего, " "захочется сохранить её каким-либо образом. Во-вторых, переключение между " "ветками часто вызывает больше конфликтов. Если предположить, что приведённый " -"выше пример относился к ветке stable/12, то для перехода на ветку `main` я " -"бы рекомендовал следующее:" +"выше пример относился к ветке stable/{rel-latest-major}, то для перехода на " +"ветку `main` я бы рекомендовал следующее:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:896 +#: documentation/content/en/articles/committers-guide/_index.adoc:912 #, no-wrap msgid "" "% git checkout no-color-ls\n" -"% git checkout -b no-color-ls-stable-12 # create another name for this branch\n" -"% git rebase -i stable/12 no-color-ls --onto main\n" +"% git checkout -b no-color-ls-stable-{rel-latest-major} # create another name for this branch\n" +"% git rebase -i stable/{rel-latest-major} no-color-ls --onto main\n" msgstr "" "% git checkout no-color-ls\n" -"% git checkout -b no-color-ls-stable-12 # create another name for this branch\n" -"% git rebase -i stable/12 no-color-ls --onto main\n" +"% git checkout -b no-color-ls-stable-{rel-latest-major} # create another " +"name for this branch\n" +"% git rebase -i stable/{rel-latest-major} no-color-ls --onto main\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:903 +#: documentation/content/en/articles/committers-guide/_index.adoc:919 msgid "" "What the above does is checkout no-color-ls. Then create a new name for it " -"(no-color-ls-stable-12) in case you need to get back to it. Then you rebase " -"onto the `main` branch. This will find all the commits to the current no-" -"color-ls branch (back to where it meets up with the stable/12 branch) and " -"then it will replay them onto the `main` branch creating a new no-color-ls " -"branch there (which is why I had you create a place holder name)." +"(`no-color-ls-stable-{rel-latest-major}`) in case you need to get back to " +"it. Then you rebase onto the `main` branch. This will find all the commits " +"to the current no-color-ls branch (back to where it meets up with the stable/" +"{rel-latest-major} branch) and then it will replay them onto the `main` " +"branch creating a new no-color-ls branch there (which is why I had you " +"create a place holder name)." msgstr "" "Что делает вышеописанное: извлекается ветка no-color-ls. Затем для неё " -"создаётся новое имя (no-color-ls-stable-12) на случай, если потребуется " -"вернуться к ней. После этого выполняется перебазирование на ветку `main`. " -"Это позволит найти все коммиты в текущей ветке no-color-ls (вплоть до точки " -"её ответвления от stable/12) и затем воспроизвести их на ветке `main`, " -"создав там новую ветку no-color-ls (поэтому я и попросил вас создать " -"резервное имя)." +"создаётся новое имя (no-color-ls-stable-{rel-latest-major}) на случай, если " +"потребуется вернуться к ней. После этого выполняется перебазирование на " +"ветку `main`. Это позволит найти все коммиты в текущей ветке no-color-ls (" +"вплоть до точки её ответвления от stable/{rel-latest-major}) и затем " +"воспроизвести их на ветке `main`, создав там новую ветку no-color-ls (" +"поэтому я и попросил вас создать резервное имя)." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:905 +#: documentation/content/en/articles/committers-guide/_index.adoc:921 #, no-wrap msgid "MFC (Merge From Current) Procedures" msgstr "Процедуры MFC (Merge From Current)" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:906 +#: documentation/content/en/articles/committers-guide/_index.adoc:922 #, no-wrap msgid "Summary" msgstr "Краткое содержание" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:910 +#: documentation/content/en/articles/committers-guide/_index.adoc:926 msgid "" "MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --" "amend` to adjust the commit message. For multiple commits, use `git rebase -" @@ -2548,23 +2617,23 @@ msgstr "" "сообщение коммита." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:911 +#: documentation/content/en/articles/committers-guide/_index.adoc:927 #, no-wrap msgid "Single commit MFC" msgstr "Одиночный коммит MFC" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:917 +#: documentation/content/en/articles/committers-guide/_index.adoc:933 #, no-wrap msgid "" -"% git checkout stable/X\n" +"% git checkout stable/{rel-latest-major}\n" "% git cherry-pick -x $HASH --edit\n" msgstr "" -"% git checkout stable/X\n" +"% git checkout stable/{rel-latest-major}\n" "% git cherry-pick -x $HASH --edit\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:921 +#: documentation/content/en/articles/committers-guide/_index.adoc:937 msgid "" "For MFC commits, for example a vendor import, you would need to specify one " "parent for cherry-pick purposes. Normally, that would be the \"first parent" @@ -2575,17 +2644,17 @@ msgstr "" "будет «первый родитель» ветки, из которой вы применяете изменения, то есть:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:926 +#: documentation/content/en/articles/committers-guide/_index.adoc:942 #, no-wrap msgid "" -"% git checkout stable/X\n" +"% git checkout stable/{rel-latest-major}\n" "% git cherry-pick -x $HASH -m 1 --edit\n" msgstr "" -"% git checkout stable/X\n" +"% git checkout stable/{rel-latest-major}\n" "% git cherry-pick -x $HASH -m 1 --edit\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:929 +#: documentation/content/en/articles/committers-guide/_index.adoc:945 msgid "" "If things go wrong, you'll either need to abort the cherry-pick with `git " "cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`." @@ -2595,7 +2664,7 @@ msgstr "" "выполнить `git cherry-pick --continue`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:932 +#: documentation/content/en/articles/committers-guide/_index.adoc:948 msgid "" "Once the cherry-pick is finished, push with `git push`. If you get an error " "due to losing the commit race, use `git pull --rebase` and try to push again." @@ -2605,13 +2674,13 @@ msgstr "" "`git pull --rebase` и повторите попытку отправки." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:933 +#: documentation/content/en/articles/committers-guide/_index.adoc:949 #, no-wrap msgid "MFC to RELENG branch" msgstr "MFC в ветку RELENG" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:937 +#: documentation/content/en/articles/committers-guide/_index.adoc:953 msgid "" "MFCs to branches that require approval require a bit more care. The process " "is the same for either a typical merge or an exceptional direct commit." @@ -2621,7 +2690,7 @@ msgstr "" "исключительной ситуации." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:939 +#: documentation/content/en/articles/committers-guide/_index.adoc:955 msgid "" "Merge or direct commit to the appropriate `stable/X` branch first before " "merging to the `releng/X.Y` branch." @@ -2630,34 +2699,34 @@ msgstr "" "X`, прежде чем сливать в ветку `releng/X.Y`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:940 +#: documentation/content/en/articles/committers-guide/_index.adoc:956 msgid "" "Use the hash that's in the `stable/X` branch for the MFC to `releng/X.Y` " "branch." msgstr "Используйте хэш из ветки `stable/X` для MFC в ветку `releng/X.Y`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:941 +#: documentation/content/en/articles/committers-guide/_index.adoc:957 msgid "Leave both \"cherry picked from\" lines in the commit message." msgstr "Оставляйте обе строки \"cherry picked from\" в сообщении коммита." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:942 +#: documentation/content/en/articles/committers-guide/_index.adoc:958 msgid "Be sure to add the `Approved by:` line when you are in the editor." msgstr "Обязательно добавьте строку `Approved by:` при работе в редакторе." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:947 +#: documentation/content/en/articles/committers-guide/_index.adoc:963 #, no-wrap msgid "" -"% git checkout releng/13.0\n" +"% git checkout releng/{rel-latest-next}\n" "% git cherry-pick -x $HASH --edit\n" msgstr "" -"% git checkout releng/13.0\n" +"% git checkout releng/{rel-latest-next}\n" "% git cherry-pick -x $HASH --edit\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:950 +#: documentation/content/en/articles/committers-guide/_index.adoc:966 msgid "" "If you forget to add the `Approved by:` line, you can do a `git commit --" "amend` to edit the commit message before you push the change." @@ -2667,13 +2736,13 @@ msgstr "" "изменения." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:951 +#: documentation/content/en/articles/committers-guide/_index.adoc:967 #, no-wrap msgid "Multiple commit MFC" msgstr "Множественный коммит MFC" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:962 +#: documentation/content/en/articles/committers-guide/_index.adoc:978 #, no-wrap msgid "" "% git checkout -b tmp-branch stable/X\n" @@ -2693,14 +2762,14 @@ msgstr "" "% git push freebsd HEAD:stable/X\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:965 +#: documentation/content/en/articles/committers-guide/_index.adoc:981 msgid "If the push fails due to losing the commit race, rebase and try again:" msgstr "" "Если отправка не удалась из-за проигрыша в гонке коммитов, выполните " "перебазирование и повторите попытку:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:973 +#: documentation/content/en/articles/committers-guide/_index.adoc:989 #, no-wrap msgid "" "% git checkout stable/X\n" @@ -2716,12 +2785,12 @@ msgstr "" "% git push freebsd HEAD:stable/X\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:976 +#: documentation/content/en/articles/committers-guide/_index.adoc:992 msgid "Once the MFC is complete, you can delete the temporary branch:" msgstr "После завершения MFC вы можете удалить временную ветку:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:981 +#: documentation/content/en/articles/committers-guide/_index.adoc:997 #, no-wrap msgid "" "% git checkout stable/X\n" @@ -2731,13 +2800,13 @@ msgstr "" "% git branch -d tmp-branch\n" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:983 +#: documentation/content/en/articles/committers-guide/_index.adoc:999 #, no-wrap msgid "MFC a vendor import" msgstr "MFC — импорт от вендора" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:988 +#: documentation/content/en/articles/committers-guide/_index.adoc:1004 msgid "" "Vendor imports are the only thing in the tree that creates a merge commit in " "the `main` branch. Cherry picking merge commits into stable/XX presents an " @@ -2752,13 +2821,13 @@ msgstr "" "это разница с `main` (хотя могут быть и исключения)." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:992 +#: documentation/content/en/articles/committers-guide/_index.adoc:1008 #, no-wrap msgid "% git cherry-pick -x -m 1 $HASH\n" msgstr "% git cherry-pick -x -m 1 $HASH\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:995 +#: documentation/content/en/articles/committers-guide/_index.adoc:1011 msgid "" "is typically what you want. This will tell cherry-pick to apply the correct " "diff." @@ -2767,7 +2836,7 @@ msgstr "" "правильный diff." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:999 +#: documentation/content/en/articles/committers-guide/_index.adoc:1015 msgid "" "There are some, hopefully, rare cases where it's possible that the `main` " "branch was merged backwards by the conversion script. Should that be the " @@ -2780,7 +2849,7 @@ msgstr "" "на `-m 2`, чтобы выбрать правильного родителя. Просто выполните:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1003 +#: documentation/content/en/articles/committers-guide/_index.adoc:1019 #, no-wrap msgid "" "% git cherry-pick --abort\n" @@ -2790,19 +2859,19 @@ msgstr "" "% git cherry-pick -x -m 2 $HASH\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1005 +#: documentation/content/en/articles/committers-guide/_index.adoc:1021 msgid "to do that. The `--abort` will cleanup the failed first attempt." msgstr "" "для этого. Опция `--abort` выполнит очистку после неудачной первой попытки." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1006 +#: documentation/content/en/articles/committers-guide/_index.adoc:1022 #, no-wrap msgid "Redoing a MFC" msgstr "Переделка MFC" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1010 +#: documentation/content/en/articles/committers-guide/_index.adoc:1026 msgid "" "If you do a MFC, and it goes horribly wrong and you want to start over, then " "the easiest way is to use `git reset --hard` like so:" @@ -2812,13 +2881,13 @@ msgstr "" "показано ниже:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1013 +#: documentation/content/en/articles/committers-guide/_index.adoc:1029 #, no-wrap -msgid "% git reset --hard freebsd/stable/12\n" -msgstr "% git reset --hard freebsd/stable/12\n" +msgid "% git reset --hard freebsd/stable/{rel-latest-major}\n" +msgstr "% git reset --hard freebsd/stable/{rel-latest-major}\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1016 +#: documentation/content/en/articles/committers-guide/_index.adoc:1032 msgid "" "though if you have some revs you want to keep, and others you don't, using " "`git rebase -i` is better." @@ -2827,13 +2896,13 @@ msgstr "" "другие — нет, использование `git rebase -i` предпочтительнее." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1017 +#: documentation/content/en/articles/committers-guide/_index.adoc:1033 #, no-wrap msgid "Considerations when MFCing" msgstr "Некоторые соображения о MFC" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1020 +#: documentation/content/en/articles/committers-guide/_index.adoc:1036 msgid "" "When committing source commits to stable and releng branches, we have the " "following goals:" @@ -2842,23 +2911,23 @@ msgstr "" "следующие цели:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1022 +#: documentation/content/en/articles/committers-guide/_index.adoc:1038 msgid "" "Clearly mark direct commits distinct from commits that land a change from " "another branch." msgstr "" -"Четко обозначить прямые коммиты, отличая их от коммитов, вносящих изменения " +"Чётко обозначить прямые коммиты, отличая их от коммитов, вносящих изменения " "из другой ветки." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1023 +#: documentation/content/en/articles/committers-guide/_index.adoc:1039 msgid "Avoid introducing known breakage into stable and releng branches." msgstr "" "Избегать внесения известных нарушений в стабильные ветки и ветки выпуска " "релизов (releng)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1024 +#: documentation/content/en/articles/committers-guide/_index.adoc:1040 msgid "" "Allow developers to determine which changes have or have not been landed " "from one branch to another." @@ -2867,7 +2936,7 @@ msgstr "" "перенесены из одной ветки в другую." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1026 +#: documentation/content/en/articles/committers-guide/_index.adoc:1042 msgid "" "With Subversion, we used the following practices to achieve these goals:" msgstr "" @@ -2875,7 +2944,7 @@ msgstr "" "целей:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1028 +#: documentation/content/en/articles/committers-guide/_index.adoc:1044 msgid "" "Using `MFC` and `MFS` tags to mark commits that merged changes from another " "branch." @@ -2884,21 +2953,21 @@ msgstr "" "слияние изменения из другой ветки." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1029 +#: documentation/content/en/articles/committers-guide/_index.adoc:1045 msgid "Squashing fixup commits into the main commit when merging a change." msgstr "" "Объединение (squash) исправляющих (fixup) коммитов с основным коммитом при " "слиянии изменения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1030 +#: documentation/content/en/articles/committers-guide/_index.adoc:1046 msgid "Recording mergeinfo so that `svn mergeinfo --show-revs` worked." msgstr "" "Запись информации о слияниях для корректной работы `svn mergeinfo --show-" "revs`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1034 +#: documentation/content/en/articles/committers-guide/_index.adoc:1050 msgid "" "With Git, we will need to use different strategies to achieve the same " "goals. This document aims to define best practices when merging source " @@ -2913,7 +2982,7 @@ msgstr "" "этих целей, а не применять практики, основанные на модели Subversion." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1037 +#: documentation/content/en/articles/committers-guide/_index.adoc:1053 msgid "" "One general note: due to technical differences with Git, we will not be " "using Git \"merge commits\" (created via `git merge`) in stable or releng " @@ -2931,13 +3000,13 @@ msgstr "" "вариации команды `git cherry-pick`." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1038 +#: documentation/content/en/articles/committers-guide/_index.adoc:1054 #, no-wrap msgid "Finding Eligible Hashes to MFC" msgstr "Поиск подходящих хэшей для MFC" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1044 +#: documentation/content/en/articles/committers-guide/_index.adoc:1060 msgid "" "Git provides some built-in support for this via the `git cherry` and `git " "log --cherry` commands. These commands compare the raw diffs of commits " @@ -2960,24 +3029,24 @@ msgstr "" "инструменты для использования этого подхода." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1045 +#: documentation/content/en/articles/committers-guide/_index.adoc:1061 #, no-wrap msgid "Commit message standards" msgstr "Стандарты сообщений коммитов" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1046 +#: documentation/content/en/articles/committers-guide/_index.adoc:1062 #, no-wrap msgid "Marking MFCs" msgstr "Пометка MFC" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1049 +#: documentation/content/en/articles/committers-guide/_index.adoc:1065 msgid "The project has adopted the following practice for marking MFCs:" msgstr "Проект принял следующую практику для пометки MFC:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1051 +#: documentation/content/en/articles/committers-guide/_index.adoc:1067 msgid "" "Use the `-x` flag with `git cherry-pick`. This adds a line to the commit " "message that includes the hash of the original commit when merging. Since it " @@ -2990,20 +3059,20 @@ msgstr "" "редактировать журнал коммитов при слиянии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1053 +#: documentation/content/en/articles/committers-guide/_index.adoc:1069 msgid "" "When merging multiple commits, keep all the \"cherry picked from\" lines." msgstr "" "При слиянии нескольких коммитов сохраняйте все строки \"cherry picked from\"." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1054 +#: documentation/content/en/articles/committers-guide/_index.adoc:1070 #, no-wrap msgid "Trim Metadata?" msgstr "Обрезать метаданные?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1058 +#: documentation/content/en/articles/committers-guide/_index.adoc:1074 msgid "" "One area that was not clearly documented with Subversion (or even CVS) is " "how to format metadata in log messages for MFC commits. Should it include " @@ -3017,7 +3086,7 @@ msgstr "" "MFC?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1067 +#: documentation/content/en/articles/committers-guide/_index.adoc:1083 msgid "" "Historical practice has varied, though some of the variance is by field. " "For example, MFCs that are relevant to a PR generally include the PR field " @@ -3039,7 +3108,7 @@ msgstr "" "чтобы коммиты MFC включались в аудит-трекер системы отслеживания ошибок. В " "других областях ситуация менее ясна. Например, Phabricator показывает " "разницу последнего коммита, помеченного для обзора, поэтому включение URL-" -"адресов Phabricator заменяет основной коммит на завершенные коммиты. Список " +"адресов Phabricator заменяет основной коммит на завершённые коммиты. Список " "рецензентов также неясен. Если рецензент одобрил изменение для `main`, " "означает ли это, что он одобрил коммит MFC? Верно ли это только для " "идентичного кода или лишь с незначительной доработкой? Очевидно, это неверно " @@ -3047,10 +3116,10 @@ msgstr "" "не конфликтует, но вносит изменение ABI? Рецензент мог одобрить коммит для " "`main` из-за нарушения ABI, но может не одобрить слияние того же коммита в " "неизменном виде. Придется полагаться на собственное наилучшее суждение до " -"тех пор, пока не будут согласованы четкие руководящие принципы." +"тех пор, пока не будут согласованы чёткие руководящие принципы." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1071 +#: documentation/content/en/articles/committers-guide/_index.adoc:1087 msgid "" "For MFCs regulated by re@, new metadata fields are added, such as the " "Approved by tag for approved commits. This new metadata will have to be " @@ -3066,7 +3135,7 @@ msgstr "" "адреса Phabricator, для использования re@ в будущем." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1074 +#: documentation/content/en/articles/committers-guide/_index.adoc:1090 msgid "" "Preserving existing metadata provides a very simple workflow. Developers " "use `git cherry-pick -x` without having to edit the log message." @@ -3076,7 +3145,7 @@ msgstr "" "редактировать сообщение журнала." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1077 +#: documentation/content/en/articles/committers-guide/_index.adoc:1093 msgid "" "If instead we choose to adjust metadata in MFCs, developers will have to " "edit log messages explicitly via the use of `git cherry-pick --edit` or `git " @@ -3092,7 +3161,7 @@ msgstr "" "сообщения о фиксации." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1079 +#: documentation/content/en/articles/committers-guide/_index.adoc:1095 msgid "" "The bottom line is that developers will likely need to curate their commit " "message for MFCs that are non-trivial." @@ -3101,26 +3170,26 @@ msgstr "" "сообщения о коммитах для MFC, которые не являются тривиальными." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1081 +#: documentation/content/en/articles/committers-guide/_index.adoc:1097 #, no-wrap msgid "Vendor Imports with Git" msgstr "Импорт вендоров с Git" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1084 +#: documentation/content/en/articles/committers-guide/_index.adoc:1100 msgid "This section describes the vendor import procedure with Git in detail." msgstr "" "В этом разделе подробно описывается процедура импорта вендора с " "использованием Git." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1085 +#: documentation/content/en/articles/committers-guide/_index.adoc:1101 #, no-wrap msgid "Branch naming convention" msgstr "Соглашение о наименовании веток" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1088 +#: documentation/content/en/articles/committers-guide/_index.adoc:1104 msgid "" "All vendor branches and tags start with `vendor/`. These branches and tags " "are visible by default." @@ -3129,7 +3198,7 @@ msgstr "" "умолчанию." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1093 +#: documentation/content/en/articles/committers-guide/_index.adoc:1109 msgid "" "This chapter follows the convention that the `freebsd` origin is the origin " "name for the official FreeBSD Git repository. If you use a different " @@ -3141,7 +3210,7 @@ msgstr "" "замените `freebsd` на используемое вами имя в приведённых ниже примерах." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1097 +#: documentation/content/en/articles/committers-guide/_index.adoc:1113 msgid "" "We will explore an example for updating NetBSD's mtree that is in our tree. " "The vendor branch for this is `vendor/NetBSD/mtree`." @@ -3150,13 +3219,13 @@ msgstr "" "дереве. Ветка вендора для него — `vendor/NetBSD/mtree`." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1098 +#: documentation/content/en/articles/committers-guide/_index.adoc:1114 #, no-wrap msgid "Updating an old vendor import" msgstr "Обновление старого импорта от вендора" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1104 +#: documentation/content/en/articles/committers-guide/_index.adoc:1120 msgid "" "The vendor trees usually have only the subset of the third-party software " "that is appropriate to FreeBSD. These trees are usually tiny in comparison " @@ -3172,19 +3241,19 @@ msgstr "" "существует." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1108 +#: documentation/content/en/articles/committers-guide/_index.adoc:1124 #, no-wrap msgid "% git worktree add ../mtree vendor/NetBSD/mtree\n" msgstr "% git worktree add ../mtree vendor/NetBSD/mtree\n" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1110 +#: documentation/content/en/articles/committers-guide/_index.adoc:1126 #, no-wrap msgid "Update the Sources in the Vendor Branch" msgstr "Обновление исходных кодов в ветке вендора" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1113 +#: documentation/content/en/articles/committers-guide/_index.adoc:1129 msgid "" "Prepare a full, clean tree of the vendor sources. Import everything but " "merge only what is needed." @@ -3193,7 +3262,7 @@ msgstr "" "но делайте слияние только тому, что необходимо." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1117 +#: documentation/content/en/articles/committers-guide/_index.adoc:1133 msgid "" "This example assumes the NetBSD source is checked out from their GitHub " "mirror in `~/git/NetBSD`. Note that \"upstream\" might have added or " @@ -3207,7 +3276,7 @@ msgstr "" "буду использовать его." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1131 +#: documentation/content/en/articles/committers-guide/_index.adoc:1147 #, no-wrap msgid "" "% cd ../mtree\n" @@ -3235,7 +3304,7 @@ msgstr "" "% git tag -a vendor/NetBSD/mtree/20201211\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1144 +#: documentation/content/en/articles/committers-guide/_index.adoc:1160 msgid "" "It is critical to verify that the source code you are importing comes from a " "trustworthy source. Many open-source projects use cryptographic signatures " @@ -3264,7 +3333,7 @@ msgstr "" "вендора." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1148 +#: documentation/content/en/articles/committers-guide/_index.adoc:1164 msgid "" "Always run the `git diff` and `git status` commands and examine the results " "carefully. When in doubt, it is useful to do a `git annotate` on the vendor " @@ -3276,7 +3345,7 @@ msgstr "" "изменение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1151 +#: documentation/content/en/articles/committers-guide/_index.adoc:1167 msgid "" "In the example above we used `-m` to illustrate, but you should compose a " "proper message in an editor (using a commit message template)." @@ -3286,7 +3355,7 @@ msgstr "" "фиксации)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1156 +#: documentation/content/en/articles/committers-guide/_index.adoc:1172 msgid "" "It is also important to create an annotated tag using `git tag -a`, " "otherwise the push will be rejected. Only annotated tags are allowed to be " @@ -3301,24 +3370,24 @@ msgstr "" "или исправлениями в этой версии." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1157 +#: documentation/content/en/articles/committers-guide/_index.adoc:1173 #, no-wrap msgid "Updating the FreeBSD Copy" msgstr "Обновление копии FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1160 +#: documentation/content/en/articles/committers-guide/_index.adoc:1176 msgid "At this point you can push the import to `vendor` into our repo." msgstr "На этом этапе вы можете отправить импорт в `vendor` в наш репозиторий." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1164 +#: documentation/content/en/articles/committers-guide/_index.adoc:1180 #, no-wrap msgid "% git push --follow-tags freebsd vendor/NetBSD/mtree\n" msgstr "% git push --follow-tags freebsd vendor/NetBSD/mtree\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1167 +#: documentation/content/en/articles/committers-guide/_index.adoc:1183 msgid "" "`--follow-tags` tells `git push` to also push tags associated with the " "locally committed revision." @@ -3327,13 +3396,13 @@ msgstr "" "локально зафиксированной ревизией." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1168 +#: documentation/content/en/articles/committers-guide/_index.adoc:1184 #, no-wrap msgid "Updating the FreeBSD source tree" msgstr "Обновление дерева исходных кодов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1172 +#: documentation/content/en/articles/committers-guide/_index.adoc:1188 msgid "" "Now you need to update the mtree in FreeBSD. The sources live in `contrib/" "mtree` since it is upstream software." @@ -3342,7 +3411,7 @@ msgstr "" "`contrib/mtree`, так как это программное обеспечение из внешних источников." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1178 +#: documentation/content/en/articles/committers-guide/_index.adoc:1194 msgid "" "From time to time, we may have to make changes to the contributed code to " "better satisfy FreeBSD's needs. Whenever possible, please try to contribute " @@ -3358,7 +3427,7 @@ msgstr "" "обновлений." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1183 +#: documentation/content/en/articles/committers-guide/_index.adoc:1199 #, no-wrap msgid "" "% cd ../src\n" @@ -3368,7 +3437,7 @@ msgstr "" "% git subtree merge -P contrib/mtree vendor/NetBSD/mtree\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1193 +#: documentation/content/en/articles/committers-guide/_index.adoc:1209 msgid "" "This would generate a subtree merge commit of `contrib/mtree` against the " "local `vendor/NetBSD/mtree` branch. Examine the diff from the merge result " @@ -3390,7 +3459,7 @@ msgstr "" "в сообщение коммита слияния." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1207 +#: documentation/content/en/articles/committers-guide/_index.adoc:1223 msgid "" "Some open-source software includes a `configure` script that generates files " "used to define how the code is built; usually, these generated files like " @@ -3423,7 +3492,7 @@ msgstr "" "к неожиданным результатам." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1214 +#: documentation/content/en/articles/committers-guide/_index.adoc:1230 msgid "" "When testing your changes, run them in a chroot or jailed environment, or " "even within a virtual machine first, especially for kernel or library " @@ -3439,13 +3508,13 @@ msgstr "" "системы среди прочего." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1215 +#: documentation/content/en/articles/committers-guide/_index.adoc:1231 #, no-wrap msgid "Rebasing your change against latest FreeBSD source tree" msgstr "Перебазирование ваших изменений относительно последней версии исходного дерева FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1218 +#: documentation/content/en/articles/committers-guide/_index.adoc:1234 msgid "" "Because the current policy recommends against using merges, if the upstream " "FreeBSD `main` moved forward before you get a chance to push, you would have " @@ -3456,7 +3525,7 @@ msgstr "" "появится возможность отправить изменения, вам придётся переделывать слияние." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1221 +#: documentation/content/en/articles/committers-guide/_index.adoc:1237 msgid "" "Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a " "merge commit **as a merge commit**, so instead of that you would have to " @@ -3467,7 +3536,7 @@ msgstr "" "коммит." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1223 +#: documentation/content/en/articles/committers-guide/_index.adoc:1239 msgid "" "The following steps should be taken to easily recreate the merge commit as " "if `git rebase --merge-commits` worked properly:" @@ -3476,17 +3545,17 @@ msgstr "" "если бы `git rebase --merge-commits` сработал правильно:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1225 +#: documentation/content/en/articles/committers-guide/_index.adoc:1241 msgid "cd to the top of the repo" msgstr "Перейдите в корень репозитория" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1226 +#: documentation/content/en/articles/committers-guide/_index.adoc:1242 msgid "Create a side branch `XXX` with the **contents** of the merged tree." msgstr "Создайте побочную ветвь `XXX` с **содержимым** дерева со слиянием." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1227 +#: documentation/content/en/articles/committers-guide/_index.adoc:1243 msgid "" "Update this side branch `XXX` to be merged and up-to-date with FreeBSD's " "`main` branch." @@ -3495,7 +3564,7 @@ msgstr "" "веткой FreeBSD `main`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1228 +#: documentation/content/en/articles/committers-guide/_index.adoc:1244 msgid "" "In the worst case scenario, you would still have to resolve merge conflicts, " "if there was any, but this should be really rare." @@ -3504,7 +3573,7 @@ msgstr "" "были, но это должно быть крайне редко." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1229 +#: documentation/content/en/articles/committers-guide/_index.adoc:1245 msgid "" "Resolve conflicts, and collapse multiple commits down to 1 if need be " "(without conflicts, there's no collapse needed)" @@ -3513,23 +3582,23 @@ msgstr "" "коммитов в один (без конфликтов объединение не требуется)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1230 +#: documentation/content/en/articles/committers-guide/_index.adoc:1246 msgid "checkout `main`" msgstr "извлеките (checkout) ветку `main`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1231 +#: documentation/content/en/articles/committers-guide/_index.adoc:1247 msgid "create a branch `YYY` (allows for easier unwinding if things go wrong)" msgstr "" "создайте ветку `YYY` (позволяет проще откатиться, если что-то пойдет не так)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1232 +#: documentation/content/en/articles/committers-guide/_index.adoc:1248 msgid "Re-do the subtree merge" msgstr "Повторите слияние поддерева" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1233 +#: documentation/content/en/articles/committers-guide/_index.adoc:1249 msgid "" "Instead of resolving any conflicts from the subtree merge, checkout the " "contents of XXX on top of it." @@ -3538,13 +3607,13 @@ msgstr "" "содержимое XXX поверх него." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1234 +#: documentation/content/en/articles/committers-guide/_index.adoc:1250 msgid "" "The trailing `.` is important, as is being at the top level of the repo." msgstr "Завершающая `.` важна, как и нахождение на верхнем уровне репозитория." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1235 +#: documentation/content/en/articles/committers-guide/_index.adoc:1251 msgid "" "Rather than switching branches to XXX, it splats the contents of XXX on top " "of the repo" @@ -3553,7 +3622,7 @@ msgstr "" "репозитория" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1236 +#: documentation/content/en/articles/committers-guide/_index.adoc:1252 msgid "" "Commit the results with the prior commit message (the example assumes " "there's only one merge on the XXX branch)." @@ -3562,12 +3631,12 @@ msgstr "" "(пример предполагает, что в ветке XXX была только одна операция слияния)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1237 +#: documentation/content/en/articles/committers-guide/_index.adoc:1253 msgid "Make sure the branches are the same." msgstr "Убедитесь, что ветки одинаковые." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1238 +#: documentation/content/en/articles/committers-guide/_index.adoc:1254 msgid "" "Do whatever review you need, including having others check it out if you " "think that's needed." @@ -3576,7 +3645,7 @@ msgstr "" "проверки, если вы считаете, что это необходимо." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1239 +#: documentation/content/en/articles/committers-guide/_index.adoc:1255 msgid "" "Push the commit, if you 'lost the race' again, just redo these steps again " "(see below for a recipe)" @@ -3585,14 +3654,14 @@ msgstr "" "повторите эти шаги (см. рецепт ниже)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1240 +#: documentation/content/en/articles/committers-guide/_index.adoc:1256 msgid "Delete the branches once the commit is upstream. They are throw-a-way." msgstr "" "Удалите ветки после того, как коммит попадёт в вышестоящий репозиторий. Они " "одноразовые." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1242 +#: documentation/content/en/articles/committers-guide/_index.adoc:1258 msgid "" "The commands one would use, following the above example of mtree, would be " "like so (the `#` starts a comment to help link commands to descriptions " @@ -3603,7 +3672,7 @@ msgstr "" "помогающий связать команды с описаниями выше):" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1255 +#: documentation/content/en/articles/committers-guide/_index.adoc:1271 #, no-wrap msgid "" "% cd ../src\t\t\t# CD to top of tree\n" @@ -3629,7 +3698,7 @@ msgstr "" "% git show YYY\t\t\t# Should only have changes you want, and be a merge commit from vendor branch\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1258 +#: documentation/content/en/articles/committers-guide/_index.adoc:1274 msgid "" "Note: if things go wrong with the commit, you can reset the `YYY` branch by " "reissuing the checkout command that created it with -B to start over:" @@ -3639,19 +3708,19 @@ msgstr "" "чтобы начать заново:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1261 +#: documentation/content/en/articles/committers-guide/_index.adoc:1277 #, no-wrap msgid "% git checkout -B YYY freebsd/main # Create new throw-away YYY branch if starting over is just going to be easier\n" msgstr "% git checkout -B YYY freebsd/main # Создать новую временную ветку YYY, если начать заново будет проще\n" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1263 +#: documentation/content/en/articles/committers-guide/_index.adoc:1279 #, no-wrap msgid "Pushing the changes" msgstr "Отправка (push) изменений" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1268 +#: documentation/content/en/articles/committers-guide/_index.adoc:1284 msgid "" "Once you think you have a set of changes that are good, you can push it to a " "fork off GitHub or GitLab for others to review. One nice thing about Git is " @@ -3669,7 +3738,7 @@ msgstr "" "конечном итоге появятся в репозитории." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1270 +#: documentation/content/en/articles/committers-guide/_index.adoc:1286 msgid "" "After review, when you are sure it is a good change, you can push it to the " "FreeBSD repo:" @@ -3678,7 +3747,7 @@ msgstr "" "отправить (push) его в репозиторий FreeBSD:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1276 +#: documentation/content/en/articles/committers-guide/_index.adoc:1292 #, no-wrap msgid "" "% git push freebsd YYY:main\t# put the commit on upstream's 'main' branch\n" @@ -3690,7 +3759,7 @@ msgstr "" "% git branch -D YYY\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1283 +#: documentation/content/en/articles/committers-guide/_index.adoc:1299 msgid "" "Note: I used `XXX` and `YYY` to make it obvious they are terrible names and " "should not leave your machine. If you use such names for other work, then " @@ -3710,13 +3779,13 @@ msgstr "" "и это различие в поведении критически важно для работы данного рецепта." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1284 +#: documentation/content/en/articles/committers-guide/_index.adoc:1300 #, no-wrap msgid "How to redo things if need be" msgstr "Как переделать вещи, если это необходимо" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1288 +#: documentation/content/en/articles/committers-guide/_index.adoc:1304 msgid "" "If you've tried to do the push in the previous section and it fails, then " "you should do the following to 'redo' things. This sequence keeps the " @@ -3728,7 +3797,7 @@ msgstr "" "сообщением о коммите всегда на позиции XXX~1 для упрощения коммита." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1297 +#: documentation/content/en/articles/committers-guide/_index.adoc:1313 #, no-wrap msgid "" "% git checkout -B XXX YYY\t# recreate that throw-away-branch XXX and switch to it\n" @@ -3746,20 +3815,20 @@ msgstr "" "% git commit -c XXX~1\t\t# -c reuses the commit message from commit before rebase\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1300 +#: documentation/content/en/articles/committers-guide/_index.adoc:1316 msgid "Then go check it out as above and push as above when ready." msgstr "" "Затем проверьте, как описано выше, и отправьте (push), как описано выше, " "когда будет готово." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1301 +#: documentation/content/en/articles/committers-guide/_index.adoc:1317 #, no-wrap msgid "Creating a new vendor branch" msgstr "Создание новой ветки вендора" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1308 +#: documentation/content/en/articles/committers-guide/_index.adoc:1324 msgid "" "There are a number of ways to create a new vendor branch. The recommended " "way is to create a new repository and then merge that with FreeBSD. If one " @@ -3776,13 +3845,13 @@ msgstr "" "glorb, и она достаточно мала, так что обрезка не сэкономит много." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1309 +#: documentation/content/en/articles/committers-guide/_index.adoc:1325 #, no-wrap msgid "Create the repo" msgstr "Создайте репозиторий" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1318 +#: documentation/content/en/articles/committers-guide/_index.adoc:1334 #, no-wrap msgid "" "% cd /some/where\n" @@ -3798,7 +3867,7 @@ msgstr "" "% git checkout -b vendor/glorbnitz\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1321 +#: documentation/content/en/articles/committers-guide/_index.adoc:1337 msgid "" "At this point, you have a new repo, where all new commits will go on the " "`vendor/glorbnitz` branch." @@ -3807,7 +3876,7 @@ msgstr "" "будут направляться в ветку `vendor/glorbnitz`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1323 +#: documentation/content/en/articles/committers-guide/_index.adoc:1339 msgid "" "Git experts can also do this right in their FreeBSD clone, using `git " "checkout --orphan vendor/glorbnitz` if they are more comfortable with that." @@ -3817,13 +3886,13 @@ msgstr "" "так удобнее." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1324 +#: documentation/content/en/articles/committers-guide/_index.adoc:1340 #, no-wrap msgid "Copy the sources in" msgstr "Скопируйте себе исходники" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1328 +#: documentation/content/en/articles/committers-guide/_index.adoc:1344 msgid "" "Since this is a new import, you can just cp the sources in, or use tar or " "even rsync as shown above. And we will add everything, assuming no dot " @@ -3835,7 +3904,7 @@ msgstr "" "начале имени." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1333 +#: documentation/content/en/articles/committers-guide/_index.adoc:1349 #, no-wrap msgid "" "% cp -r ~/glorbnitz/* .\n" @@ -3845,20 +3914,20 @@ msgstr "" "% git add *\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1336 +#: documentation/content/en/articles/committers-guide/_index.adoc:1352 msgid "" "At this point, you should have a pristine copy of glorbnitz ready to commit." msgstr "" "На этом этапе у вас должна быть чистая копия glorbnitz, готовая к коммиту." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1340 +#: documentation/content/en/articles/committers-guide/_index.adoc:1356 #, no-wrap msgid "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\"\n" msgstr "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\"\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1345 +#: documentation/content/en/articles/committers-guide/_index.adoc:1361 msgid "" "As above, I used `-m` for simplicity, but you should likely create a commit " "message that explains what a Glorb is and why you'd use a Nitz to get it. " @@ -3874,18 +3943,18 @@ msgstr "" "использованный здесь." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1346 +#: documentation/content/en/articles/committers-guide/_index.adoc:1362 #, no-wrap msgid "Now import it into our repository" msgstr "Теперь импортируйте его в наш репозиторий" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1349 +#: documentation/content/en/articles/committers-guide/_index.adoc:1365 msgid "Now you need to import the branch into our repository." msgstr "Теперь необходимо импортировать ветку в наш репозиторий." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1355 +#: documentation/content/en/articles/committers-guide/_index.adoc:1371 #, no-wrap msgid "" "% cd /path/to/freebsd/repo/src\n" @@ -3898,7 +3967,7 @@ msgstr "" #. perhaps the real treasure was the friends it made along the way... #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1359 +#: documentation/content/en/articles/committers-guide/_index.adoc:1375 msgid "" "Note the vendor/glorbnitz branch is in the repo. At this point the `/some/" "where/glorbnitz` can be deleted, if you like. It was only a means to an end." @@ -3908,13 +3977,13 @@ msgstr "" "промежуточным шагом для достижения цели." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1361 +#: documentation/content/en/articles/committers-guide/_index.adoc:1377 #, no-wrap msgid "Tag and push" msgstr "Сделайте тег и отправьте (push)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1364 +#: documentation/content/en/articles/committers-guide/_index.adoc:1380 msgid "" "Steps from here on out are much the same as they are in the case of updating " "a vendor branch, though without the updating the vendor branch step." @@ -3923,7 +3992,7 @@ msgstr "" "исключением самого шага обновления ветки вендора." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1372 +#: documentation/content/en/articles/committers-guide/_index.adoc:1388 #, no-wrap msgid "" "% git worktree add ../glorbnitz vendor/glorbnitz\n" @@ -3939,32 +4008,32 @@ msgstr "" "% git push --follow-tags freebsd vendor/glorbnitz\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1375 +#: documentation/content/en/articles/committers-guide/_index.adoc:1391 msgid "By 'good' we mean:" msgstr "Под «хорошим» мы подразумеваем:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1377 +#: documentation/content/en/articles/committers-guide/_index.adoc:1393 msgid "All the right files are present" msgstr "Все необходимые файлы присутствуют" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1378 +#: documentation/content/en/articles/committers-guide/_index.adoc:1394 msgid "None of the wrong files are present" msgstr "Ни один из неправильных файлов не присутствует" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1379 +#: documentation/content/en/articles/committers-guide/_index.adoc:1395 msgid "The vendor branch points at something sensible" msgstr "Ветка вендора указывает на что-то разумное" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1380 +#: documentation/content/en/articles/committers-guide/_index.adoc:1396 msgid "The tag looks good, and is annotated" msgstr "Тег выглядит хорошо и имеет аннотацию" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1381 +#: documentation/content/en/articles/committers-guide/_index.adoc:1397 msgid "" "The commit message for the tag has a quick summary of what's new since the " "last tag" @@ -3973,13 +4042,13 @@ msgstr "" "предыдущего тега" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1382 +#: documentation/content/en/articles/committers-guide/_index.adoc:1398 #, no-wrap msgid "Time to finally merge it into the base tree" msgstr "Время наконец сделать слияние этого в базовое дерево" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1391 +#: documentation/content/en/articles/committers-guide/_index.adoc:1407 #, no-wrap msgid "" "% cd ../src\n" @@ -3995,12 +4064,12 @@ msgstr "" "% git push freebsd\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1394 +#: documentation/content/en/articles/committers-guide/_index.adoc:1410 msgid "Here 'good' means:" msgstr "Здесь «хороший» означает:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1396 +#: documentation/content/en/articles/committers-guide/_index.adoc:1412 msgid "" "All the right files, and none of the wrong ones, were merged into contrib/" "glorbnitz." @@ -4009,12 +4078,12 @@ msgstr "" "contrib/glorbnitz." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1397 +#: documentation/content/en/articles/committers-guide/_index.adoc:1413 msgid "No other changes are in the tree." msgstr "В дереве нет других изменений." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1398 +#: documentation/content/en/articles/committers-guide/_index.adoc:1414 msgid "" "The commit messages look crossref:committers-guide[commit-log-message,good]. " "It should contain a summary of what's changed since the last merge to the " @@ -4025,7 +4094,7 @@ msgstr "" "слияния с основной веткой FreeBSD `main` и любые предостережения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1399 +#: documentation/content/en/articles/committers-guide/_index.adoc:1415 msgid "" "`RELNOTES` and `UPDATING` should be updated if there is anything of note, " "such as user visible changes, important upgrade concerns, etc." @@ -4034,7 +4103,7 @@ msgstr "" "например, заметные пользователям изменения, важные аспекты обновления и т.д." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1404 +#: documentation/content/en/articles/committers-guide/_index.adoc:1420 msgid "" "This hasn't connected `glorbnitz` to the build yet. How so do that is " "specific to the software being imported and is beyond the scope of this " @@ -4045,13 +4114,13 @@ msgstr "" "данного руководства." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1406 +#: documentation/content/en/articles/committers-guide/_index.adoc:1422 #, no-wrap msgid "Keeping current" msgstr "Сохраняя актуальность" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1412 +#: documentation/content/en/articles/committers-guide/_index.adoc:1428 msgid "" "So, time passes. It's time now to update the tree for the latest changes " "upstream. When you checkout `main` make sure that you have no diffs. It's " @@ -4065,7 +4134,7 @@ msgstr "" "выполнением следующих действий." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1415 +#: documentation/content/en/articles/committers-guide/_index.adoc:1431 msgid "" "If you are used to `git pull`, we strongly recommend using the `--ff-only` " "option, and further setting it as the default option. Alternatively, `git " @@ -4077,13 +4146,13 @@ msgstr "" "есть изменения, проиндексированные (stage) в ветке `main`." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1419 +#: documentation/content/en/articles/committers-guide/_index.adoc:1435 #, no-wrap msgid "% git config --global pull.ff only\n" msgstr "% git config --global pull.ff only\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1422 +#: documentation/content/en/articles/committers-guide/_index.adoc:1438 msgid "" "You may need to omit the --global if you want this setting to apply to only " "this repository." @@ -4092,7 +4161,7 @@ msgstr "" "настройка применялась только к этому репозиторию." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1428 +#: documentation/content/en/articles/committers-guide/_index.adoc:1444 #, no-wrap msgid "" "% cd freebsd-src\n" @@ -4104,7 +4173,7 @@ msgstr "" "% git pull (--ff-only|--rebase)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1432 +#: documentation/content/en/articles/committers-guide/_index.adoc:1448 msgid "" "There is a common trap, that the combination command `git pull` will try to " "perform a merge, which would sometimes creates a merge commit that didn't " @@ -4115,12 +4184,12 @@ msgstr "" "Восстановление после этого может быть затруднительно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1434 +#: documentation/content/en/articles/committers-guide/_index.adoc:1450 msgid "The longer form is also recommended." msgstr "Рекомендуется также использовать расширенную форму." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1441 +#: documentation/content/en/articles/committers-guide/_index.adoc:1457 #, no-wrap msgid "" "% cd freebsd-src\n" @@ -4134,7 +4203,7 @@ msgstr "" "% git merge --ff-only freebsd/main\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1446 +#: documentation/content/en/articles/committers-guide/_index.adoc:1462 msgid "" "These commands reset your tree to the `main` branch, and then update it from " "where you pulled the tree from originally. It's important to switch to " @@ -4147,13 +4216,13 @@ msgstr "" "продвижение вперёд. Теперь пришло время продвинуть изменения вперёд:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1450 +#: documentation/content/en/articles/committers-guide/_index.adoc:1466 #, no-wrap msgid "% git rebase -i main working\n" msgstr "% git rebase -i main working\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1457 +#: documentation/content/en/articles/committers-guide/_index.adoc:1473 msgid "" "This will bring up an interactive screen to change the defaults. For now, " "just exit the editor. Everything should just apply. If not, then you'll " @@ -4168,13 +4237,13 @@ msgstr "" "rebase[Документация GitHub] может помочь вам в этом процессе." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1459 +#: documentation/content/en/articles/committers-guide/_index.adoc:1475 #, no-wrap msgid "Time to push changes upstream" msgstr "Время отправить (push) изменения вверх (upstream)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1462 +#: documentation/content/en/articles/committers-guide/_index.adoc:1478 msgid "" "First, ensure that the push URL is properly configured for the upstream " "repository." @@ -4183,13 +4252,13 @@ msgstr "" "вышестоящего репозитория." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1466 +#: documentation/content/en/articles/committers-guide/_index.adoc:1482 #, no-wrap msgid "% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git\n" msgstr "% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1470 +#: documentation/content/en/articles/committers-guide/_index.adoc:1486 msgid "" "Then, verify that user name and email are configured right. We require that " "they exactly match the passwd entry in FreeBSD cluster." @@ -4199,18 +4268,18 @@ msgstr "" "кластере FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1472 +#: documentation/content/en/articles/committers-guide/_index.adoc:1488 msgid "Use" msgstr "Использование" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1476 +#: documentation/content/en/articles/committers-guide/_index.adoc:1492 #, no-wrap msgid "freefall% gen-gitconfig.sh\n" msgstr "freefall% gen-gitconfig.sh\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1479 +#: documentation/content/en/articles/committers-guide/_index.adoc:1495 msgid "" "on freefall.freebsd.org to get a recipe that you can use directly, assuming /" "usr/local/bin is in the PATH." @@ -4220,7 +4289,7 @@ msgstr "" "напрямую." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1484 +#: documentation/content/en/articles/committers-guide/_index.adoc:1500 msgid "" "The below command merges the `working` branch into the upstream `main` " "branch. It's important that you curate your changes to be just like you " @@ -4237,13 +4306,13 @@ msgstr "" "если результатом будет линейное изменение для `main` (т.е. без слияний)." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1488 +#: documentation/content/en/articles/committers-guide/_index.adoc:1504 #, no-wrap msgid "% git push freebsd working:main\n" msgstr "% git push freebsd working:main\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1491 +#: documentation/content/en/articles/committers-guide/_index.adoc:1507 msgid "" "If your push is rejected due to losing a commit race, rebase your branch " "before trying again:" @@ -4252,7 +4321,7 @@ msgstr "" "перебазируйте вашу ветку перед повторной попыткой:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1498 +#: documentation/content/en/articles/committers-guide/_index.adoc:1514 #, no-wrap msgid "" "% git checkout working\n" @@ -4266,13 +4335,13 @@ msgstr "" "% git push freebsd working:main\n" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1501 +#: documentation/content/en/articles/committers-guide/_index.adoc:1517 #, no-wrap msgid "Time to push changes upstream (alternative)" msgstr "Время отправить (push) изменения вверх (альтернативный вариант)" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1506 +#: documentation/content/en/articles/committers-guide/_index.adoc:1522 msgid "" "Some people find it easier to merge their changes to their local `main` " "before pushing to the remote repository. Also, `git arc stage` moves " @@ -4285,7 +4354,7 @@ msgstr "" "только часть изменений из ветки. Инструкции схожи с предыдущим разделом:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1511 +#: documentation/content/en/articles/committers-guide/_index.adoc:1527 #, no-wrap msgid "" "% git checkout main\n" @@ -4297,12 +4366,12 @@ msgstr "" "% git push freebsd\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1514 +#: documentation/content/en/articles/committers-guide/_index.adoc:1530 msgid "If you lose the race, then try again with" msgstr "Если вы проиграли гонку, попробуйте снова с" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1518 +#: documentation/content/en/articles/committers-guide/_index.adoc:1534 #, no-wrap msgid "" "% git pull --rebase\n" @@ -4312,7 +4381,7 @@ msgstr "" "% git push freebsd\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1521 +#: documentation/content/en/articles/committers-guide/_index.adoc:1537 msgid "" "These commands will fetch the most recent `freebsd/main` and then rebase the " "local `main` changes on top of that, which is what you want when you lose " @@ -4325,13 +4394,13 @@ msgstr "" "ветки вендоров не будет работать с этой техникой." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1522 +#: documentation/content/en/articles/committers-guide/_index.adoc:1538 #, no-wrap msgid "Finding the Subversion Revision" msgstr "Поиск ревизии Subversion" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1526 +#: documentation/content/en/articles/committers-guide/_index.adoc:1542 msgid "" "You'll need to make sure that you've fetched the notes (see the crossref:" "committers-guide[git-mini-daily-use, Daily use]for details). Once you have " @@ -4343,25 +4412,25 @@ msgstr "" "команде git log следующим образом:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1530 +#: documentation/content/en/articles/committers-guide/_index.adoc:1546 #, no-wrap msgid "% git log\n" msgstr "% git log\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1533 +#: documentation/content/en/articles/committers-guide/_index.adoc:1549 msgid "If you have a specific version in mind, you can use this construct:" msgstr "" "Если у вас есть конкретная версия, вы можете использовать эту конструкцию:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1537 +#: documentation/content/en/articles/committers-guide/_index.adoc:1553 #, no-wrap msgid "% git log --grep revision=XXXX\n" msgstr "% git log --grep revision=XXXX\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1541 +#: documentation/content/en/articles/committers-guide/_index.adoc:1557 msgid "" "to find the specific revision. The hex number after 'commit' is the hash " "you can use to refer to this commit." @@ -4370,13 +4439,13 @@ msgstr "" "хэш, который можно использовать для ссылки на этот коммит." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1543 +#: documentation/content/en/articles/committers-guide/_index.adoc:1559 #, no-wrap msgid "Git FAQ" msgstr "Часто задаваемые вопросы о Git" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1546 +#: documentation/content/en/articles/committers-guide/_index.adoc:1562 msgid "" "This section provides a number of targeted answers to questions that are " "likely to come up often for users and developers." @@ -4385,7 +4454,7 @@ msgstr "" "возникают у пользователей и разработчиков." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1551 +#: documentation/content/en/articles/committers-guide/_index.adoc:1567 msgid "" "We use the common convention of having the origin for the FreeBSD repository " "being 'freebsd' rather than the default 'origin' to allow people to use that " @@ -4398,19 +4467,19 @@ msgstr "" "случайные отправки (push) в неправильный репозиторий." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1553 +#: documentation/content/en/articles/committers-guide/_index.adoc:1569 #, no-wrap msgid "Users" msgstr "Пользователи" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1555 +#: documentation/content/en/articles/committers-guide/_index.adoc:1571 #, no-wrap msgid "How do I track -current and -stable with only one copy of the repository?" msgstr "Как отслеживать -current и -stable, имея только одну копию репозитория?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1560 +#: documentation/content/en/articles/committers-guide/_index.adoc:1576 #, no-wrap msgid "" "**Q:** Although disk space is not a huge issue, it's more efficient to use only one copy of the repository.\n" @@ -4422,7 +4491,7 @@ msgstr "" "Как мне сделать это с помощью Git?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1564 +#: documentation/content/en/articles/committers-guide/_index.adoc:1580 #, no-wrap msgid "" "**A:** You can use Git worktrees.\n" @@ -4434,7 +4503,7 @@ msgstr "" "Хотя использование «голого (bare) репозитория» предлагалось как способ справиться с этим, это более сложно и здесь документироваться не будет.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1567 +#: documentation/content/en/articles/committers-guide/_index.adoc:1583 msgid "" "First, you need to clone the FreeBSD repository, shown here cloning into " "`freebsd-current` to reduce confusion. $URL is whatever mirror works best " @@ -4445,20 +4514,20 @@ msgstr "" "зеркальный сервер, который работает для вас наилучшим образом:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1571 +#: documentation/content/en/articles/committers-guide/_index.adoc:1587 #, no-wrap msgid "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' $URL freebsd-current\n" msgstr "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' $URL freebsd-current\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1574 +#: documentation/content/en/articles/committers-guide/_index.adoc:1590 msgid "then once that's cloned, you can simply create a worktree from it:" msgstr "" "после того, как он будет клонирован, вы можете просто создать рабочее дерево " "из него:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1579 +#: documentation/content/en/articles/committers-guide/_index.adoc:1595 #, no-wrap msgid "" "% cd freebsd-current\n" @@ -4468,7 +4537,7 @@ msgstr "" "% git worktree add ../freebsd-stable-12 stable/12\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1583 +#: documentation/content/en/articles/committers-guide/_index.adoc:1599 msgid "" "this will checkout `stable/12` into a directory named `freebsd-stable-12` " "that's a peer to the `freebsd-current` directory. Once created, it's " @@ -4479,7 +4548,7 @@ msgstr "" "обновляется очень похожим образом, как вы могли бы ожидать:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1593 +#: documentation/content/en/articles/committers-guide/_index.adoc:1609 #, no-wrap msgid "" "% cd freebsd-current\n" @@ -4499,7 +4568,7 @@ msgstr "" "# now your stable/12 is up to date too\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1596 +#: documentation/content/en/articles/committers-guide/_index.adoc:1612 msgid "" "I recommend using `--ff-only` because it's safer and you avoid accidentally " "getting into a 'merge nightmare' where you have an extra change in your " @@ -4511,7 +4580,7 @@ msgstr "" "вместо простого." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1598 +#: documentation/content/en/articles/committers-guide/_index.adoc:1614 msgid "" "Here's https://adventurist.me/posts/00296[a good writeup] that goes into " "more detail." @@ -4520,31 +4589,31 @@ msgstr "" "рассматривается этот вопрос более подробно." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1599 +#: documentation/content/en/articles/committers-guide/_index.adoc:1615 #, no-wrap msgid "Developers" msgstr "Разработчики" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1601 +#: documentation/content/en/articles/committers-guide/_index.adoc:1617 #, no-wrap msgid "Ooops! I committed to `main`, instead of another branch." msgstr "Ой! Я закоммитил в `main` вместо другой ветки." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1604 +#: documentation/content/en/articles/committers-guide/_index.adoc:1620 #, no-wrap msgid "**Q:** From time to time, I goof up and mistakenly commit to the `main` branch. What do I do?\n" msgstr "**В:** Время от времени я ошибаюсь и по ошибке делаю коммит в ветку `main`. Что мне делать?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1606 +#: documentation/content/en/articles/committers-guide/_index.adoc:1622 #, no-wrap msgid "**A:** First, don't panic.\n" msgstr "**О:** Во-первых, не паникуйте.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1610 +#: documentation/content/en/articles/committers-guide/_index.adoc:1626 msgid "" "Second, don't push. In fact, you can fix almost anything if you haven't " "pushed. All the answers in this section assume no push has happened." @@ -4554,7 +4623,7 @@ msgstr "" "предполагают, что отправки не произошло." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1612 +#: documentation/content/en/articles/committers-guide/_index.adoc:1628 msgid "" "The following answer assumes you committed to `main` and want to create a " "branch called `issue`:" @@ -4563,7 +4632,7 @@ msgstr "" "ветку с названием `issue`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1618 +#: documentation/content/en/articles/committers-guide/_index.adoc:1634 #, no-wrap msgid "" "% git checkout -b issue # Create the 'issue' branch\n" @@ -4575,13 +4644,13 @@ msgstr "" "% git checkout issue # Back to where you were\n" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1620 +#: documentation/content/en/articles/committers-guide/_index.adoc:1636 #, no-wrap msgid "Ooops! I committed something to the wrong branch!" msgstr "Ой! Я закоммитил что-то не в ту ветку!" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1624 +#: documentation/content/en/articles/committers-guide/_index.adoc:1640 #, no-wrap msgid "" "**Q:** I was working on feature on the `wilma` branch, but accidentally committed a change relevant to the `fred` branch in 'wilma'.\n" @@ -4591,7 +4660,7 @@ msgstr "" "Что мне делать?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1628 +#: documentation/content/en/articles/committers-guide/_index.adoc:1644 #, no-wrap msgid "" "**A:** The answer is similar to the previous one, but with cherry picking.\n" @@ -4603,7 +4672,7 @@ msgstr "" "Также предполагается, что это последний коммит в ветке wilma (отсюда использование wilma в команде `git cherry-pick`), но и это можно обобщить.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1636 +#: documentation/content/en/articles/committers-guide/_index.adoc:1652 #, no-wrap msgid "" "# We're on branch wilma\n" @@ -4619,7 +4688,7 @@ msgstr "" "% git reset --hard HEAD^\t# move what wilma refers to back 1 commit\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1639 +#: documentation/content/en/articles/committers-guide/_index.adoc:1655 msgid "" "If it is not the last commit, you can cherry-pick that one change from wilma " "onto fred, then use `git rebase -i` to remove the change from wilma." @@ -4629,7 +4698,7 @@ msgstr "" "чтобы удалить изменение из wilma." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1646 +#: documentation/content/en/articles/committers-guide/_index.adoc:1662 #, no-wrap msgid "" "# We're on branch wilma\n" @@ -4643,13 +4712,13 @@ msgstr "" "% git rebase -i main wilma\t\t# удалить скопированное изменение\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1649 +#: documentation/content/en/articles/committers-guide/_index.adoc:1665 #, no-wrap msgid "**Q:** But what if I want to commit a few changes to `main`, but keep the rest in `wilma` for some reason?\n" msgstr "**В:** Но что, если я хочу сделать коммит нескольким изменениям в `main`, но оставить остальные в `wilma` по какой-то причине?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1655 +#: documentation/content/en/articles/committers-guide/_index.adoc:1671 #, no-wrap msgid "" "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\n" @@ -4665,13 +4734,13 @@ msgstr "" "Нет необходимости переключаться обратно на wilma, чтобы её поправить: просто делайте rebase!\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1657 +#: documentation/content/en/articles/committers-guide/_index.adoc:1673 #, no-wrap msgid "**Q:** I want to split off some changes from branch `wilma` into branch `fred`\n" msgstr "**В:** Я хочу выделить некоторые изменения из ветки `wilma` в ветку `fred`\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1663 +#: documentation/content/en/articles/committers-guide/_index.adoc:1679 #, no-wrap msgid "" "**A:** The more general answer would be the same as the previous.\n" @@ -4687,7 +4756,7 @@ msgstr "" "Если нет, вам нужно будет разрешать конфликты по мере их появления.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1668 +#: documentation/content/en/articles/committers-guide/_index.adoc:1684 msgid "" "The other way to do this would be to checkout `wilma` and then create the " "branch `fred` to point to the same point in the tree. You can then `git " @@ -4706,7 +4775,7 @@ msgstr "" "отменить это следующей последовательностью:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1675 +#: documentation/content/en/articles/committers-guide/_index.adoc:1691 #, no-wrap msgid "" "% git checkout pre-split\t# Go back\n" @@ -4720,7 +4789,7 @@ msgstr "" "% git branch -d pre-split\t# Pretend it didn't happen\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1679 +#: documentation/content/en/articles/committers-guide/_index.adoc:1695 msgid "" "The last step is optional. If you are going to try again to split, you'd " "omit it." @@ -4729,7 +4798,7 @@ msgstr "" "разделения, его можно пропустить." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1683 +#: documentation/content/en/articles/committers-guide/_index.adoc:1699 #, no-wrap msgid "" "**Q:** But I did things as I read along and didn't see your advice at the end to create a branch, and now `fred` and `wilma` are all screwed up.\n" @@ -4741,13 +4810,13 @@ msgstr "" "Я не знаю, сколько раз я всё переставлял.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1685 +#: documentation/content/en/articles/committers-guide/_index.adoc:1701 #, no-wrap msgid "**A:** All is not lost. You can figure out it, so long as it hasn't been too long, or too many commits (hundreds).\n" msgstr "**О:** Не всё потеряно. Вы можете разобраться с этим, если прошло не слишком много времени или не было сделано слишком много коммитов (сотни).\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1689 +#: documentation/content/en/articles/committers-guide/_index.adoc:1705 msgid "" "So I created a wilma branch and committed a couple of things to it, then " "decided I wanted to split it into fred and wilma. Nothing weird happened " @@ -4760,7 +4829,7 @@ msgstr "" "использовать `git reflog`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1704 +#: documentation/content/en/articles/committers-guide/_index.adoc:1720 #, no-wrap msgid "" "% git reflog\n" @@ -4790,7 +4859,7 @@ msgstr "" "%\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1712 +#: documentation/content/en/articles/committers-guide/_index.adoc:1728 msgid "" "Here we see the changes I've made. You can use it to figure out where " "things went wrong. I'll just point out a few things here. The first one is " @@ -4806,7 +4875,7 @@ msgstr "" "хэш (первый столбец)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1720 +#: documentation/content/en/articles/committers-guide/_index.adoc:1736 msgid "" "Next, 'Encourage contributions' was the last commit I made to `wilma` before " "I decided to split things up. You can also see the same hash is there when " @@ -4829,7 +4898,7 @@ msgstr "" "другой:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1725 +#: documentation/content/en/articles/committers-guide/_index.adoc:1741 #, no-wrap msgid "" "% git checkout -B wilma 869cbd3\n" @@ -4839,7 +4908,7 @@ msgstr "" "% git branch -D fred\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1732 +#: documentation/content/en/articles/committers-guide/_index.adoc:1748 msgid "" "and you are ready to try again. The `checkout -B` with the hash combines " "checking out and creating a branch for it. The `-B` instead of `-b` forces " @@ -4858,7 +4927,7 @@ msgstr "" "слегка тревожного сообщения об отделённом HEAD:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1738 +#: documentation/content/en/articles/committers-guide/_index.adoc:1754 #, no-wrap msgid "" "% git checkout 869cbd3\n" @@ -4870,7 +4939,7 @@ msgstr "" "Note: checking out '869cbd3'.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1742 +#: documentation/content/en/articles/committers-guide/_index.adoc:1758 #, no-wrap msgid "" "You are in 'detached HEAD' state. You can look around, make experimental\n" @@ -4882,7 +4951,7 @@ msgstr "" "state without impacting any branches by performing another checkout.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1750 +#: documentation/content/en/articles/committers-guide/_index.adoc:1766 #, no-wrap msgid "" "HEAD is now at 869cbd3 Encourage contributions\n" @@ -4892,7 +4961,7 @@ msgstr "" "% git checkout -B wilma\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1753 +#: documentation/content/en/articles/committers-guide/_index.adoc:1769 msgid "" "this produces the same effect, but I have to read a lot more and severed " "heads aren't an image I like to contemplate." @@ -4902,13 +4971,13 @@ msgstr "" "тот образ, который мне нравится созерцать." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1754 +#: documentation/content/en/articles/committers-guide/_index.adoc:1770 #, no-wrap msgid "Ooops! I did a `git pull` and it created a merge commit, what do I do?" msgstr "Ой! Я выполнил `git pull`, и это создало коммит слияния, что мне делать?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1758 +#: documentation/content/en/articles/committers-guide/_index.adoc:1774 #, no-wrap msgid "" "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\n" @@ -4918,20 +4987,20 @@ msgstr "" "Как мне восстановиться?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1760 +#: documentation/content/en/articles/committers-guide/_index.adoc:1776 #, no-wrap msgid "**A:** This can happen when you invoke the pull with your development branch checked out.\n" msgstr "**О:** Это может произойти, когда вы выполняете извлечение (checkout) с выбранной веткой разработки.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1762 +#: documentation/content/en/articles/committers-guide/_index.adoc:1778 msgid "Many developers use `git pull --rebase` to avoid this situation." msgstr "" "Многие разработчики используют `git pull --rebase`, чтобы избежать этой " "ситуации." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1765 +#: documentation/content/en/articles/committers-guide/_index.adoc:1781 msgid "" "Right after the pull, you will have the new merge commit checked out. Git " "supports a `HEAD^#` syntax to examine the parents of a merge commit:" @@ -4941,7 +5010,7 @@ msgstr "" "родителей коммита слияния:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1770 +#: documentation/content/en/articles/committers-guide/_index.adoc:1786 #, no-wrap msgid "" "git log --oneline HEAD^1 # Look at the first parent's commits\n" @@ -4951,7 +5020,7 @@ msgstr "" "git log --oneline HEAD^2 # Look at the second parent's commits\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1774 +#: documentation/content/en/articles/committers-guide/_index.adoc:1790 msgid "" "From those logs, you can easily identify which commit is your development " "work. Then you simply reset your branch to the corresponding `HEAD^#`:" @@ -4961,13 +5030,13 @@ msgstr "" "`HEAD^#`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1778 +#: documentation/content/en/articles/committers-guide/_index.adoc:1794 #, no-wrap msgid "git reset --hard HEAD^1\n" msgstr "git reset --hard HEAD^1\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1781 +#: documentation/content/en/articles/committers-guide/_index.adoc:1797 msgid "" "In addition, a `git pull --rebase` at this stage will rebase your changes to " "'main' to the latest 'freebsd/main'." @@ -4976,13 +5045,13 @@ msgstr "" "изменения из ветки 'main' на последнюю версию 'freebsd/main'." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1783 +#: documentation/content/en/articles/committers-guide/_index.adoc:1799 #, no-wrap msgid "**Q:** But I also need to fix my `main` branch. How do I do that?\n" msgstr "**В:** Но мне также нужно исправить мою ветку `main`. Как мне это сделать?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1786 +#: documentation/content/en/articles/committers-guide/_index.adoc:1802 #, no-wrap msgid "" "**A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.\n" @@ -4992,13 +5061,13 @@ msgstr "" "Чтобы исправить вашу ветку `main`, просто заставьте её указывать на удалённую ветку `main`:\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1790 +#: documentation/content/en/articles/committers-guide/_index.adoc:1806 #, no-wrap msgid "git branch -f main freebsd/main\n" msgstr "git branch -f main freebsd/main\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1795 +#: documentation/content/en/articles/committers-guide/_index.adoc:1811 msgid "" "There's nothing magical about branches in Git: they are just labels on a " "graph that are automatically moved forward by making commits. So the above " @@ -5011,13 +5080,13 @@ msgstr "" "нет никаких метаданных о ветке, которые нужно было бы сохранять." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1796 +#: documentation/content/en/articles/committers-guide/_index.adoc:1812 #, no-wrap msgid "Mixing and matching branches" msgstr "Смешивание и сопоставление веток" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1800 +#: documentation/content/en/articles/committers-guide/_index.adoc:1816 #, no-wrap msgid "" "**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature`\n" @@ -5027,13 +5096,13 @@ msgstr "" "с сохранением коммитов в обеих.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1802 +#: documentation/content/en/articles/committers-guide/_index.adoc:1818 #, no-wrap msgid "**A:** This is a job for cherry pick.\n" msgstr "**О:** Это задача для выборочного применения (cherry-pick).\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1808 +#: documentation/content/en/articles/committers-guide/_index.adoc:1824 #, no-wrap msgid "" "% git checkout worker\n" @@ -5045,7 +5114,7 @@ msgstr "" "% git cherry-pick main..async\t# bring in the changes\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1813 +#: documentation/content/en/articles/committers-guide/_index.adoc:1829 msgid "" "You now have a new branch called `feature`. This branch combines commits " "from both branches. You can further curate it with `git rebase`." @@ -5055,13 +5124,13 @@ msgstr "" "rebase`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1815 +#: documentation/content/en/articles/committers-guide/_index.adoc:1831 #, no-wrap msgid "**Q:** I have a branch called `driver` and I'd like to break it up into `kernel` and `userland` so I can evolve them separately and commit each branch as it becomes ready.\n" msgstr "**В:** У меня есть ветка под названием `driver`, и я хочу разделить её на `kernel` и `userland`, чтобы развивать их отдельно и коммитить каждую ветку по мере её готовности.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1818 +#: documentation/content/en/articles/committers-guide/_index.adoc:1834 #, no-wrap msgid "" "**A:** This takes a little bit of prep work, but `git rebase` will do the heavy\n" @@ -5071,7 +5140,7 @@ msgstr "" "выполнит здесь основную часть работы.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1824 +#: documentation/content/en/articles/committers-guide/_index.adoc:1840 #, no-wrap msgid "" "% git checkout driver\t\t# Checkout the driver\n" @@ -5083,7 +5152,7 @@ msgstr "" "% git checkout -b userland\t# Create userland branch\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1829 +#: documentation/content/en/articles/committers-guide/_index.adoc:1845 msgid "" "Now you have two identical branches. So, it's time to separate out the " "commits. We'll assume first that all the commits in `driver` go into either " @@ -5094,13 +5163,13 @@ msgstr "" "либо в ветку `kernel`, либо в ветку `userland`, но не в обе одновременно." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1833 +#: documentation/content/en/articles/committers-guide/_index.adoc:1849 #, no-wrap msgid "% git rebase -i main kernel\n" msgstr "% git rebase -i main kernel\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1836 +#: documentation/content/en/articles/committers-guide/_index.adoc:1852 msgid "" "and just include the changes you want (with a 'p' or 'pick' line) and just " "delete the commits you don't (this sounds scary, but if worse comes to " @@ -5113,18 +5182,18 @@ msgstr "" "её не переместили)." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1840 +#: documentation/content/en/articles/committers-guide/_index.adoc:1856 #, no-wrap msgid "% git rebase -i main userland\n" msgstr "% git rebase -i main userland\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1843 +#: documentation/content/en/articles/committers-guide/_index.adoc:1859 msgid "and do the same thing you did with the `kernel` branch." msgstr "и сделайте то же самое, что вы сделали с веткой `kernel `." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1846 +#: documentation/content/en/articles/committers-guide/_index.adoc:1862 #, no-wrap msgid "" "**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch.\n" @@ -5134,7 +5203,7 @@ msgstr "" "Как мне восстановиться?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1849 +#: documentation/content/en/articles/committers-guide/_index.adoc:1865 #, no-wrap msgid "" "**A:** You can use the `driver` branch to find the hash of the commit is missing and\n" @@ -5144,7 +5213,7 @@ msgstr "" "выборочно применить его (cherry-pick).\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1855 +#: documentation/content/en/articles/committers-guide/_index.adoc:1871 #, no-wrap msgid "" "% git checkout kernel\n" @@ -5156,7 +5225,7 @@ msgstr "" "% git cherry-pick $HASH\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1861 +#: documentation/content/en/articles/committers-guide/_index.adoc:1877 #, no-wrap msgid "" "**Q:** OK. I have the same situation as the above, but my commits are all mixed up.\n" @@ -5170,7 +5239,7 @@ msgstr "" "Ваш метод перебазирования с выбором кажется сложным.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1864 +#: documentation/content/en/articles/committers-guide/_index.adoc:1880 #, no-wrap msgid "" "**A:** In this situation, you'd be better off to curate the original branch to separate\n" @@ -5180,7 +5249,7 @@ msgstr "" "коммиты, а затем использовать вышеуказанный метод для разделения ветки.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1869 +#: documentation/content/en/articles/committers-guide/_index.adoc:1885 msgid "" "So let's assume that there's just one commit with a clean tree. You can " "either use `git rebase` with an `edit` line, or you can use this with the " @@ -5194,13 +5263,13 @@ msgstr "" "откатиться на один коммит назад, оставив изменения незакоммиченными в дереве:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1873 +#: documentation/content/en/articles/committers-guide/_index.adoc:1889 #, no-wrap msgid "% git reset HEAD^\n" msgstr "% git reset HEAD^\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1876 +#: documentation/content/en/articles/committers-guide/_index.adoc:1892 msgid "" "Note: Do not, repeat do not, add `--hard` here since that also removes the " "changes from your tree." @@ -5209,7 +5278,7 @@ msgstr "" "удалит изменения из вашего дерева." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1880 +#: documentation/content/en/articles/committers-guide/_index.adoc:1896 msgid "" "Now, if you are lucky, the change needing to be split up falls entirely " "along file lines. In that case you can just do the usual `git add` for the " @@ -5225,7 +5294,7 @@ msgstr "" "(хотя `git log $HASH` может его восстановить)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1883 +#: documentation/content/en/articles/committers-guide/_index.adoc:1899 msgid "" "If you are not lucky, you'll need to split apart files. There's another " "tool to do that which you can apply one file at a time." @@ -5234,13 +5303,13 @@ msgstr "" "один инструмент, который можно применять по одному файлу за раз." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1887 +#: documentation/content/en/articles/committers-guide/_index.adoc:1903 #, no-wrap msgid "git add -i foo/bar.c\n" msgstr "git add -i foo/bar.c\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1893 +#: documentation/content/en/articles/committers-guide/_index.adoc:1909 msgid "" "will step through the diffs, prompting you, one at time, whether to include " "or exclude the hunk. Once you're done, `git commit` and you'll have the " @@ -5256,19 +5325,19 @@ msgstr "" "объединения связанных коммитов)." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1894 +#: documentation/content/en/articles/committers-guide/_index.adoc:1910 #, no-wrap msgid "Joining the FreeBSD GitHub oranization." msgstr "Присоединение к организации FreeBSD на GitHub." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1897 +#: documentation/content/en/articles/committers-guide/_index.adoc:1913 #, no-wrap msgid "**Q:** How do I join the FreeBSD GitHub organization?\n" msgstr "**В:** Как присоединиться к организации FreeBSD на GitHub?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1901 +#: documentation/content/en/articles/committers-guide/_index.adoc:1917 #, no-wrap msgid "" "**A:** Please see https://wiki.freebsd.org/GitHub#Joining_the_Organisation[our GitHub Wiki Info] page for details.\n" @@ -5280,31 +5349,31 @@ msgstr "" "Лица, не являющиеся коммиттерами, которые запрашивают присоединение, будут рассматриваться в индивидуальном порядке.\n" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1902 +#: documentation/content/en/articles/committers-guide/_index.adoc:1918 #, no-wrap msgid "Cloning and Mirroring" msgstr "Клонирование и зеркалирование" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1905 +#: documentation/content/en/articles/committers-guide/_index.adoc:1921 #, no-wrap msgid "**Q:** I'd like to mirror the entire Git repository, how do I do that?\n" msgstr "**В:** Я хочу создать полную зеркальную копию репозитория Git, как мне это сделать?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1907 +#: documentation/content/en/articles/committers-guide/_index.adoc:1923 #, no-wrap msgid "**A:** If all you want to do is mirror, then\n" msgstr "**О:** Если вам нужно только зеркалирование, то\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1911 +#: documentation/content/en/articles/committers-guide/_index.adoc:1927 #, no-wrap msgid "% git clone --mirror $URL\n" msgstr "% git clone --mirror $URL\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1915 +#: documentation/content/en/articles/committers-guide/_index.adoc:1931 msgid "" "will do the trick. However, there are two disadvantages to this if you want " "to use it for anything other than a mirror you'll reclone." @@ -5313,7 +5382,7 @@ msgstr "" "это для чего-то кроме зеркала, которое вы будете переклонировать." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1919 +#: documentation/content/en/articles/committers-guide/_index.adoc:1935 msgid "" "First, this is a 'bare repository' which has the repository database, but no " "checked out worktree. This is great for mirroring, but terrible for day to " @@ -5325,7 +5394,7 @@ msgstr "" "способов обойти это с помощью `git worktree`:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1927 +#: documentation/content/en/articles/committers-guide/_index.adoc:1943 #, no-wrap msgid "" "% git clone --mirror https://git.freebsd.org/ports.git ports.git\n" @@ -5341,7 +5410,7 @@ msgstr "" "% cd ../ports\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1930 +#: documentation/content/en/articles/committers-guide/_index.adoc:1946 msgid "" "But if you aren't using your mirror for further local clones, then it's a " "poor match." @@ -5350,7 +5419,7 @@ msgstr "" "локального клонирования, то это неподходящий выбор." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1933 +#: documentation/content/en/articles/committers-guide/_index.adoc:1949 msgid "" "The second disadvantage is that Git normally rewrites the refs (branch name, " "tags, etc) from upstream so that your local refs can evolve independently of " @@ -5364,13 +5433,13 @@ msgstr "" "репозиторий куда-либо, кроме веток приватных проектов." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1935 +#: documentation/content/en/articles/committers-guide/_index.adoc:1951 #, no-wrap msgid "**Q:** So what can I do instead?\n" msgstr "**В:** Так что же я могу сделать вместо этого?\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1938 +#: documentation/content/en/articles/committers-guide/_index.adoc:1954 #, no-wrap msgid "" "**A:** Well, you can stuff all of the upstream repository's refs into a private namespace in your local repository.\n" @@ -5380,18 +5449,18 @@ msgstr "" "Git клонирует всё через 'refspec', и refspec по умолчанию выглядит так:\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1942 +#: documentation/content/en/articles/committers-guide/_index.adoc:1958 #, no-wrap msgid " fetch = +refs/heads/*:refs/remotes/freebsd/*\n" msgstr " fetch = +refs/heads/*:refs/remotes/freebsd/*\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1945 +#: documentation/content/en/articles/committers-guide/_index.adoc:1961 msgid "which says just fetch the branch refs." msgstr "что говорит просто получить (fetch) ссылки веток." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1949 +#: documentation/content/en/articles/committers-guide/_index.adoc:1965 msgid "" "However, the FreeBSD repository has a number of other things in it. To see " "those, you can add explicit refspecs for each ref namespace, or you can " @@ -5402,13 +5471,13 @@ msgstr "" "ссылок или получить всё. Чтобы настроить ваш репозиторий для этого:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1953 +#: documentation/content/en/articles/committers-guide/_index.adoc:1969 #, no-wrap msgid "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'\n" msgstr "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1957 +#: documentation/content/en/articles/committers-guide/_index.adoc:1973 msgid "" "which will put everything in the upstream repository into your local " "repository's `refs/freebsd/` namespace. Please note, that this also grabs " @@ -5421,7 +5490,7 @@ msgstr "" "ними ссылок довольно велико." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1959 +#: documentation/content/en/articles/committers-guide/_index.adoc:1975 msgid "" "You'll need to refer to these 'refs' with their full name because they " "aren't in and of Git's regular namespaces." @@ -5430,26 +5499,26 @@ msgstr "" "не входят в обычные пространства имён Git." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1963 +#: documentation/content/en/articles/committers-guide/_index.adoc:1979 #, no-wrap msgid "git log refs/freebsd/vendor/zlib/1.2.10\n" msgstr "git log refs/freebsd/vendor/zlib/1.2.10\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1966 +#: documentation/content/en/articles/committers-guide/_index.adoc:1982 msgid "" "would look at the log for the vendor branch for zlib starting at 1.2.10." msgstr "" "будет просматривать журнал ветки вендора для zlib, начиная с версии 1.2.10." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1967 +#: documentation/content/en/articles/committers-guide/_index.adoc:1983 #, no-wrap msgid "Collaborating with others" msgstr "Сотрудничество с другими" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1971 +#: documentation/content/en/articles/committers-guide/_index.adoc:1987 msgid "" "One of the keys to good software development on a project as large as " "FreeBSD is the ability to collaborate with others before you push your " @@ -5469,7 +5538,7 @@ msgstr "" "изменениями в ветке, созданной пользователем." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1973 +#: documentation/content/en/articles/committers-guide/_index.adoc:1989 msgid "" "The following instructions show how to set up a user-generated branch, based " "on the FreeBSD `main` branch, and push it to GitHub." @@ -5478,7 +5547,7 @@ msgstr "" "основе ветки FreeBSD `main` и отправить её в GitHub." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1976 +#: documentation/content/en/articles/committers-guide/_index.adoc:1992 msgid "" "Before you begin, make sure that your local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -5489,7 +5558,7 @@ msgstr "" "committers-guide[keeping_current,выше]." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1982 +#: documentation/content/en/articles/committers-guide/_index.adoc:1998 #, no-wrap msgid "" "% git remote -v\n" @@ -5501,7 +5570,7 @@ msgstr "" "freebsd ssh://git@gitrepo.freebsd.org/src.git (push)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1986 +#: documentation/content/en/articles/committers-guide/_index.adoc:2002 msgid "" "The first step is to create a fork of https://github.com/freebsd/freebsd-" "src[FreeBSD] on GitHub following these https://docs.github.com/en/github/" @@ -5514,14 +5583,14 @@ msgstr "" "должен быть ваш собственный, личный аккаунт на GitHub (в моём случае gvnn3)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1988 +#: documentation/content/en/articles/committers-guide/_index.adoc:2004 msgid "Now add a remote on your local system that points to your fork:" msgstr "" "Теперь добавьте удалённый репозиторий в вашей локальной системе, который " "указывает на ваш форк:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1996 +#: documentation/content/en/articles/committers-guide/_index.adoc:2012 #, no-wrap msgid "" "% git remote add github git@github.com:gvnn3/freebsd-src.git\n" @@ -5539,7 +5608,7 @@ msgstr "" "freebsd\tssh://git@gitrepo.freebsd.org/src.git (push)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1999 +#: documentation/content/en/articles/committers-guide/_index.adoc:2015 msgid "" "With this in place you can create a branch crossref:committers-" "guide[keeping_a_local_branch,as shown above]." @@ -5548,13 +5617,13 @@ msgstr "" "guide[keeping_a_local_branch,как показано выше]." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2003 +#: documentation/content/en/articles/committers-guide/_index.adoc:2019 #, no-wrap msgid "% git checkout -b gnn-pr2001-fix\n" msgstr "% git checkout -b gnn-pr2001-fix\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2007 +#: documentation/content/en/articles/committers-guide/_index.adoc:2023 msgid "" "Make whatever modifications you wish in your branch. Build, test, and once " "you're ready to collaborate with others it's time to push your changes into " @@ -5569,7 +5638,7 @@ msgstr "" "Git сообщит при первой попытке отправки в ваш удалённый репозиторий +github+:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2013 +#: documentation/content/en/articles/committers-guide/_index.adoc:2029 #, no-wrap msgid "" "% git push github\n" @@ -5581,20 +5650,20 @@ msgstr "" "To push the current branch and set the remote as upstream, use\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2015 +#: documentation/content/en/articles/committers-guide/_index.adoc:2031 #, no-wrap msgid " git push --set-upstream github gnn-pr2001-fix\n" msgstr " git push --set-upstream github gnn-pr2001-fix\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2018 +#: documentation/content/en/articles/committers-guide/_index.adoc:2034 msgid "Setting the push as +git+ advises allows it to succeed:" msgstr "" "Если установить параметры отправки (push) так, как советует +git+, то это " "позволяет ей успешно выполниться:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2052 #, no-wrap msgid "" "% git push --set-upstream github gnn-feature\n" @@ -5630,14 +5699,14 @@ msgstr "" "Branch 'gnn-feature' set up to track remote branch 'gnn-feature' from 'github'.\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2039 +#: documentation/content/en/articles/committers-guide/_index.adoc:2055 msgid "Subsequent changes to the same branch will push correctly by default:" msgstr "" "Последующие изменения в той же ветке будут по умолчанию отправляться " "корректно:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2052 +#: documentation/content/en/articles/committers-guide/_index.adoc:2068 #, no-wrap msgid "" "% git push\n" @@ -5663,7 +5732,7 @@ msgstr "" " 9e5243d7b659..cf6aeb8d7dda gnn-feature -> gnn-feature\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2056 +#: documentation/content/en/articles/committers-guide/_index.adoc:2072 msgid "" "At this point your work is now in your branch on +GitHub+ and you can share " "the link with other collaborators." @@ -5672,13 +5741,13 @@ msgstr "" "поделиться ссылкой с другими участниками." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2058 +#: documentation/content/en/articles/committers-guide/_index.adoc:2074 #, no-wrap msgid "Landing a github pull request" msgstr "Обработка запросов на принятие изменений (pull request) на github" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2063 +#: documentation/content/en/articles/committers-guide/_index.adoc:2079 msgid "" "This section documents how to land a GitHub pull request that's submitted " "against the FreeBSD Git mirrors at GitHub. While this is not an official " @@ -5700,7 +5769,7 @@ msgstr "" "все изменения и убедиться, что они в точности соответствуют заявленным." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2067 +#: documentation/content/en/articles/committers-guide/_index.adoc:2083 msgid "" "Before beginning, make sure that the local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -5712,7 +5781,7 @@ msgstr "" "источники:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2074 +#: documentation/content/en/articles/committers-guide/_index.adoc:2090 #, no-wrap msgid "" "% git remote -v\n" @@ -5728,7 +5797,7 @@ msgstr "" "github https://github.com/freebsd/freebsd-src (fetch)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2089 +#: documentation/content/en/articles/committers-guide/_index.adoc:2105 msgid "" "Often pull requests are simple: requests that contain only a single commit. " "In this case, a streamlined approach may be used, though the approach in the " @@ -5780,7 +5849,7 @@ msgstr "" "вредоносного кода." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2093 +#: documentation/content/en/articles/committers-guide/_index.adoc:2109 msgid "" "In addition, please check to make sure that the pull request author name is " "not anonymous. Github's web editing interface generates names like:" @@ -5790,13 +5859,13 @@ msgstr "" "генерирует имена вида:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2096 +#: documentation/content/en/articles/committers-guide/_index.adoc:2112 #, no-wrap msgid "Author: github-user <38923459+github-user@users.noreply.github.com>\n" msgstr "Author: github-user <38923459+github-user@users.noreply.github.com>\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2099 +#: documentation/content/en/articles/committers-guide/_index.adoc:2115 msgid "" "A polite request to the author for a better name and/or email should be " "made. Extra care should be taken to ensure no style issue or malicious code " @@ -5807,7 +5876,7 @@ msgstr "" "не допустить ошибок стиля или внедрения вредоносного кода." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2112 +#: documentation/content/en/articles/committers-guide/_index.adoc:2128 #, no-wrap msgid "" "% git fetch github pull/$PR/head:staging\n" @@ -5831,7 +5900,7 @@ msgstr "" "% git push freebsd --push-option=confirm-author\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2117 +#: documentation/content/en/articles/committers-guide/_index.adoc:2133 msgid "" "For complicated pull requests that have multiple commits with conflicts, " "follow the following outline." @@ -5840,17 +5909,17 @@ msgstr "" "содержащими конфликты, следуйте приведённой ниже схеме." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2119 +#: documentation/content/en/articles/committers-guide/_index.adoc:2135 msgid "checkout the pull request `git checkout github/pull/XXX`" msgstr "извлеките запрос на принятие изменений `git checkout github/pull/XXX`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2120 +#: documentation/content/en/articles/committers-guide/_index.adoc:2136 msgid "create a branch to rebase `git checkout -b staging`" msgstr "создайте ветку для перебазирования `git checkout -b staging`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2121 +#: documentation/content/en/articles/committers-guide/_index.adoc:2137 msgid "" "rebase the `staging` branch to the latest `main` with `git rebase -i main " "staging`" @@ -5859,28 +5928,28 @@ msgstr "" "rebase -i main staging`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2122 +#: documentation/content/en/articles/committers-guide/_index.adoc:2138 msgid "resolve conflicts and do whatever testing is needed" msgstr "разрешите конфликты и проведите все необходимые тестирования" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2123 +#: documentation/content/en/articles/committers-guide/_index.adoc:2139 msgid "fast forward the `staging` branch into `main` as above" msgstr "перемотайте (fast-forward) ветку `staging` в `main`, как описано выше" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2124 +#: documentation/content/en/articles/committers-guide/_index.adoc:2140 msgid "final sanity check of changes to make sure all is well" msgstr "" "сделайте финальную проверку изменений, чтобы убедиться, что всё в порядке" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2125 +#: documentation/content/en/articles/committers-guide/_index.adoc:2141 msgid "push to FreeBSD's Git repository." msgstr "отправьте в репозиторий Git FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2127 +#: documentation/content/en/articles/committers-guide/_index.adoc:2143 msgid "" "This will also work when bringing branches developed elsewhere into the " "local tree for committing." @@ -5889,7 +5958,7 @@ msgstr "" "локальное дерево для коммита." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2130 +#: documentation/content/en/articles/committers-guide/_index.adoc:2146 msgid "" "Once finished with the pull request, close it using GitHub's web interface. " "It is worth noting that if your `github` origin uses `https://`, the only " @@ -5902,18 +5971,18 @@ msgstr "" "изменений." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2132 +#: documentation/content/en/articles/committers-guide/_index.adoc:2148 #, no-wrap msgid "Version Control History" msgstr "История системы контроля версий" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2135 +#: documentation/content/en/articles/committers-guide/_index.adoc:2151 msgid "The project has moved to crossref:committers-guide[git-primer,git]." msgstr "Проект перешёл на crossref:committers-guide[git-primer,git]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2141 +#: documentation/content/en/articles/committers-guide/_index.adoc:2157 msgid "" "The FreeBSD source repository switched from CVS to Subversion on May 31st, " "2008. The first real SVN commit is __r179447__. The source repository " @@ -5928,7 +5997,7 @@ msgstr "" "__5ef5f51d2bef80b0ede9b10ad5b0e9440b60518c__." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2147 +#: documentation/content/en/articles/committers-guide/_index.adoc:2163 msgid "" "The FreeBSD `doc/www` repository switched from CVS to Subversion on May " "19th, 2012. The first real SVN commit is __r38821__. The documentation " @@ -5943,7 +6012,7 @@ msgstr "" "__3be01a475855e7511ad755b2defd2e0da5d58bbe__." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2153 +#: documentation/content/en/articles/committers-guide/_index.adoc:2169 msgid "" "The FreeBSD `ports` repository switched from CVS to Subversion on July 14th, " "2012. The first real SVN commit is __r300894__. The ports repository " @@ -5958,13 +6027,13 @@ msgstr "" "__ed8d3eda309dd863fb66e04bccaa513eee255cbf__." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2155 +#: documentation/content/en/articles/committers-guide/_index.adoc:2171 #, no-wrap msgid "Setup, Conventions, and Traditions" msgstr "Настройка, соглашения и традиции" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2160 +#: documentation/content/en/articles/committers-guide/_index.adoc:2176 msgid "" "There are a number of things to do as a new developer. The first set of " "steps is specific to committers only. These steps must be done by a mentor " @@ -5975,13 +6044,13 @@ msgstr "" "выполнены наставником для тех, кто не является коммиттером." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2162 +#: documentation/content/en/articles/committers-guide/_index.adoc:2178 #, no-wrap msgid "For New Committers" msgstr "Для новых коммиттеров" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2165 +#: documentation/content/en/articles/committers-guide/_index.adoc:2181 msgid "" "Those who have been given commit rights to the FreeBSD repositories must " "follow these steps." @@ -5990,13 +6059,13 @@ msgstr "" "выполнить следующие шаги." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2167 +#: documentation/content/en/articles/committers-guide/_index.adoc:2183 msgid "Get mentor approval before committing each of these changes!" msgstr "" "Получите одобрение наставника перед внесением каждого из этих изменений!" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2168 +#: documentation/content/en/articles/committers-guide/_index.adoc:2184 msgid "" "All [.filename]#src# commits go to FreeBSD-CURRENT first before being merged " "to FreeBSD-STABLE. The FreeBSD-STABLE branch must maintain ABI and API " @@ -6009,18 +6078,18 @@ msgstr "" "слияние изменений, нарушающих эту совместимость." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2173 +#: documentation/content/en/articles/committers-guide/_index.adoc:2189 #, no-wrap msgid "*Steps for New Committers*\n" msgstr "*Шаги для новых коммиттеров*\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2175 +#: documentation/content/en/articles/committers-guide/_index.adoc:2191 msgid "Add an Author Entity" msgstr "Добавить автора" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2177 +#: documentation/content/en/articles/committers-guide/_index.adoc:2193 msgid "" "[.filename]#doc/shared/authors.adoc# - Add an author entity. Later steps " "depend on this entity, and missing this step will cause the [.filename]#doc/" @@ -6033,12 +6102,12 @@ msgstr "" "остаётся хорошим первым испытанием навыков работы с системой контроля версий." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2178 +#: documentation/content/en/articles/committers-guide/_index.adoc:2194 msgid "Update the List of Developers and Contributors" msgstr "Обновить список разработчиков и участников" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2180 +#: documentation/content/en/articles/committers-guide/_index.adoc:2196 msgid "" "[.filename]#doc/shared/contrib-committers.adoc# - Add an entry, which will " "then appear in the \"Developers\" section of the extref:{contributors}" @@ -6049,7 +6118,7 @@ msgstr "" "контрибьюторов, staff-committers]. Записи сортируются по фамилии." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2182 +#: documentation/content/en/articles/committers-guide/_index.adoc:2198 msgid "" "[.filename]#doc/shared/contrib-additional.adoc# - _Remove_ the entry. " "Entries are sorted by first name." @@ -6058,12 +6127,12 @@ msgstr "" "отсортированы по имени." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2183 +#: documentation/content/en/articles/committers-guide/_index.adoc:2199 msgid "Add a News Item" msgstr "Добавить статью в Новости" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2185 +#: documentation/content/en/articles/committers-guide/_index.adoc:2201 msgid "" "[.filename]#doc/website/data/en/news/news.toml# - Add an entry. Look for the " "other entries that announce new committers and follow the format. Use the " @@ -6074,12 +6143,12 @@ msgstr "" "Используйте дату из письма об утверждении коммиттерских прав." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2186 +#: documentation/content/en/articles/committers-guide/_index.adoc:2202 msgid "Add a PGP Key" msgstr "Добавить PGP-ключ" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2188 +#: documentation/content/en/articles/committers-guide/_index.adoc:2204 msgid "" "`{des}` has written a shell script ([.filename]#doc/documentation/tools/" "addkey.sh#) to make this easier. See the https://cgit.freebsd.org/doc/plain/" @@ -6091,7 +6160,7 @@ msgstr "" "documentation/static/pgpkeys/README[README]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2190 +#: documentation/content/en/articles/committers-guide/_index.adoc:2206 msgid "" "Use [.filename]#doc/documentation/tools/checkkey.sh# to verify that keys " "meet minimal best-practices standards." @@ -6100,7 +6169,7 @@ msgstr "" "что ключи соответствуют как минимум минимальным стандартам лучших практик." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2192 +#: documentation/content/en/articles/committers-guide/_index.adoc:2208 msgid "" "After adding and checking a key, add both updated files to source control " "and then commit them. Entries in this file are sorted by last name." @@ -6110,7 +6179,7 @@ msgstr "" "отсортированы по фамилии." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2196 +#: documentation/content/en/articles/committers-guide/_index.adoc:2212 msgid "" "It is very important to have a current PGP/GnuPG key in the repository. The " "key may be required for positive identification of a committer. For example, " @@ -6126,12 +6195,12 @@ msgstr "" "pgpkeys.txt]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2198 +#: documentation/content/en/articles/committers-guide/_index.adoc:2214 msgid "Update Mentor and Mentee Information" msgstr "Обновить информацию о наставнике и подопечном" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2200 +#: documentation/content/en/articles/committers-guide/_index.adoc:2216 msgid "" "[.filename]#src/share/misc/committers-<repository>.dot# - Add an entry to " "the current committers section, where _repository_ is `doc`, `ports`, or " @@ -6142,7 +6211,7 @@ msgstr "" "в зависимости от предоставленных прав коммита." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2202 +#: documentation/content/en/articles/committers-guide/_index.adoc:2218 msgid "" "Add an entry for each additional mentor/mentee relationship in the bottom " "section." @@ -6151,12 +6220,12 @@ msgstr "" "нижнем разделе." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2203 +#: documentation/content/en/articles/committers-guide/_index.adoc:2219 msgid "Update git mailmap file" msgstr "Обновить файл mailmap в git" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2205 +#: documentation/content/en/articles/committers-guide/_index.adoc:2221 msgid "" "[.filename]#src/.mailmap#, [.filename]#doc/.mailmap#, and [.filename]#ports/." "mailmap# - Add an entry for commits you created prior to becoming a FreeBSD " @@ -6167,7 +6236,7 @@ msgstr "" "коммиттера FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2208 +#: documentation/content/en/articles/committers-guide/_index.adoc:2224 msgid "" "Mapping to your FreeBSD address allows us to track external committers who " "may be ready for a commit bit more easily. You can also use this to correct " @@ -6179,12 +6248,12 @@ msgstr "" "д. в стандартном выводе `git log`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2209 +#: documentation/content/en/articles/committers-guide/_index.adoc:2225 msgid "Generate a Kerberos Password" msgstr "Сгенерировать пароль Kerberos" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2211 +#: documentation/content/en/articles/committers-guide/_index.adoc:2227 msgid "" "See crossref:committers-guide[kerberos-ldap, Kerberos and LDAP web Password " "for FreeBSD Cluster] to generate or set a Kerberos account for use with " @@ -6198,12 +6267,12 @@ msgstr "" "запись для отслеживания ошибок как часть этого шага)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2212 +#: documentation/content/en/articles/committers-guide/_index.adoc:2228 msgid "Optional: Enable Wiki Account" msgstr "Необязательно: Включить учётную запись Вики" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2216 +#: documentation/content/en/articles/committers-guide/_index.adoc:2232 msgid "" "link:https://wiki.freebsd.org[FreeBSD Wiki] Account - A wiki account allows " "sharing projects and ideas. Those who do not yet have an account can follow " @@ -6219,12 +6288,12 @@ msgstr "" "учётной записью на Вики." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2217 +#: documentation/content/en/articles/committers-guide/_index.adoc:2233 msgid "Optional: Update Wiki Information" msgstr "Необязательно: Обновить информацию в Вики" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2219 +#: documentation/content/en/articles/committers-guide/_index.adoc:2235 msgid "" "Wiki Information - After gaining access to the wiki, some people add entries " "to the https://wiki.freebsd.org/HowWeGotHere[How We Got Here], https://wiki." @@ -6239,12 +6308,12 @@ msgstr "" "Cats[Кошки FreeBSD]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2220 +#: documentation/content/en/articles/committers-guide/_index.adoc:2236 msgid "Optional: Update Ports with Personal Information" msgstr "Необязательно: Обновить порты с личной информацией" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2222 +#: documentation/content/en/articles/committers-guide/_index.adoc:2238 msgid "" "[.filename]#ports/astro/xearth/files/freebsd.committers.markers# and [." "filename]#src/usr.bin/calendar/calendars/calendar.freebsd# - Some people add " @@ -6257,12 +6326,12 @@ msgstr "" "дату своего дня рождения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2223 +#: documentation/content/en/articles/committers-guide/_index.adoc:2239 msgid "Optional: Prevent Duplicate Mailings" msgstr "Необязательно: Предотвращение повторных рассылок" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2225 +#: documentation/content/en/articles/committers-guide/_index.adoc:2241 msgid "" "Subscribers to {dev-commits-doc-all}, {dev-commits-ports-all} or {dev-" "commits-src-all} might wish to unsubscribe to avoid receiving duplicate " @@ -6273,13 +6342,13 @@ msgstr "" "сообщений о коммитах и ответов на них." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2228 +#: documentation/content/en/articles/committers-guide/_index.adoc:2244 #, no-wrap msgid "For Everyone" msgstr "Для всех" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2234 +#: documentation/content/en/articles/committers-guide/_index.adoc:2250 msgid "" "Introduce yourself to the other developers, otherwise no one will have any " "idea who you are or what you are working on. The introduction need not be a " @@ -6295,7 +6364,7 @@ msgstr "" "начнёте свой путь!" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2235 +#: documentation/content/en/articles/committers-guide/_index.adoc:2251 msgid "" "Log into `freefall.FreeBSD.org` and create a [.filename]#/var/forward/user# " "(where _user_ is your username) file containing the e-mail address where you " @@ -6317,7 +6386,7 @@ msgstr "" "другом месте." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2239 +#: documentation/content/en/articles/committers-guide/_index.adoc:2255 msgid "" "If your e-mail system uses SPF with strict rules, you should exclude `mx2." "FreeBSD.org` from SPF checks." @@ -6326,7 +6395,7 @@ msgstr "" "вам следует исключить `mx2.FreeBSD.org` из проверок SPF." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2242 +#: documentation/content/en/articles/committers-guide/_index.adoc:2258 msgid "" "Due to the severe load dealing with SPAM places on the central mail servers " "that do the mailing list processing, the front-end server does do some basic " @@ -6347,7 +6416,7 @@ msgstr "" "org`." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2246 +#: documentation/content/en/articles/committers-guide/_index.adoc:2262 msgid "" "Those who are developers but not committers will not be subscribed to the " "committers or developers mailing lists. The subscriptions are derived from " @@ -6358,13 +6427,13 @@ msgstr "" "доступа." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:2250 +#: documentation/content/en/articles/committers-guide/_index.adoc:2266 #, no-wrap msgid "SMTP Access Setup" msgstr "Настройка доступа SMTP" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2253 +#: documentation/content/en/articles/committers-guide/_index.adoc:2269 msgid "" "For those willing to send e-mail messages through the FreeBSD.org " "infrastructure, follow the instructions below:" @@ -6373,24 +6442,24 @@ msgstr "" "FreeBSD.org, следуйте приведённым ниже инструкциям:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2257 +#: documentation/content/en/articles/committers-guide/_index.adoc:2273 msgid "Point your mail client at `smtp.FreeBSD.org:587`." msgstr "Направьте ваш почтовый клиент на `smtp.FreeBSD.org:587`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2258 +#: documentation/content/en/articles/committers-guide/_index.adoc:2274 msgid "Enable STARTTLS." msgstr "Включить STARTTLS." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2259 +#: documentation/content/en/articles/committers-guide/_index.adoc:2275 msgid "Ensure your `From:` address is set to `_yourusername_@FreeBSD.org`." msgstr "" "Убедитесь, что ваш адрес `From:` установлен как " "`_вашеимяпользователя_@FreeBSD.org`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2261 +#: documentation/content/en/articles/committers-guide/_index.adoc:2277 msgid "" "For authentication, you can use your FreeBSD Kerberos username and password " "(see crossref:committers-guide[kerberos-ldap, Kerberos and LDAP web Password " @@ -6404,18 +6473,18 @@ msgstr "" "аутентификации к почтовым ресурсам." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2265 +#: documentation/content/en/articles/committers-guide/_index.adoc:2281 msgid "Do not include `@FreeBSD.org` when entering in your username." msgstr "При вводе имени пользователя не включайте `@FreeBSD.org`." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2267 +#: documentation/content/en/articles/committers-guide/_index.adoc:2283 #, no-wrap msgid "Additional Notes" msgstr "Дополнительные заметки" #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2271 +#: documentation/content/en/articles/committers-guide/_index.adoc:2287 msgid "" "Will only accept mail from `_yourusername_@FreeBSD.org`. If you are " "authenticated as one user, you are not permitted to send mail from another." @@ -6425,7 +6494,7 @@ msgstr "" "от другого." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2272 +#: documentation/content/en/articles/committers-guide/_index.adoc:2288 msgid "" "A header will be appended with the SASL username: (`Authenticated sender: " "_username_`)." @@ -6434,7 +6503,7 @@ msgstr "" "(`Authenticated sender: _имя_пользователя_`)." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:2273 +#: documentation/content/en/articles/committers-guide/_index.adoc:2289 msgid "" "Host has various rate limits in place to cut down on brute force attempts." msgstr "" @@ -6442,13 +6511,13 @@ msgstr "" "взлома перебором паролей." #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:2277 +#: documentation/content/en/articles/committers-guide/_index.adoc:2293 #, no-wrap msgid "Using a Local MTA to Forward Emails to the FreeBSD.org SMTP Service" msgstr "Использование локального MTA для пересылки электронной почты в SMTP-сервис FreeBSD.org" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2280 +#: documentation/content/en/articles/committers-guide/_index.adoc:2296 msgid "" "It is also possible to use a local MTA to forward locally sent emails to the " "FreeBSD.org SMTP servers." @@ -6457,13 +6526,13 @@ msgstr "" "отправленных писем на SMTP-серверы FreeBSD.org." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2282 +#: documentation/content/en/articles/committers-guide/_index.adoc:2298 #, no-wrap msgid "Using Postfix" msgstr "Использование Postfix" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2287 +#: documentation/content/en/articles/committers-guide/_index.adoc:2303 msgid "" "To tell a local Postfix instance that anything from `_yourusername_@FreeBSD." "org` should be forwarded to the FreeBSD.org servers, add this to your [." @@ -6474,7 +6543,7 @@ msgstr "" "FreeBSD.org, добавьте это в ваш [.filename]#main.cf#:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2295 +#: documentation/content/en/articles/committers-guide/_index.adoc:2311 #, no-wrap msgid "" "sender_dependent_relayhost_maps = hash:/usr/local/etc/postfix/relayhost_maps\n" @@ -6490,7 +6559,7 @@ msgstr "" "smtp_use_tls = yes\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2298 +#: documentation/content/en/articles/committers-guide/_index.adoc:2314 msgid "" "Create [.filename]#/usr/local/etc/postfix/relayhost_maps# with the following " "content:" @@ -6499,13 +6568,13 @@ msgstr "" "следующим содержимым:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2302 +#: documentation/content/en/articles/committers-guide/_index.adoc:2318 #, no-wrap msgid "yourusername@FreeBSD.org [smtp.freebsd.org]:587\n" msgstr "вашеимяпользователя@FreeBSD.org [smtp.freebsd.org]:587\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2305 +#: documentation/content/en/articles/committers-guide/_index.adoc:2321 msgid "" "Create [.filename]#/usr/local/etc/postfix/sasl_passwd# with the following " "content:" @@ -6514,13 +6583,13 @@ msgstr "" "содержимым:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2309 +#: documentation/content/en/articles/committers-guide/_index.adoc:2325 #, no-wrap msgid "[smtp.freebsd.org]:587 yourusername:yourpassword\n" msgstr "[smtp.freebsd.org]:587 вашеимяпользователя:вашпароль\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2312 +#: documentation/content/en/articles/committers-guide/_index.adoc:2328 msgid "" "If the email server is used by other people, you may want to prevent them " "from sending e-mails from your address. To achieve this, add this to your [." @@ -6531,7 +6600,7 @@ msgstr "" "добавьте это в ваш [.filename]#main.cf#:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2317 +#: documentation/content/en/articles/committers-guide/_index.adoc:2333 #, no-wrap msgid "" "smtpd_sender_login_maps = hash:/usr/local/etc/postfix/sender_login_maps\n" @@ -6541,7 +6610,7 @@ msgstr "" "smtpd_sender_restrictions = reject_known_sender_login_mismatch\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2320 +#: documentation/content/en/articles/committers-guide/_index.adoc:2336 msgid "" "Create [.filename]#/usr/local/etc/postfix/sender_login_maps# with the " "following content:" @@ -6550,13 +6619,13 @@ msgstr "" "следующим содержимым:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2324 +#: documentation/content/en/articles/committers-guide/_index.adoc:2340 #, no-wrap msgid "yourusername@FreeBSD.org yourlocalusername\n" msgstr "вашеимяпользователя@FreeBSD.org вашеимялокальногопользователя\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2327 +#: documentation/content/en/articles/committers-guide/_index.adoc:2343 msgid "" "Where _yourlocalusername_ is the SASL username used to connect to the local " "instance of Postfix." @@ -6565,13 +6634,13 @@ msgstr "" "используемое для подключения к локальному экземпляру Postfix." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2330 +#: documentation/content/en/articles/committers-guide/_index.adoc:2346 #, no-wrap msgid "Using OpenSMTPD" msgstr "Использование OpenSMTPD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2335 +#: documentation/content/en/articles/committers-guide/_index.adoc:2351 msgid "" "To tell a local OpenSMTPD instance that anything from " "`_yourusername_@FreeBSD.org` should be forwarded to the FreeBSD.org servers, " @@ -6582,7 +6651,7 @@ msgstr "" "FreeBSD.org, добавьте это в ваш [.filename]#smtpd.conf#:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2340 +#: documentation/content/en/articles/committers-guide/_index.adoc:2356 #, no-wrap msgid "" "action \"freebsd\" relay host smtp+tls://freebsd@smtp.freebsd.org:587 auth <secrets>\n" @@ -6592,7 +6661,7 @@ msgstr "" "match from any auth вашеимялокальногопользователя mail-from \"_вашеимяпользователя_@freebsd.org\" for any action \"freebsd\"\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2343 +#: documentation/content/en/articles/committers-guide/_index.adoc:2359 msgid "" "Where _yourlocalusername_ is the SASL username used to connect to the local " "instance of OpenSMTPD." @@ -6601,7 +6670,7 @@ msgstr "" "используемое для подключения к локальному экземпляру OpenSMTPD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2345 +#: documentation/content/en/articles/committers-guide/_index.adoc:2361 msgid "" "Create [.filename]#/usr/local/etc/mail/secrets# with the following content:" msgstr "" @@ -6609,19 +6678,19 @@ msgstr "" "содержимым:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2349 +#: documentation/content/en/articles/committers-guide/_index.adoc:2365 #, no-wrap msgid "freebsd\tyourusername:yourpassword\n" msgstr "freebsd\tвашеимяпользователя:вашпароль\n" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2353 +#: documentation/content/en/articles/committers-guide/_index.adoc:2369 #, no-wrap msgid "Using Exim" msgstr "Использование Exim" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2359 +#: documentation/content/en/articles/committers-guide/_index.adoc:2375 #, no-wrap msgid "" "To direct a local Exim instance to forward all mail from `_example_@FreeBSD.org`\n" @@ -6631,7 +6700,7 @@ msgstr "" "`_example_@FreeBSD.org` на серверы FreeBSD.org, добавьте это в [.filename]#конфигурацию# Exim:\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2368 +#: documentation/content/en/articles/committers-guide/_index.adoc:2384 #, no-wrap msgid "" "Routers section: (at the top of the list):\n" @@ -6649,7 +6718,7 @@ msgstr "" " route_data = ${lookup {${lc:$sender_address}} lsearch {/usr/local/etc/exim/freebsd_send}}\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2380 +#: documentation/content/en/articles/committers-guide/_index.adoc:2396 #, no-wrap msgid "" "Transport Section:\n" @@ -6677,7 +6746,7 @@ msgstr "" " hosts_require_auth = smtp.freebsd.org\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2387 +#: documentation/content/en/articles/committers-guide/_index.adoc:2403 #, no-wrap msgid "" "Authenticators:\n" @@ -6695,7 +6764,7 @@ msgstr "" " client_condition = ${if eq{$host}{smtp.freebsd.org}}\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2390 +#: documentation/content/en/articles/committers-guide/_index.adoc:2406 msgid "" "Create [.filename]#/usr/local/etc/exim/freebsd_send# with the following " "content:" @@ -6704,19 +6773,19 @@ msgstr "" "содержимым:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2394 +#: documentation/content/en/articles/committers-guide/_index.adoc:2410 #, no-wrap msgid "example@freebsd.org:smtp.freebsd.org::587\n" msgstr "example@freebsd.org:smtp.freebsd.org::587\n" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2399 +#: documentation/content/en/articles/committers-guide/_index.adoc:2415 #, no-wrap msgid "Mentors" msgstr "Наставники" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2404 +#: documentation/content/en/articles/committers-guide/_index.adoc:2420 msgid "" "All new developers have a mentor assigned to them for the first few months. " "A mentor is responsible for teaching the mentee the rules and conventions of " @@ -6731,7 +6800,7 @@ msgstr "" "периода." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2407 +#: documentation/content/en/articles/committers-guide/_index.adoc:2423 msgid "" "For committers: do not commit anything without first getting mentor " "approval. Document that approval with an `Approved by:` line in the commit " @@ -6741,7 +6810,7 @@ msgstr "" "Задокументируйте это одобрение строкой `Approved by:` в сообщении коммита." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2412 +#: documentation/content/en/articles/committers-guide/_index.adoc:2428 msgid "" "When the mentor decides that a mentee has learned the ropes and is ready to " "commit on their own, the mentor announces it with a commit to [." @@ -6754,16 +6823,16 @@ msgstr "" "коммит в [.filename]#mentors#. Этот файл находится в сиротской ветке [." "filename]#admin# каждого репозитория. Подробная информация о том, как " "получить доступ к этим веткам, доступна в crossref:committers-guide[admin-" -"branch, ветке \"admin\"]." +"branch, ветке `admin`]." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2414 +#: documentation/content/en/articles/committers-guide/_index.adoc:2430 #, no-wrap msgid "Pre-Commit Review" msgstr "Предварительная проверка перед коммитом" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2419 +#: documentation/content/en/articles/committers-guide/_index.adoc:2435 msgid "" "Code review is one way to increase the quality of software. The following " "guidelines apply to commits to the `main` (-CURRENT) branch of the `src` " @@ -6778,7 +6847,7 @@ msgstr "" "в целом применимы к коммитам, требующим рецензии:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2421 +#: documentation/content/en/articles/committers-guide/_index.adoc:2437 msgid "" "All non-trivial changes should be reviewed before they are committed to the " "repository." @@ -6787,7 +6856,7 @@ msgstr "" "репозитории." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2422 +#: documentation/content/en/articles/committers-guide/_index.adoc:2438 msgid "" "Reviews may be conducted by email, in Bugzilla, in Phabricator, or by " "another mechanism. Where possible, reviews should be public." @@ -6797,7 +6866,7 @@ msgstr "" "должно быть публичным." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2423 +#: documentation/content/en/articles/committers-guide/_index.adoc:2439 msgid "" "The developer responsible for a code change is also responsible for making " "all necessary review-related changes." @@ -6806,7 +6875,7 @@ msgstr "" "необходимые изменения, связанные с проверкой." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2424 +#: documentation/content/en/articles/committers-guide/_index.adoc:2440 msgid "" "Code review can be an iterative process, which continues until the patch is " "ready to be committed. Specifically, once a patch is sent out for review, it " @@ -6821,12 +6890,12 @@ msgstr "" "форму, которая имеет смысл для метода рецензирования." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2425 +#: documentation/content/en/articles/committers-guide/_index.adoc:2441 msgid "Timeouts are not a substitute for review." msgstr "Тайм-ауты не являются заменой проверке." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2427 +#: documentation/content/en/articles/committers-guide/_index.adoc:2443 msgid "" "Sometimes code reviews will take longer than you would hope for, especially " "for larger features. Accepted ways to speed up review times for your patches " @@ -6837,7 +6906,7 @@ msgstr "" "патчей:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2429 +#: documentation/content/en/articles/committers-guide/_index.adoc:2445 msgid "" "Review other people's patches. If you help out, everybody will be more " "willing to do the same for you; goodwill is our currency." @@ -6846,7 +6915,7 @@ msgstr "" "делать то же самое для вас; доброжелательность — наша валюта." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2430 +#: documentation/content/en/articles/committers-guide/_index.adoc:2446 msgid "" "Ping the patch. If it is urgent, provide reasons why it is important to you " "to get this patch landed and ping it every couple of days. If it is not " @@ -6859,7 +6928,7 @@ msgstr "" "других профессиональных разработчиков их ценное время." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2431 +#: documentation/content/en/articles/committers-guide/_index.adoc:2447 msgid "" "Ask for help on mailing lists, IRC, etc. Others may be able to either help " "you directly, or suggest a reviewer." @@ -6868,7 +6937,7 @@ msgstr "" "вам напрямую, либо предложить рецензента." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2432 +#: documentation/content/en/articles/committers-guide/_index.adoc:2448 msgid "" "Split your patch into multiple smaller patches that build on each other. The " "smaller your patch, the higher the probability that somebody will take a " @@ -6879,7 +6948,7 @@ msgstr "" "просмотрит." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2434 +#: documentation/content/en/articles/committers-guide/_index.adoc:2450 msgid "" "When making large changes, it is helpful to keep this in mind from the " "beginning of the effort as breaking large changes into smaller ones is often " @@ -6890,7 +6959,7 @@ msgstr "" "затруднительно постфактум." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2439 +#: documentation/content/en/articles/committers-guide/_index.adoc:2455 msgid "" "Developers should participate in code reviews as both reviewers and " "reviewees. If someone is kind enough to review your code, you should return " @@ -6907,7 +6976,7 @@ msgstr "" "работает с рассматриваемым кодом." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2442 +#: documentation/content/en/articles/committers-guide/_index.adoc:2458 msgid "" "In some cases, no subject-matter expert may be available. In those cases, a " "review by an experienced developer is sufficient when coupled with " @@ -6918,13 +6987,13 @@ msgstr "" "соответствующим тестированием." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2444 +#: documentation/content/en/articles/committers-guide/_index.adoc:2460 #, no-wrap msgid "Commit Log Messages" msgstr "Журнал сообщений о коммитах" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2447 +#: documentation/content/en/articles/committers-guide/_index.adoc:2463 msgid "" "This section contains some suggestions and traditions for how commit logs " "are formatted." @@ -6933,13 +7002,13 @@ msgstr "" "журналов коммитов." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2448 +#: documentation/content/en/articles/committers-guide/_index.adoc:2464 #, no-wrap msgid "Why are commit messages important?" msgstr "Почему важны сообщения коммитов?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2452 +#: documentation/content/en/articles/committers-guide/_index.adoc:2468 msgid "" "When you commit a change in Git, Subversion, or another version control " "system (VCS), you're prompted to write some text describing the commit -- a " @@ -6954,7 +7023,7 @@ msgstr "" "напишете `исправлена ошибка`?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2455 +#: documentation/content/en/articles/committers-guide/_index.adoc:2471 msgid "" "Most projects have more than one developer and last for some length of " "time. Commit messages are a very important method of communicating with " @@ -6965,7 +7034,7 @@ msgstr "" "другими разработчиками, как в настоящем, так и в будущем." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2458 +#: documentation/content/en/articles/committers-guide/_index.adoc:2474 msgid "" "FreeBSD has hundreds of active developers and hundreds of thousands of " "commits spanning decades of history. Over that time the developer community " @@ -6978,17 +7047,17 @@ msgstr "" "тяжело." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2460 +#: documentation/content/en/articles/committers-guide/_index.adoc:2476 msgid "Commit messages serve at least three purposes:" msgstr "Сообщения коммитов служат как минимум трем целям:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2462 +#: documentation/content/en/articles/committers-guide/_index.adoc:2478 msgid "Communicating with other developers" msgstr "Сотрудничество с другими" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2467 +#: documentation/content/en/articles/committers-guide/_index.adoc:2483 msgid "" "FreeBSD commits generate email to various mailing lists. These include the " "commit message along with a copy of the patch itself. Commit messages are " @@ -7007,12 +7076,12 @@ msgstr "" "свои собственные проекты, которые выиграют от взаимодействия." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2469 +#: documentation/content/en/articles/committers-guide/_index.adoc:2485 msgid "Making Changes Discoverable" msgstr "Обеспечение возможности обнаружения изменений" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2473 +#: documentation/content/en/articles/committers-guide/_index.adoc:2489 msgid "" "In a large project with a long history it may be difficult to find changes " "of interest when investigating an issue or change in behaviour. Verbose, " @@ -7025,12 +7094,12 @@ msgstr "" "быть релевантны. Например, `git log --since 1year --grep 'USB timeout'`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2475 +#: documentation/content/en/articles/committers-guide/_index.adoc:2491 msgid "Providing historical documentation" msgstr "Предоставление исторической документации" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2479 +#: documentation/content/en/articles/committers-guide/_index.adoc:2495 msgid "" "Commit messages serve to document changes for future developers, perhaps " "years or decades later. This future developer may even be you, the original " @@ -7043,7 +7112,7 @@ msgstr "" "которое кажется очевидным сегодня, может оказаться совсем не таким в будущем." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2481 +#: documentation/content/en/articles/committers-guide/_index.adoc:2497 msgid "" "The `git blame` command annotates each line of a source file with the change " "(hash and subject line) that brought it in." @@ -7052,7 +7121,7 @@ msgstr "" "изменении (хэш и тема коммита), которое её добавило." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2483 +#: documentation/content/en/articles/committers-guide/_index.adoc:2499 msgid "" "Having established the importance, here are elements of a good FreeBSD " "commit message:" @@ -7061,13 +7130,13 @@ msgstr "" "вот его элементы:" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2484 +#: documentation/content/en/articles/committers-guide/_index.adoc:2500 #, no-wrap msgid "Start with a subject line" msgstr "Начните со строки темы" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2488 +#: documentation/content/en/articles/committers-guide/_index.adoc:2504 msgid "" "Commit messages should start with a single-line subject that briefly " "summarizes the change. The subject should, by itself, allow the reader to " @@ -7078,13 +7147,13 @@ msgstr "" "определить, представляет ли изменение интерес." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2489 +#: documentation/content/en/articles/committers-guide/_index.adoc:2505 #, no-wrap msgid "Keep subject lines short" msgstr "Сохраняйте заголовки краткими" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2494 +#: documentation/content/en/articles/committers-guide/_index.adoc:2510 msgid "" "The subject line should be as short as possible while still retaining the " "required information. This is to make browsing Git log more efficient, and " @@ -7099,13 +7168,13 @@ msgstr "" "длины ниже 67 символов, а по возможности — около 50 или меньше." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2495 +#: documentation/content/en/articles/committers-guide/_index.adoc:2511 #, no-wrap msgid "Prefix the subject line with a component, if applicable" msgstr "Добавьте к строке темы префикс с указанием компонента, если это применимо" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2499 +#: documentation/content/en/articles/committers-guide/_index.adoc:2515 msgid "" "If the change relates to a specific component the subject line may be " "prefixed with that component name and a colon (:). If applicable, try to " @@ -7117,12 +7186,12 @@ msgstr "" "же файлам." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2501 +#: documentation/content/en/articles/committers-guide/_index.adoc:2517 msgid "✓ `foo: Add -k option to keep temporary data`" msgstr "✓ `foo: Add -k option to keep temporary data`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2503 +#: documentation/content/en/articles/committers-guide/_index.adoc:2519 msgid "" "Include the prefix in the 67-character limit suggested above, so that `git " "log --oneline` avoids wrapping." @@ -7131,13 +7200,13 @@ msgstr "" "переноса." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2504 +#: documentation/content/en/articles/committers-guide/_index.adoc:2520 #, no-wrap msgid "Capitalize the first letter of the subject" msgstr "Напишите первую букву темы с заглавной буквы" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2508 +#: documentation/content/en/articles/committers-guide/_index.adoc:2524 msgid "" "Capitalize the first letter of the subject itself. The prefix, if any, is " "not capitalized unless necessary (e.g., `USB:` is capitalized)." @@ -7147,13 +7216,13 @@ msgstr "" "заглавной буквы)." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2509 +#: documentation/content/en/articles/committers-guide/_index.adoc:2525 #, no-wrap msgid "Do not end the subject line with punctuation" msgstr "Не заканчивайте строку темы знаками препинания" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2513 +#: documentation/content/en/articles/committers-guide/_index.adoc:2529 msgid "" "Do not end with a period or other punctuation. In this regard the subject " "line is like a newspaper headline." @@ -7162,36 +7231,36 @@ msgstr "" "строка темы подобна заголовку в газете." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2514 +#: documentation/content/en/articles/committers-guide/_index.adoc:2530 #, no-wrap msgid "Separate the subject and body with a blank line" msgstr "Разделите тему и тело письма пустой строкой" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2517 +#: documentation/content/en/articles/committers-guide/_index.adoc:2533 msgid "Separate the body from the subject with a blank line." msgstr "Отделите тело от темы пустой строкой." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2519 +#: documentation/content/en/articles/committers-guide/_index.adoc:2535 msgid "" "Some trivial commits do not require a body, and will have only a subject." msgstr "" "Некоторые тривиальные коммиты не требуют тела и содержат только заголовок." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2521 +#: documentation/content/en/articles/committers-guide/_index.adoc:2537 msgid "✓ `ls: Fix typo in usage text`" msgstr "✓ `ls: Fix typo in usage text`" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2522 +#: documentation/content/en/articles/committers-guide/_index.adoc:2538 #, no-wrap msgid "Limit messages to 72 columns" msgstr "Ограничьте сообщения до 72 колонок" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2528 +#: documentation/content/en/articles/committers-guide/_index.adoc:2544 msgid "" "`git log` and `git format-patch` indent the commit message by four spaces. " "Wrapping at 72 columns provides a matching margin on the right edge. " @@ -7210,13 +7279,13 @@ msgstr "" "длине строки." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2529 +#: documentation/content/en/articles/committers-guide/_index.adoc:2545 #, no-wrap msgid "Use the present tense, imperative mood" msgstr "Используйте настоящее время, повелительное наклонение" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2534 +#: documentation/content/en/articles/committers-guide/_index.adoc:2550 msgid "" "This facilitates short subject lines and provides consistency, including " "with automatically generated commit messages (e.g., as generated by git " @@ -7231,7 +7300,7 @@ msgstr "" "this change will ...)»." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2539 +#: documentation/content/en/articles/committers-guide/_index.adoc:2555 #, no-wrap msgid "" "✓ `foo: Implement the -k (keep) option`\n" @@ -7245,20 +7314,20 @@ msgstr "" "✗ `-k option added`" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2540 +#: documentation/content/en/articles/committers-guide/_index.adoc:2556 #, no-wrap msgid "Focus on what and why, not how" msgstr "Сосредоточьтесь на том, что и почему, а не на том, как" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2543 +#: documentation/content/en/articles/committers-guide/_index.adoc:2559 msgid "" "Explain what the change accomplishes and why it is being done, rather than " "how." msgstr "Объясните, чего достигает изменение и почему оно делается, а не как." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2547 +#: documentation/content/en/articles/committers-guide/_index.adoc:2563 msgid "" "Do not assume that the reader is familiar with the issue. Explain the " "background and motivation for the change. Include benchmark data if you " @@ -7269,7 +7338,7 @@ msgstr "" "они у вас есть." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2549 +#: documentation/content/en/articles/committers-guide/_index.adoc:2565 msgid "" "If there are limitations or incomplete aspects of the change, describe them " "in the commit message." @@ -7278,13 +7347,13 @@ msgstr "" "сообщении коммита." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2550 +#: documentation/content/en/articles/committers-guide/_index.adoc:2566 #, no-wrap msgid "Consider whether parts of the commit message could be code comments instead" msgstr "Подумайте, можно ли части сообщения коммита оформить как комментарии в коде" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2553 +#: documentation/content/en/articles/committers-guide/_index.adoc:2569 msgid "" "Sometimes while writing a commit message you may find yourself writing a " "sentence or two explaining some tricky or confusing aspect of the change. " @@ -7297,13 +7366,13 @@ msgstr "" "объяснение в виде комментария в самом коде." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2554 +#: documentation/content/en/articles/committers-guide/_index.adoc:2570 #, no-wrap msgid "Write commit messages for your future self" msgstr "Напишите сообщения коммитов для себя в будущем" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2558 +#: documentation/content/en/articles/committers-guide/_index.adoc:2574 msgid "" "While writing the commit message for a change you have all of the context in " "mind - what prompted the change, alternate approaches that were considered " @@ -7319,13 +7388,13 @@ msgstr "" "контекст." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2559 +#: documentation/content/en/articles/committers-guide/_index.adoc:2575 #, no-wrap msgid "Commit messages should stand alone" msgstr "Сообщения о коммитах должны быть самодостаточными" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2563 +#: documentation/content/en/articles/committers-guide/_index.adoc:2579 msgid "" "You may include references to mailing list postings, benchmark result web " "sites, or code review links. However, the commit message should contain all " @@ -7338,7 +7407,7 @@ msgstr "" "на случай, если эти ссылки станут недоступны в будущем." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2567 +#: documentation/content/en/articles/committers-guide/_index.adoc:2583 msgid "" "Similarly, a commit may refer to a previous commit, for example in the case " "of a bug fix or revert. In addition to the commit identifier (revision or " @@ -7355,13 +7424,13 @@ msgstr "" "становиться трудными для отслеживания." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2568 +#: documentation/content/en/articles/committers-guide/_index.adoc:2584 #, no-wrap msgid "Include appropriate metadata in a footer" msgstr "Укажите необходимые метаданные в нижней части" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2571 +#: documentation/content/en/articles/committers-guide/_index.adoc:2587 msgid "" "As well as including an informative message with each commit, some " "additional information may be needed." @@ -7370,7 +7439,7 @@ msgstr "" "потребоваться некоторая дополнительная информация." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2573 +#: documentation/content/en/articles/committers-guide/_index.adoc:2589 msgid "" "This information consists of one or more lines containing the key word or " "phrase, a colon, tabs for formatting, and then the additional information." @@ -7380,7 +7449,7 @@ msgstr "" "дополнительную информацию." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2575 +#: documentation/content/en/articles/committers-guide/_index.adoc:2591 msgid "" "For key words where multiple values make sense (e.g., `PR:` with a comma-" "separated list of PRs), it is permitted to use the same keyword multiple " @@ -7391,30 +7460,30 @@ msgstr "" "слово несколько раз, чтобы избежать неоднозначности или улучшить читаемость." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2577 +#: documentation/content/en/articles/committers-guide/_index.adoc:2593 msgid "The key words or phrases are:" msgstr "Ключевые слова или фразы:" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2583 +#: documentation/content/en/articles/committers-guide/_index.adoc:2599 #, no-wrap msgid "`PR:`" msgstr "`PR:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2585 +#: documentation/content/en/articles/committers-guide/_index.adoc:2601 #, no-wrap msgid "The problem report (if any) which is affected (typically, by being closed) by this commit. Multiple PRs may be specified on one line, separated by commas or spaces." msgstr "Номер отчёта о проблеме (если есть), на который влияет данный коммит (обычно путем закрытия). Можно указать несколько номеров PR в одной строке, разделяя их запятыми или пробелами." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2586 +#: documentation/content/en/articles/committers-guide/_index.adoc:2602 #, no-wrap msgid "`Reported by:`" msgstr "`Reported by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2590 +#: documentation/content/en/articles/committers-guide/_index.adoc:2606 #, no-wrap msgid "" "The name and e-mail address of the person that reported the issue; for developers, just the username on the FreeBSD cluster.\n" @@ -7426,7 +7495,7 @@ msgstr "" "почтовой рассылке." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2592 +#: documentation/content/en/articles/committers-guide/_index.adoc:2608 #, no-wrap msgid "" "`Submitted by:` +\n" @@ -7436,7 +7505,7 @@ msgstr "" "(не рекомендуется)" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2596 +#: documentation/content/en/articles/committers-guide/_index.adoc:2612 #, no-wrap msgid "" "Name of an author who submitted a change without providing a full valid patch, especially without a valid email.\n" @@ -7448,13 +7517,13 @@ msgstr "" "До перехода на git, когда появилась возможность разделять поля автора и коммиттера, это использовалось для присланных патчей." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2597 +#: documentation/content/en/articles/committers-guide/_index.adoc:2613 #, no-wrap msgid "`Reviewed by:`" msgstr "`Reviewed by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2612 +#: documentation/content/en/articles/committers-guide/_index.adoc:2628 #, no-wrap msgid "" "The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer:\n" @@ -7486,25 +7555,25 @@ msgstr "" "...." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2613 +#: documentation/content/en/articles/committers-guide/_index.adoc:2629 #, no-wrap msgid "`Tested by:`" msgstr "`Tested by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2615 +#: documentation/content/en/articles/committers-guide/_index.adoc:2631 #, no-wrap msgid "The name and e-mail address of the person or people that tested the change; for developers, just the username on the FreeBSD cluster." msgstr "Имя и адрес электронной почты человека или людей, которые проверили изменение; для разработчиков — просто имя пользователя в кластере FreeBSD." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2616 +#: documentation/content/en/articles/committers-guide/_index.adoc:2632 #, no-wrap msgid "`Discussed with:`" msgstr "`Discussed with:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2619 +#: documentation/content/en/articles/committers-guide/_index.adoc:2635 #, no-wrap msgid "" "The name and e-mail address of the person or people that contributed to the patch by providing meaningful feedback; for developers, just the username on the FreeBSD cluster.\n" @@ -7514,13 +7583,13 @@ msgstr "" "Обычно используется для упоминания тех, кто не проводил явного рецензирования, тестирования или одобрения изменения, но тем не менее участвовал в обсуждении, связанном с изменением, что привело к улучшениям и лучшему пониманию его влияния на проект FreeBSD." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2620 +#: documentation/content/en/articles/committers-guide/_index.adoc:2636 #, no-wrap msgid "`Approved by:`" msgstr "`Approved by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2646 +#: documentation/content/en/articles/committers-guide/_index.adoc:2662 #, no-wrap msgid "" "The name and e-mail address of the person or people that approved the change; for developers, just the username on the FreeBSD cluster.\n" @@ -7530,7 +7599,7 @@ msgid "" "* while a new committer is under mentorship\n" "* commits to an area of the tree covered by the LOCKS file (src)\n" "* during a release cycle\n" -"* committing to a repo where you do not hold a commit bit (e.g. src committer committing to docs)\n" +"* committing non-obvious changes to a repo where you do not hold a commit bit (e.g. src committer committing to docs); for obvious fixes, `Reviewed by:` is sufficient\n" "* committing to a port maintained by someone else\n" "\n" "While under mentorship, get mentor approval before the commit. Enter the mentor's username in this field, and note that they are a mentor:\n" @@ -7547,24 +7616,30 @@ msgid "" "Approved by: re (username)\n" "...." msgstr "" -"Имя и адрес электронной почты лица или лиц, утвердивших изменение; для разработчиков — просто имя пользователя в кластере FreeBSD.\n" +"Имя и адрес электронной почты лица или лиц, утвердивших изменение; для " +"разработчиков — просто имя пользователя в кластере FreeBSD.\n" "\n" "Есть несколько случаев, когда утверждение является обычной практикой:\n" "\n" "* когда новый коммиттер находится под наставничеством\n" "* коммиты в область дерева, указанную в файле LOCKS (src)\n" "* во время цикла выпуска\n" -"* коммиты в репозиторий, где у вас нет права на коммит (например, коммиттер src делает коммит в docs)\n" +"* коммиты нетривиальных изменений в репозиторий, где у вас нет права на " +"коммит (например, коммиттер src делает коммит в docs); для тривиальных " +"изменений достаточно `Reviewed by:`.\n" "* коммиты в порт, поддерживаемый кем-то другим\n" "\n" -"Во время наставничества получите одобрение наставника перед коммитом. Укажите имя пользователя наставника в этом поле и отметьте, что он является наставником:\n" +"Во время наставничества получите одобрение наставника перед коммитом. " +"Укажите имя пользователя наставника в этом поле и отметьте, что он является " +"наставником:\n" "\n" "[source,shell]\n" "....\n" "Approved by: имя-пользователя-наставника (mentor)\n" "....\n" "\n" -"Если коммиты были утверждены командой, укажите название команды, за которым в скобках следует имя пользователя утверждающего. Например:\n" +"Если коммиты были утверждены командой, укажите название команды, за которым " +"в скобках следует имя пользователя утверждающего. Например:\n" "\n" "[source,shell]\n" "....\n" @@ -7572,25 +7647,25 @@ msgstr "" "...." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2647 +#: documentation/content/en/articles/committers-guide/_index.adoc:2663 #, no-wrap msgid "`Obtained from:`" msgstr "`Obtained from:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2649 +#: documentation/content/en/articles/committers-guide/_index.adoc:2665 #, no-wrap msgid "The name of the project (if any) from which the code was obtained. Do not use this line for the name of an individual person." msgstr "Название проекта (если есть), из которого был получен код. Не используйте эту строку для указания имени отдельного человека." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2650 +#: documentation/content/en/articles/committers-guide/_index.adoc:2666 #, no-wrap msgid "`Fixes:`" msgstr "`Fixes:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2653 +#: documentation/content/en/articles/committers-guide/_index.adoc:2669 #, no-wrap msgid "" "The Git short hash and the title line of a commit that is fixed by this change as returned by `git log -n1 --format='%h (\"%s\")' GIT-COMMIT-HASH`.\n" @@ -7600,121 +7675,121 @@ msgstr "" "Мы включаем заголовок коммита, чтобы можно было найти указанный коммит даже в случае, если будущая миграция системы контроля версий сделает ссылки по хэшу недействительными." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2654 +#: documentation/content/en/articles/committers-guide/_index.adoc:2670 #, no-wrap msgid "`MFC after:`" msgstr "`MFC after:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2656 +#: documentation/content/en/articles/committers-guide/_index.adoc:2672 #, no-wrap msgid "To receive an e-mail reminder to MFC at a later date, specify the number of days, weeks, or months after which an MFC is planned." msgstr "Чтобы получить напоминание по электронной почте о запланированном MFC через определённое время, укажите количество дней, недель или месяцев, после которых планируется выполнить MFC." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2657 +#: documentation/content/en/articles/committers-guide/_index.adoc:2673 #, no-wrap msgid "`MFC to:`" msgstr "`MFC to:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2659 +#: documentation/content/en/articles/committers-guide/_index.adoc:2675 #, no-wrap msgid "If the commit should be merged to a subset of stable branches, specify the branch names." msgstr "Если коммиту должно быть сделано слияние в подмножество стабильных веток, укажите названия веток." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2660 +#: documentation/content/en/articles/committers-guide/_index.adoc:2676 #, no-wrap msgid "`MFH:`" msgstr "`MFH:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2662 +#: documentation/content/en/articles/committers-guide/_index.adoc:2678 #, no-wrap msgid "If the commit is to be merged into a ports quarterly branch name, specify the quarterly branch. For example `2021Q2`." msgstr "Если коммиту должно быть сделано слияние в квартальную ветку портов, укажите квартальную ветку. Например, `2021Q2`." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2663 +#: documentation/content/en/articles/committers-guide/_index.adoc:2679 #, no-wrap msgid "`Relnotes:`" msgstr "`Relnotes:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2664 +#: documentation/content/en/articles/committers-guide/_index.adoc:2680 #, no-wrap msgid "If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`." msgstr "Если изменение является кандидатом для включения в примечания к выпуску следующей версии из ветки, установите значение `yes`." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2665 +#: documentation/content/en/articles/committers-guide/_index.adoc:2681 #, no-wrap msgid "Candidates are user-visible changes, new features, compatibility breaks, etc.." msgstr "Кандидатами являются изменения, видимые пользователям, новые функции, нарушения совместимости и т.д." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2666 +#: documentation/content/en/articles/committers-guide/_index.adoc:2682 #, no-wrap msgid "If you forget to set this line, or want to provide more details, add an entry to the `RELNOTES` file in the root of the src tree." msgstr "Если вы забыли установить эту строку или хотите предоставить более подробную информацию, добавьте запись в файл `RELNOTES` в корне дерева исходного кода src." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2667 +#: documentation/content/en/articles/committers-guide/_index.adoc:2683 #, no-wrap msgid "The `RELNOTES` file is used to generate release notes for the next release." msgstr "Файл `RELNOTES` используется для формирования примечаний к выпуску для следующего релиза." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2669 +#: documentation/content/en/articles/committers-guide/_index.adoc:2685 #, no-wrap msgid "Do not use the `Relnotes:` line to describe the change: its only valid value is `yes`." msgstr "Не используйте строку `Relnotes:` для описания изменения: её единственное допустимое значение - `yes`." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2670 +#: documentation/content/en/articles/committers-guide/_index.adoc:2686 #, no-wrap msgid "`Security:`" msgstr "`Security:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2672 +#: documentation/content/en/articles/committers-guide/_index.adoc:2688 #, no-wrap msgid "If the change is related to a security vulnerability or security exposure, include one or more references or a description of the issue. If possible, include a VuXML URL or a CVE ID." msgstr "Если изменение связано с уязвимостью или угрозой безопасности, укажите одну или несколько ссылок либо описание проблемы. По возможности включите URL VuXML или идентификатор CVE." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2673 +#: documentation/content/en/articles/committers-guide/_index.adoc:2689 #, no-wrap msgid "`Event:`" msgstr "`Event:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2675 +#: documentation/content/en/articles/committers-guide/_index.adoc:2691 #, no-wrap msgid "The description for the event where this commit was made. If this is a recurring event, add the year or even the month to it. For example, this could be `FooBSDcon 2019`. The idea behind this line is to put recognition to conferences, gatherings, and other types of meetups and to show that these are useful to have. Please do not use the `Sponsored by:` line for this as that is meant for organizations sponsoring certain features or developers working on them." msgstr "Описание события, в рамках которого был выполнен этот коммит. Если это повторяющееся событие, добавьте год или даже месяц. Например, это может быть `FooBSDcon 2019`. Идея этой строки — отдать должное конференциям, встречам и другим подобным мероприятиям, а также показать, что их проведение полезно. Пожалуйста, не используйте строку `Sponsored by:` для этого, так как она предназначена для организаций, спонсирующих определённые функции, или разработчиков, работающих над ними." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2676 +#: documentation/content/en/articles/committers-guide/_index.adoc:2692 #, no-wrap msgid "`Sponsored by:`" msgstr "`Sponsored by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2678 +#: documentation/content/en/articles/committers-guide/_index.adoc:2694 #, no-wrap msgid "Sponsoring organizations for this change, if any. Separate multiple organizations with commas. If only a portion of the work was sponsored, or different amounts of sponsorship were provided to different authors, please give appropriate credit in parentheses after each sponsor name. For example, `Example.com (alice, code refactoring), Wormulon (bob), Momcorp (cindy)` shows that Alice was sponsored by Example.com to do code refactoring, while Wormulon sponsored Bob's work and Momcorp sponsored Cindy's work. Other authors were either not sponsored or chose not to list sponsorship." msgstr "Организации, спонсировавшие это изменение (если есть). Разделяйте несколько организаций запятыми. Если только часть работы была спонсирована или разные суммы спонсорской поддержки были предоставлены разным авторам, укажите соответствующую информацию в скобках после каждого имени спонсора. Например, `Example.com (alice, code refactoring), Wormulon (bob), Momcorp (cindy)` показывает, что Alice была спонсирована Example.com для рефакторинга кода, в то время как Wormulon спонсировал работу Bob, а Momcorp спонсировал работу Cindy. Другие авторы либо не были спонсированы, либо решили не указывать спонсорство." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2679 +#: documentation/content/en/articles/committers-guide/_index.adoc:2695 #, no-wrap msgid "`Pull Request:`" msgstr "`Pull Request:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2683 +#: documentation/content/en/articles/committers-guide/_index.adoc:2699 #, no-wrap msgid "" "This change was submitted as a pull request or merge request against one of FreeBSD's public read-only Git repositories.\n" @@ -7726,13 +7801,13 @@ msgstr "" "Например: `https://github.com/freebsd/freebsd-src/pull/745`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2684 +#: documentation/content/en/articles/committers-guide/_index.adoc:2700 #, no-wrap msgid "`Closes:`" msgstr "`Closes:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2688 +#: documentation/content/en/articles/committers-guide/_index.adoc:2704 #, no-wrap msgid "" "This change concludes the patch series discussed at the specified Github pull request, and closes that request.\n" @@ -7744,13 +7819,13 @@ msgstr "" "Например: `https://github.com/freebsd/freebsd-src/pull/745`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2689 +#: documentation/content/en/articles/committers-guide/_index.adoc:2705 #, no-wrap msgid "`Co-authored-by:`" msgstr "`Co-authored-by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2692 +#: documentation/content/en/articles/committers-guide/_index.adoc:2708 #, no-wrap msgid "" "The name and email address of an additional author of the commit.\n" @@ -7760,37 +7835,37 @@ msgstr "" "GitHub содержит подробное описание трейлера Co-authored-by по адресу https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2693 +#: documentation/content/en/articles/committers-guide/_index.adoc:2709 #, no-wrap msgid "`Signed-off-by:`" msgstr "`Signed-off-by:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2695 +#: documentation/content/en/articles/committers-guide/_index.adoc:2711 #, no-wrap msgid "ID certifies compliance with https://developercertificate.org/" msgstr "ID подтверждает соответствие требованиям https://developercertificate.org/" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2696 +#: documentation/content/en/articles/committers-guide/_index.adoc:2712 #, no-wrap msgid "`Differential Revision:`" msgstr "`Differential Revision:`" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2698 +#: documentation/content/en/articles/committers-guide/_index.adoc:2714 #, no-wrap msgid "The full URL of the Phabricator review. This line __must be the last line__. For example: `https://reviews.freebsd.org/D1708`." msgstr "Полный URL обзора в Phabricator. Эта строка __должна быть последней строкой__. Например: `https://reviews.freebsd.org/D1708`." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2700 +#: documentation/content/en/articles/committers-guide/_index.adoc:2716 #, no-wrap msgid "Commit Log for a Commit Based on a PR" msgstr "Журнал изменений для коммита на основе PR" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2706 +#: documentation/content/en/articles/committers-guide/_index.adoc:2722 msgid "" "The commit is based on a patch from a PR submitted by John Smith. The " "commit message \"PR\" field is filled." @@ -7799,23 +7874,23 @@ msgstr "" "сообщении коммита заполнено." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2710 -#: documentation/content/en/articles/committers-guide/_index.adoc:2728 -#: documentation/content/en/articles/committers-guide/_index.adoc:2743 +#: documentation/content/en/articles/committers-guide/_index.adoc:2726 +#: documentation/content/en/articles/committers-guide/_index.adoc:2744 #: documentation/content/en/articles/committers-guide/_index.adoc:2759 -#: documentation/content/en/articles/committers-guide/_index.adoc:2774 +#: documentation/content/en/articles/committers-guide/_index.adoc:2775 +#: documentation/content/en/articles/committers-guide/_index.adoc:2790 #, no-wrap msgid "...\n" msgstr "...\n" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2712 +#: documentation/content/en/articles/committers-guide/_index.adoc:2728 #, no-wrap msgid "PR:\t\t12345\n" msgstr "PR:\t\t12345\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2715 +#: documentation/content/en/articles/committers-guide/_index.adoc:2731 msgid "" "The committer sets the author of the patch with `git commit --author \"John " "Smith <John.Smith@example.com>\"`." @@ -7824,13 +7899,13 @@ msgstr "" "Smith <John.Smith@example.com>\"`." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2718 +#: documentation/content/en/articles/committers-guide/_index.adoc:2734 #, no-wrap msgid "Commit Log for a Commit Needing Review" msgstr "Журнал изменений для коммита, требующего проверки" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2724 +#: documentation/content/en/articles/committers-guide/_index.adoc:2740 msgid "" "The virtual memory system is being changed. After posting patches to the " "appropriate mailing list (in this case, `freebsd-arch`) and the changes have " @@ -7841,19 +7916,19 @@ msgstr "" "утверждения изменений." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2730 +#: documentation/content/en/articles/committers-guide/_index.adoc:2746 #, no-wrap msgid "Reviewed by:\t-arch\n" msgstr "Reviewed by:\t-arch\n" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2734 +#: documentation/content/en/articles/committers-guide/_index.adoc:2750 #, no-wrap msgid "Commit Log for a Commit Needing Approval" msgstr "Журнал изменений для коммита, требующего одобрения" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2739 +#: documentation/content/en/articles/committers-guide/_index.adoc:2755 msgid "" "Commit a port, after working with the listed MAINTAINER, who said to go " "ahead and commit." @@ -7862,42 +7937,42 @@ msgstr "" "добро на коммит." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2745 +#: documentation/content/en/articles/committers-guide/_index.adoc:2761 #, no-wrap msgid "Approved by:\tabc (maintainer)\n" msgstr "Approved by:\tabc (maintainer)\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2748 +#: documentation/content/en/articles/committers-guide/_index.adoc:2764 msgid "Where _abc_ is the account name of the person who approved." msgstr "Где _abc_ — имя учётной записи лица, одобрившего коммит." #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2750 +#: documentation/content/en/articles/committers-guide/_index.adoc:2766 #, no-wrap msgid "Commit Log for a Commit Bringing in Code from OpenBSD" msgstr "Журнал изменений для коммита, вносящего код из OpenBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2755 +#: documentation/content/en/articles/committers-guide/_index.adoc:2771 msgid "Committing some code based on work done in the OpenBSD project." msgstr "" "Коммит некоторого кода на основе работы, выполненной в проекте OpenBSD." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2761 +#: documentation/content/en/articles/committers-guide/_index.adoc:2777 #, no-wrap msgid "Obtained from:\tOpenBSD\n" msgstr "Obtained from:\tOpenBSD\n" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2765 +#: documentation/content/en/articles/committers-guide/_index.adoc:2781 #, no-wrap msgid "Commit Log for a Change to FreeBSD-CURRENT with a Planned Commit to FreeBSD-STABLE to Follow at a Later Date." msgstr "Журнал коммитов для правки в FreeBSD-CURRENT с запланированным коммитом в FreeBSD-STABLE в последующее время." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2770 +#: documentation/content/en/articles/committers-guide/_index.adoc:2786 msgid "" "Committing some code which will be merged from FreeBSD-CURRENT into the " "FreeBSD-STABLE branch after two weeks." @@ -7906,13 +7981,13 @@ msgstr "" "CURRENT в ветку FreeBSD-STABLE через две недели." #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2776 +#: documentation/content/en/articles/committers-guide/_index.adoc:2792 #, no-wrap msgid "MFC after:\t2 weeks\n" msgstr "MFC after:\t2 weeks\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2779 +#: documentation/content/en/articles/committers-guide/_index.adoc:2795 msgid "" "Where _2_ is the number of days, weeks, or months after which an MFC is " "planned. The _weeks_ option may be `day`, `days`, `week`, `weeks`, `month`, " @@ -7923,12 +7998,12 @@ msgstr "" "`months`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2782 +#: documentation/content/en/articles/committers-guide/_index.adoc:2798 msgid "It is often necessary to combine these." msgstr "Часто необходимо комбинировать их." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2786 +#: documentation/content/en/articles/committers-guide/_index.adoc:2802 msgid "" "Consider the situation where a user has submitted a PR containing code from " "the NetBSD project. Looking at the PR, the developer sees it is not an area " @@ -7944,7 +8019,7 @@ msgstr "" "тестирование." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2788 +#: documentation/content/en/articles/committers-guide/_index.adoc:2804 msgid "" "The extra information to include in the commit would look something like" msgstr "" @@ -7952,13 +8027,13 @@ msgstr "" "примерно так" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2789 +#: documentation/content/en/articles/committers-guide/_index.adoc:2805 #, no-wrap msgid "Example Combined Commit Log" msgstr "Пример объединённого журнала коммитов" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2800 +#: documentation/content/en/articles/committers-guide/_index.adoc:2816 #, no-wrap msgid "" "PR:\t\t54321\n" @@ -7974,88 +8049,78 @@ msgstr "" "Relnotes:\tyes\n" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2805 +#: documentation/content/en/articles/committers-guide/_index.adoc:2821 #, no-wrap msgid "Preferred License for New Files" msgstr "Предпочтительная лицензия для новых файлов" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2811 +#: documentation/content/en/articles/committers-guide/_index.adoc:2827 msgid "" -"The FreeBSD Project's full license policy can be found at link:https://www." -"FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/" -"software-license]. The rest of this section is intended to help you get " -"started. As a rule, when in doubt, ask. It is much easier to give advice " -"than to fix the source tree." +"The FreeBSD Project's full license policy is documented in the extref:" +"{license-guide}[FreeBSD License Policies] article. The rest of this section " +"is intended to help you get started. As a rule, when in doubt, ask. It is " +"much easier to give advice than to fix the source tree." msgstr "" -"Полная политика лицензирования проекта FreeBSD доступна по ссылке link:" -"https://www.FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/" -"internal/software-license]. Остальная часть этого раздела предназначена для " -"того, чтобы помочь вам начать работу. Как правило, если сомневаетесь — " -"спрашивайте. Дать совет гораздо проще, чем исправлять дерево исходного кода." +"Полная политика лицензирования проекта FreeBSD документирована в статье " +"extref:{license-guide}[Лицензионные политики FreeBSD]. Остальная часть этого " +"раздела предназначена для того, чтобы помочь вам начать работу. Как правило, " +"если сомневаетесь — спрашивайте. Дать совет гораздо проще, чем исправлять " +"дерево исходного кода." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2813 +#: documentation/content/en/articles/committers-guide/_index.adoc:2830 msgid "" -"The FreeBSD Project suggests and uses this text as the preferred license " -"scheme:" +"SPDX-only license marking is strongly preferred. The FreeBSD Project uses " +"this text as the preferred license:" msgstr "" -"Проект FreeBSD предлагает и использует следующий текст в качестве " -"предпочтительной схемы лицензирования:" +"Маркировка только кодом SPDX строго предпочтительна. Проект FreeBSD " +"использует следующий текст в качестве предпочтительной лицензии:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2822 +#: documentation/content/en/articles/committers-guide/_index.adoc:2838 #, no-wrap msgid "" "/*\n" " * Copyright (c) [year] [your name]\n" " *\n" " * SPDX-License-Identifier: BSD-2-Clause\n" -" *\n" " */\n" msgstr "" "/*\n" " * Copyright (c) [year] [your name]\n" " *\n" " * SPDX-License-Identifier: BSD-2-Clause\n" -" *\n" " */\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2828 +#: documentation/content/en/articles/committers-guide/_index.adoc:2844 msgid "" -"The FreeBSD project strongly discourages the so-called \"advertising clause" -"\" in new code. Due to the large number of contributors to the FreeBSD " -"project, complying with this clause for many commercial vendors has become " -"difficult. If you have code in the tree with the advertising clause, please " -"consider removing it. In fact, please consider using the above license for " -"your code." +"The preferred order is the copyright notice first, followed by the SPDX-" +"License-Identifier, but either order is acceptable. New contributions to " +"FreeBSD should use the BSD-2-Clause license. The FreeBSD project does not " +"allow the \"advertising clause\" in new code. If you have code in the tree " +"with the advertising clause, please consider switching to a license without " +"it." msgstr "" -"Проект FreeBSD настоятельно не рекомендует использовать так называемую " -"«рекламную оговорку» в новом коде. Из-за большого числа участников проекта " -"FreeBSD соблюдение этой оговорки стало затруднительным для многих " -"коммерческих вендоров. Если ваш код в дереве содержит рекламную оговорку, " -"пожалуйста, рассмотрите возможность её удаления. Более того, пожалуйста, " -"рассмотрите возможность использования вышеуказанной лицензии для вашего кода." +"Предпочтительный порядок — сначала уведомление об авторских правах, затем " +"SPDX-License-Identifier, но любой порядок допустим. Новые материалы для " +"FreeBSD должны использовать лицензию BSD-2-Clause. Проект FreeBSD не " +"допускает «рекламную оговорку» в новом коде. Если у вас есть код в дереве с " +"рекламной оговоркой, пожалуйста, рассмотрите возможность перехода на " +"лицензию без неё." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2832 +#: documentation/content/en/articles/committers-guide/_index.adoc:2847 msgid "" "The FreeBSD project discourages completely new licenses and variations on " -"the standard licenses. New licenses require the approval of {core-email} to " -"reside in the `src` repository. The more different licenses that are used " -"in the tree, the more problems that this causes to those wishing to utilize " -"this code, typically from unintended consequences from a poorly worded " -"license." +"the standard licenses. New licenses require the approval of {core-email}." msgstr "" -"Проект FreeBSD не приветствует полностью новые лицензии и вариации " -"стандартных лицензий. Новые лицензии требуют одобрения {core-email} для " -"размещения в репозитории `src`. Чем больше различных лицензий используется в " -"дереве, тем больше проблем это создаёт для тех, кто желает использовать этот " -"код, обычно из-за непредвиденных последствий плохо сформулированной лицензии." +"Проект FreeBSD не рекомендует полностью новые лицензии и вариации " +"стандартных лицензий. Новые лицензии требуют одобрения {core-email}." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2836 +#: documentation/content/en/articles/committers-guide/_index.adoc:2851 msgid "" "Project policy dictates that code under some non-BSD licenses must be placed " "only in specific sections of the repository, and in some cases, compilation " @@ -8072,7 +8137,7 @@ msgstr "" "GPL, APSL, CDDL и т.п. не должно компилироваться в GENERIC." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2839 +#: documentation/content/en/articles/committers-guide/_index.adoc:2854 msgid "" "Developers are reminded that in open source, getting \"open\" right is just " "as important as getting \"source\" right, as improper handling of " @@ -8086,13 +8151,13 @@ msgstr "" "доводить до сведения основной команды." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2841 +#: documentation/content/en/articles/committers-guide/_index.adoc:2856 #, no-wrap msgid "Keeping Track of Licenses Granted to the FreeBSD Project" msgstr "Отслеживание лицензий, предоставленных проекту FreeBSD" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2846 +#: documentation/content/en/articles/committers-guide/_index.adoc:2861 msgid "" "Various software or data exist in the repositories where the FreeBSD project " "has been granted a special license to be able to use them. A case in point " @@ -8109,7 +8174,7 @@ msgstr "" "он обычно применяет." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2851 +#: documentation/content/en/articles/committers-guide/_index.adoc:2866 msgid "" "It is clearly sensible to keep a record of any such license grants. To that " "end, the {core-email} has decided to keep an archive of them. Whenever the " @@ -8124,14 +8189,14 @@ msgstr "" "присылайте детали на {core-email}, включая:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2853 +#: documentation/content/en/articles/committers-guide/_index.adoc:2868 msgid "" "Contact details for people or organizations granting the special license." msgstr "" "Контактные данные лиц или организаций, предоставляющих специальную лицензию." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2854 +#: documentation/content/en/articles/committers-guide/_index.adoc:2869 msgid "" "What files, directories etc. in the repositories are covered by the license " "grant including the revision numbers where any specially licensed material " @@ -8142,7 +8207,7 @@ msgstr "" "особыми условиями лицензирования." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2855 +#: documentation/content/en/articles/committers-guide/_index.adoc:2870 msgid "" "The date the license comes into effect from. Unless otherwise agreed, this " "will be the date the license was issued by the authors of the software in " @@ -8152,12 +8217,12 @@ msgstr "" "выдачи лицензии авторами соответствующего программного обеспечения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2856 +#: documentation/content/en/articles/committers-guide/_index.adoc:2871 msgid "The license text." msgstr "Текст лицензии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2857 +#: documentation/content/en/articles/committers-guide/_index.adoc:2872 msgid "" "A note of any restrictions, limitations or exceptions that apply " "specifically to FreeBSD's usage of the licensed material." @@ -8166,12 +8231,12 @@ msgstr "" "применяются конкретно к использованию лицензионных материалов в FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2858 +#: documentation/content/en/articles/committers-guide/_index.adoc:2873 msgid "Any other relevant information." msgstr "Любая другая соответствующая информация." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2861 +#: documentation/content/en/articles/committers-guide/_index.adoc:2876 msgid "" "Once the {core-email} is satisfied that all the necessary details have been " "gathered and are correct, the secretary will send a PGP-signed " @@ -8185,7 +8250,7 @@ msgstr "" "служить нашим постоянным свидетельством о предоставлении лицензии." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2864 +#: documentation/content/en/articles/committers-guide/_index.adoc:2879 msgid "" "The license archive should contain only details of license grants; this is " "not the place for any discussions around licensing or other subjects. " @@ -8197,62 +8262,48 @@ msgstr "" "данным в архиве лицензий будет предоставляться по запросу в {core-email}." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2866 +#: documentation/content/en/articles/committers-guide/_index.adoc:2881 #, no-wrap msgid "SPDX Tags in the tree" msgstr "Теги SPDX в дереве" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2877 +#: documentation/content/en/articles/committers-guide/_index.adoc:2889 msgid "" -"The project uses https://spdx.dev[SPDX] tags in our source base. At " -"present, these tags are indented to help automated tools reconstruct license " -"requirements mechanically. All _SPDX-License-Identifier_ tags in the tree " -"should be considered to be informative. All files in the FreeBSD source " -"tree with these tags also have a copy of the license which governs use of " -"that file. In the event of a discrepancy, the verbatim license is " -"controlling. The project tries to follow the https://spdx.github.io/spdx-" -"spec/v2.2.2/[SPDX Specification, Version 2.2]. How to mark source files and " -"valid algebraic expressions are found in https://spdx.github.io/spdx-spec/" -"v2.2.2/SPDX-license-expressions/[Annex D] and https://spdx.github.io/spdx-" -"spec/v2.2.2/using-SPDX-short-identifiers-in-source-files/[Annex E]. The " -"project draws identifiers from SPDX's list of valid https://spdx.org/" -"licenses/[short license identifiers]. The project uses only the _SPDX-" -"License-Identifier_ tag." +"The project uses https://spdx.dev[SPDX] tags in our source base. SPDX-only " +"license marking (without reproducing the full license text) is strongly " +"preferred for new files. When a file contains only a copyright notice and " +"an SPDX-License-Identifier tag, the SPDX tag specifies the license for that " +"file. When a file contains both an SPDX-License-Identifier tag and the full " +"verbatim license text, the SPDX tag is informative and the verbatim license " +"is controlling in the event of a discrepancy. The project draws identifiers " +"from SPDX's list of valid https://spdx.org/licenses/[short license " +"identifiers] and uses only the _SPDX-License-Identifier_ tag. See the " +"extref:{license-guide}[FreeBSD License Policies] article for the full " +"specification of how SPDX expressions are used in the FreeBSD software " +"collection." msgstr "" -"Проект использует теги https://spdx.dev[SPDX] в нашей исходной базе. На " -"данный момент эти теги выделены отступами, чтобы автоматизированные средства " -"могли программно извлекать лицензионные условия. Все теги _SPDX-License-" -"Identifier_ в дереве следует считать информативными. Все файлы в дереве " -"исходных кодов FreeBSD с этими тегами также содержат копию лицензии, " -"регулирующей использование данного файла. Если возникает противоречие, " -"руководствоваться следует дословным текстом лицензии. Проект старается " -"следовать https://spdx.github.io/spdx-spec/v2.2.2/[Спецификации SPDX, версия " -"2.2]. Инструкцию, как помечать исходные файлы, и допустимые алгебраические " -"выражения можно найти в https://spdx.github.io/spdx-spec/v2.2.2/SPDX-license-" -"expressions/[Приложении D] и https://spdx.github.io/spdx-spec/v2.2.2/using-" -"SPDX-short-identifiers-in-source-files/[Приложении E]. Проект берет " -"идентификаторы из списка допустимых https://spdx.org/licenses/[кратких " -"лицензионных идентификаторов] SPDX. Проект использует только тег _SPDX-" -"License-Identifier_." - -#. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2879 -msgid "" -"As of March 2021, approximately 25,000 out of 90,000 files in the tree have " -"been marked." -msgstr "" -"По состоянию на март 2021 года примерно 25 000 из 90 000 файлов в дереве " -"были помечены." +"Проект использует теги https://spdx.dev[SPDX] в нашей базе исходного кода. " +"Разметка исключительно на основе SPDX (без воспроизведения полного текста " +"лицензии) настоятельно рекомендуется для новых файлов. Когда файл содержит " +"только уведомление об авторских правах и тег SPDX-License-Identifier, тег " +"SPDX определяет лицензию для этого файла. Когда файл содержит как тег SPDX-" +"License-Identifier, так и полный дословный текст лицензии, тег SPDX носит " +"информативный характер, а дословный текст лицензии имеет преимущественную " +"силу в случае расхождений. Проект использует идентификаторы из списка " +"допустимых https://spdx.org/licenses/[кратких идентификаторов лицензий] SPDX " +"и применяет только тег _SPDX-License-Identifier_. Смотрите статью extref" +":{license-guide}[FreeBSD License Policies] для полной спецификации того, как " +"выражения SPDX используются в коллекции программного обеспечения FreeBSD." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2880 +#: documentation/content/en/articles/committers-guide/_index.adoc:2890 #, no-wrap msgid "Developer Relations" msgstr "Отношения с разработчиками" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2886 +#: documentation/content/en/articles/committers-guide/_index.adoc:2896 msgid "" "When working directly on your own code or on code which is already well " "established as your responsibility, then there is probably little need to " @@ -8275,7 +8326,7 @@ msgstr "" "filename]#Makefile#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2890 +#: documentation/content/en/articles/committers-guide/_index.adoc:2900 msgid "" "To determine if an area of the tree is maintained, check the MAINTAINERS " "file at the root of the tree. If nobody is listed, scan the revision " @@ -8292,13 +8343,13 @@ msgstr "" "автора, отсортированных по убыванию количества коммитов, используйте:" #. type: delimited block - 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2894 +#: documentation/content/en/articles/committers-guide/_index.adoc:2904 #, no-wrap msgid "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n" msgstr "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2897 +#: documentation/content/en/articles/committers-guide/_index.adoc:2907 msgid "" "If queries go unanswered or the committer otherwise indicates a lack of " "interest in the area affected, go ahead and commit it." @@ -8307,7 +8358,7 @@ msgstr "" "отсутствие интереса к затронутой области, можно смело выполнять коммит." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2902 +#: documentation/content/en/articles/committers-guide/_index.adoc:2912 msgid "" "Avoid sending private emails to maintainers. Other people might be " "interested in the conversation, not just the final output." @@ -8316,7 +8367,7 @@ msgstr "" "заинтересовать не только итоговый результат, но и обсуждение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2908 +#: documentation/content/en/articles/committers-guide/_index.adoc:2918 msgid "" "If there is any doubt about a commit for any reason at all, have it reviewed " "before committing. Better to have it flamed then and there rather than when " @@ -8333,7 +8384,7 @@ msgstr "" "вернуть всё обратно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2912 +#: documentation/content/en/articles/committers-guide/_index.adoc:2922 msgid "" "Do not impugn the intentions of others. If they see a different solution to " "a problem, or even a different problem, it is probably not because they are " @@ -8348,7 +8399,7 @@ msgstr "" "хорошо." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2915 +#: documentation/content/en/articles/committers-guide/_index.adoc:2925 msgid "" "Disagree honestly. Argue your position from its merits, be honest about any " "shortcomings it may have, and be open to seeing their solution, or even " @@ -8359,7 +8410,7 @@ msgstr "" "понимания их решения или даже их видения проблемы." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2921 +#: documentation/content/en/articles/committers-guide/_index.adoc:2931 msgid "" "Accept correction. We are all fallible. When you have made a mistake, " "apologize and get on with life. Do not beat up yourself, and certainly do " @@ -8372,7 +8423,7 @@ msgstr "" "обвинения — просто исправьте проблему и двигайтесь дальше." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2925 +#: documentation/content/en/articles/committers-guide/_index.adoc:2935 msgid "" "Ask for help. Seek out (and give) peer reviews. One of the ways open " "source software is supposed to excel is in the number of eyeballs applied to " @@ -8383,13 +8434,13 @@ msgstr "" "количестве проверяющих; но это не работает, если никто не проверяет код." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2927 +#: documentation/content/en/articles/committers-guide/_index.adoc:2937 #, no-wrap msgid "If in Doubt..." msgstr "Если сомневаетесь..." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2931 +#: documentation/content/en/articles/committers-guide/_index.adoc:2941 msgid "" "When unsure about something, whether it be a technical issue or a project " "convention be sure to ask. If you stay silent you will never make progress." @@ -8399,7 +8450,7 @@ msgstr "" "продвинетесь вперёд." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2935 +#: documentation/content/en/articles/committers-guide/_index.adoc:2945 msgid "" "If it relates to a technical issue ask on the public mailing lists. Avoid " "the temptation to email the individual person that knows the answer. This " @@ -8410,36 +8461,36 @@ msgstr "" "каждый сможет извлечь пользу из вопроса и ответа." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2937 +#: documentation/content/en/articles/committers-guide/_index.adoc:2947 msgid "For project specific or administrative questions ask, in order:" msgstr "" "Для административных вопросов и вопросов, связанных с конкретным проектом, " "обращайтесь в следующем порядке:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2939 +#: documentation/content/en/articles/committers-guide/_index.adoc:2949 msgid "Your mentor or former mentor." msgstr "Ваш наставник или бывший наставник." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2940 +#: documentation/content/en/articles/committers-guide/_index.adoc:2950 msgid "An experienced committer on IRC, email, etc." msgstr "Опытный коммиттер — по IRC, электронной почте и т.д." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2941 +#: documentation/content/en/articles/committers-guide/_index.adoc:2951 msgid "Any team with a \"hat\", as they can give you a definitive answer." msgstr "" "Любая команда с ролью (\"hat\"), так как в ней вам могут дать окончательный " "ответ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2942 +#: documentation/content/en/articles/committers-guide/_index.adoc:2952 msgid "If still not sure, ask on {developers-name}." msgstr "Если всё ещё не уверены, спросите на {developers-name}." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2944 +#: documentation/content/en/articles/committers-guide/_index.adoc:2954 msgid "" "Once your question is answered, if no one pointed you to documentation that " "spelled out the answer to your question, document it, as others will have " @@ -8450,13 +8501,13 @@ msgstr "" "возникнет тот же вопрос." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2946 +#: documentation/content/en/articles/committers-guide/_index.adoc:2956 #, no-wrap msgid "Bugzilla" msgstr "Bugzilla" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2951 +#: documentation/content/en/articles/committers-guide/_index.adoc:2961 msgid "" "The FreeBSD Project utilizes Bugzilla for tracking bugs and change " "requests. If you commit a fix or suggestion found in the PR database, be " @@ -8469,7 +8520,7 @@ msgstr "" "время закрыть другие PR, связанные с вашими коммитами." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2953 +#: documentation/content/en/articles/committers-guide/_index.adoc:2963 msgid "" "Committers with non-``FreeBSD.org`` Bugzilla accounts can have the old " "account merged with the `FreeBSD.org` account by following these steps:" @@ -8479,12 +8530,12 @@ msgstr "" "следующие шаги:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2957 +#: documentation/content/en/articles/committers-guide/_index.adoc:2967 msgid "Log in using your old account." msgstr "Войдите, используя старую учётную запись." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2958 +#: documentation/content/en/articles/committers-guide/_index.adoc:2968 msgid "" "Open new bug. Choose `Services` as the Product, and `Bug Tracker` as the " "Component. In bug description list accounts you wish to be merged." @@ -8494,7 +8545,7 @@ msgstr "" "объединить." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2960 +#: documentation/content/en/articles/committers-guide/_index.adoc:2970 msgid "" "Log in using `FreeBSD.org` account and post comment to newly opened bug to " "confirm ownership. See crossref:committers-guide[kerberos-ldap, Kerberos and " @@ -8504,11 +8555,11 @@ msgstr "" "Войдите, используя учётную запись `FreeBSD.org`, и оставьте комментарий к " "только что созданной ошибке, чтобы подтвердить владение. Дополнительные " "сведения о том, как сгенерировать или установить пароль для вашей учётной " -"записи `FreeBSD.org`, см. в crossref:committers-guide[kerberos-ldap, " +"записи `FreeBSD.org`, см. в разделе crossref:committers-guide[kerberos-ldap, " "Kerberos и LDAP веб-пароль для кластера FreeBSD]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2961 +#: documentation/content/en/articles/committers-guide/_index.adoc:2971 msgid "" "If there are more than two accounts to merge, post comments from each of " "them." @@ -8517,30 +8568,30 @@ msgstr "" "от каждой из них." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2964 +#: documentation/content/en/articles/committers-guide/_index.adoc:2974 msgid "You can find out more about Bugzilla at:" msgstr "Вы можете узнать больше о Bugzilla на:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2966 +#: documentation/content/en/articles/committers-guide/_index.adoc:2976 msgid "extref:{pr-guidelines}[FreeBSD Problem Report Handling Guidelines]" msgstr "" "extref:{pr-guidelines}[Рекомендации по работе с сообщениями о проблемах " "FreeBSD]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2967 +#: documentation/content/en/articles/committers-guide/_index.adoc:2977 msgid "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" msgstr "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2969 +#: documentation/content/en/articles/committers-guide/_index.adoc:2979 #, no-wrap msgid "Phabricator" msgstr "Phabricator" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2973 +#: documentation/content/en/articles/committers-guide/_index.adoc:2983 msgid "" "The FreeBSD Project utilizes https://reviews.freebsd.org[Phabricator] for " "code review requests. See the https://wiki.freebsd.org/" @@ -8551,7 +8602,7 @@ msgstr "" "freebsd.org/Phabricator[странице Phabricator в вики]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2976 +#: documentation/content/en/articles/committers-guide/_index.adoc:2986 msgid "" "Please use the `git arc` command provided by `devel/freebsd-git-arc` " "(install the port or package, then type `git help arc` for documentation) to " @@ -8564,7 +8615,7 @@ msgstr "" "Это упростит другим процесс рецензирования и тестирования ваших патчей." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2978 +#: documentation/content/en/articles/committers-guide/_index.adoc:2988 msgid "" "Committers with non-``FreeBSD.org`` Phabricator accounts can have the old " "account renamed to the ``FreeBSD.org`` account by following these steps:" @@ -8574,14 +8625,14 @@ msgstr "" "шаги:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2982 +#: documentation/content/en/articles/committers-guide/_index.adoc:2992 msgid "Change your Phabricator account email to your `FreeBSD.org` email." msgstr "" "Измените адрес электронной почты вашей учётной записи Phabricator на ваш " "`FreeBSD.org` email." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2984 +#: documentation/content/en/articles/committers-guide/_index.adoc:2994 msgid "" "Open new bug on our bug tracker using your `FreeBSD.org` account, see " "crossref:committers-guide[bugzilla, Bugzilla] for more information. Choose " @@ -8599,7 +8650,7 @@ msgstr "" "bob_example.com/`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2989 +#: documentation/content/en/articles/committers-guide/_index.adoc:2999 msgid "" "Phabricator accounts cannot be merged, please do not open a new account." msgstr "" @@ -8607,13 +8658,13 @@ msgstr "" "создавайте новую учётную запись." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2992 +#: documentation/content/en/articles/committers-guide/_index.adoc:3002 #, no-wrap msgid "Who's Who" msgstr "Кто есть кто" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2995 +#: documentation/content/en/articles/committers-guide/_index.adoc:3005 msgid "" "Besides the repository meisters, there are other FreeBSD project members and " "teams whom you will probably get to know in your role as a committer. " @@ -8624,13 +8675,13 @@ msgstr "" "коммиттера. Кратко и далеко не исчерпывающе, вот они:" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2996 +#: documentation/content/en/articles/committers-guide/_index.adoc:3006 #, no-wrap msgid "`{doceng}`" msgstr "`{doceng}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3002 +#: documentation/content/en/articles/committers-guide/_index.adoc:3012 msgid "" "doceng is the group responsible for the documentation build infrastructure, " "approving new documentation committers, and ensuring that the FreeBSD " @@ -8653,13 +8704,13 @@ msgstr "" "[Проект документации FreeBSD: введение для новых участников]." #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:3003 +#: documentation/content/en/articles/committers-guide/_index.adoc:3013 #, no-wrap msgid "`{re-members}`" msgstr "`{re-members}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3008 +#: documentation/content/en/articles/committers-guide/_index.adoc:3018 msgid "" "These are the members of the `{re}`. This team is responsible for setting " "release deadlines and controlling the release process. During code freezes, " @@ -8677,13 +8728,13 @@ msgstr "" "вопрос." #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:3009 +#: documentation/content/en/articles/committers-guide/_index.adoc:3019 #, no-wrap msgid "`{so}`" msgstr "`{so}`" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3011 +#: documentation/content/en/articles/committers-guide/_index.adoc:3021 msgid "" "`{so-name}` is the link:https://www.FreeBSD.org/security/[FreeBSD Security " "Officer] and oversees the `{security-officer}`." @@ -8692,7 +8743,7 @@ msgstr "" "безопасность FreeBSD], который курирует работу `{security-officer}`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3016 +#: documentation/content/en/articles/committers-guide/_index.adoc:3026 msgid "" "{committers-name}:: {dev-src-all}, {dev-ports-all} and {dev-doc-all} are the " "mailing lists that the version control system uses to send commit messages " @@ -8706,7 +8757,7 @@ msgstr "" "непосредственно связаны с коммитом." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3021 +#: documentation/content/en/articles/committers-guide/_index.adoc:3031 msgid "" "{developers-name}:: All committers are subscribed to -developers. This list " "was created to be a forum for the committers \"community\" issues. Examples " @@ -8717,7 +8768,7 @@ msgstr "" "коммиттеров. Примеры включают голосования Core, объявления и т.д." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3025 +#: documentation/content/en/articles/committers-guide/_index.adoc:3035 msgid "" "The {developers-name} is for the exclusive use of FreeBSD committers. To " "develop FreeBSD, committers must have the ability to openly discuss matters " @@ -8732,7 +8783,7 @@ msgstr "" "открытой публикации и могут навредить FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3029 +#: documentation/content/en/articles/committers-guide/_index.adoc:3039 msgid "" "All FreeBSD committers are expected not to not publish or forward messages " "from the {developers-name} outside the list membership without permission of " @@ -8747,7 +8798,7 @@ msgstr "" "постоянному лишению привилегий на коммит." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3035 +#: documentation/content/en/articles/committers-guide/_index.adoc:3045 msgid "" "This list is _not_ intended as a place for code reviews or for any technical " "discussion. In fact using it as such hurts the FreeBSD Project as it gives " @@ -8769,13 +8820,13 @@ msgstr "" "от данного списка." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3036 +#: documentation/content/en/articles/committers-guide/_index.adoc:3046 #, no-wrap msgid "SSH Quick-Start Guide" msgstr "Руководство по быстрому началу работы с SSH" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3041 +#: documentation/content/en/articles/committers-guide/_index.adoc:3051 msgid "" "If you do not wish to type your password in every time you use man:ssh[1], " "and you use keys to authenticate, man:ssh-agent[1] is there for your " @@ -8792,7 +8843,7 @@ msgstr "" "Подробности см. в man:ssh-agent[1]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3042 +#: documentation/content/en/articles/committers-guide/_index.adoc:3052 msgid "" "Generate a key pair using man:ssh-keygen[1]. The key pair will wind up in " "your [.filename]#$HOME/.ssh/# directory." @@ -8801,12 +8852,12 @@ msgstr "" "вашем каталоге [.filename]#$HOME/.ssh/#." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3046 +#: documentation/content/en/articles/committers-guide/_index.adoc:3056 msgid "Only ECDSA, Ed25519 or RSA keys are supported." msgstr "Поддерживаются только ключи ECDSA, Ed25519 или RSA." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3048 +#: documentation/content/en/articles/committers-guide/_index.adoc:3058 msgid "" "Send your public key ([.filename]#$HOME/.ssh/id_ecdsa.pub#, [.filename]#" "$HOME/.ssh/id_ed25519.pub#, or [.filename]#$HOME/.ssh/id_rsa.pub#) to the " @@ -8820,7 +8871,7 @@ msgstr "" "`freefall`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3053 +#: documentation/content/en/articles/committers-guide/_index.adoc:3063 msgid "" "Now man:ssh-add[1] can be used for authentication once per session. It " "prompts for the private key's pass phrase, and then stores it in the " @@ -8833,14 +8884,14 @@ msgstr "" "удаления ключей, сохранённых в агенте." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3055 +#: documentation/content/en/articles/committers-guide/_index.adoc:3065 msgid "Test with a simple remote command: `ssh freefall.FreeBSD.org ls /usr`." msgstr "" "Проверка с помощью простой удалённой команды: `ssh freefall.FreeBSD.org ls /" "usr`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3057 +#: documentation/content/en/articles/committers-guide/_index.adoc:3067 msgid "" "For more information, see package:security/openssh-portable[], man:ssh[1], " "man:ssh-add[1], man:ssh-agent[1], man:ssh-keygen[1], and man:scp[1]." @@ -8850,7 +8901,7 @@ msgstr "" "и man:scp[1]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3059 +#: documentation/content/en/articles/committers-guide/_index.adoc:3069 msgid "" "For information on adding, changing, or removing man:ssh[1] keys, see " "https://wiki.freebsd.org/clusteradm/ssh-keys[this article]." @@ -8859,13 +8910,13 @@ msgstr "" "https://wiki.freebsd.org/clusteradm/ssh-keys[эту статью]." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3061 +#: documentation/content/en/articles/committers-guide/_index.adoc:3071 #, no-wrap msgid "Coverity(R) Availability for FreeBSD Committers" msgstr "Доступность Coverity(R) для коммиттеров FreeBSD" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3065 +#: documentation/content/en/articles/committers-guide/_index.adoc:3075 msgid "" "All FreeBSD developers can obtain access to Coverity analysis results of all " "FreeBSD Project software. All who are interested in obtaining access to the " @@ -8878,7 +8929,7 @@ msgstr "" "могут зарегистрироваться на http://scan.coverity.com/[Coverity Scan]." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3068 +#: documentation/content/en/articles/committers-guide/_index.adoc:3078 msgid "" "The FreeBSD wiki includes a mini-guide for developers who are interested in " "working with the Coverity(R) analysis reports: https://wiki.freebsd.org/" @@ -8895,7 +8946,7 @@ msgstr "" "добавить вас в соответствующий список доступа к вики." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3070 +#: documentation/content/en/articles/committers-guide/_index.adoc:3080 msgid "" "Finally, all FreeBSD developers who are going to use Coverity(R) are always " "encouraged to ask for more details and usage information, by posting any " @@ -8906,13 +8957,13 @@ msgstr "" "использовании, задав любые вопросы в списке рассылки разработчиков FreeBSD." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3072 +#: documentation/content/en/articles/committers-guide/_index.adoc:3082 #, no-wrap msgid "The FreeBSD Committers' Big List of Rules" msgstr "Большой список правил коммиттеров FreeBSD" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3077 +#: documentation/content/en/articles/committers-guide/_index.adoc:3087 msgid "" "Everyone involved with the FreeBSD project is expected to abide by the _Code " "of Conduct_ available from link:https://www.FreeBSD.org/internal/code-of-" @@ -8929,25 +8980,25 @@ msgstr "" "поведения_, относящиеся к коммиттерам." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3079 -#: documentation/content/en/articles/committers-guide/_index.adoc:3109 +#: documentation/content/en/articles/committers-guide/_index.adoc:3089 +#: documentation/content/en/articles/committers-guide/_index.adoc:3119 msgid "Respect other committers." msgstr "Уважайте других коммиттеров." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3080 -#: documentation/content/en/articles/committers-guide/_index.adoc:3125 +#: documentation/content/en/articles/committers-guide/_index.adoc:3090 +#: documentation/content/en/articles/committers-guide/_index.adoc:3135 msgid "Respect other contributors." msgstr "Уважайте других участников." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3081 -#: documentation/content/en/articles/committers-guide/_index.adoc:3140 +#: documentation/content/en/articles/committers-guide/_index.adoc:3091 +#: documentation/content/en/articles/committers-guide/_index.adoc:3150 msgid "Discuss any significant change _before_ committing." msgstr "Обсудите любые значительные изменения _перед_ коммитом." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3082 +#: documentation/content/en/articles/committers-guide/_index.adoc:3092 msgid "" "Respect existing maintainers (if listed in the `MAINTAINER` field in [." "filename]#Makefile# or in [.filename]#MAINTAINER# in the top-level " @@ -8958,8 +9009,8 @@ msgstr "" "каталоге)." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3083 -#: documentation/content/en/articles/committers-guide/_index.adoc:3155 +#: documentation/content/en/articles/committers-guide/_index.adoc:3093 +#: documentation/content/en/articles/committers-guide/_index.adoc:3165 msgid "" "Any disputed change must be backed out pending resolution of the dispute if " "requested by a maintainer. Security related changes may override a " @@ -8971,7 +9022,7 @@ msgstr "" "безопасность." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3084 +#: documentation/content/en/articles/committers-guide/_index.adoc:3094 msgid "" "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically " "permitted by the release engineer or unless they are not applicable to " @@ -8990,15 +9041,15 @@ msgstr "" "правилу №5." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3085 -#: documentation/content/en/articles/committers-guide/_index.adoc:3170 +#: documentation/content/en/articles/committers-guide/_index.adoc:3095 +#: documentation/content/en/articles/committers-guide/_index.adoc:3180 msgid "Do not fight in public with other committers; it looks bad." msgstr "" "Не устраивайте публичные разборки с другими разработчиками; это выглядит " "плохо." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3086 +#: documentation/content/en/articles/committers-guide/_index.adoc:3096 msgid "" "Respect all code freezes and read the `committers` and `developers` mailing " "lists in a timely manner so you know when a code freeze is in effect." @@ -9007,20 +9058,20 @@ msgstr "" "`committers` и `developers`, чтобы знать, когда действует заморозка кода." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3087 -#: documentation/content/en/articles/committers-guide/_index.adoc:3185 +#: documentation/content/en/articles/committers-guide/_index.adoc:3097 +#: documentation/content/en/articles/committers-guide/_index.adoc:3195 msgid "When in doubt on any procedure, ask first!" msgstr "Если сомневаетесь в каком-либо действии — сначала спросите!" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3088 -#: documentation/content/en/articles/committers-guide/_index.adoc:3190 +#: documentation/content/en/articles/committers-guide/_index.adoc:3098 +#: documentation/content/en/articles/committers-guide/_index.adoc:3200 msgid "Test your changes before committing them." msgstr "Проверьте свои изменения перед их применением." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3089 -#: documentation/content/en/articles/committers-guide/_index.adoc:3200 +#: documentation/content/en/articles/committers-guide/_index.adoc:3099 +#: documentation/content/en/articles/committers-guide/_index.adoc:3210 msgid "" "Do not commit to contributed software without _explicit_ approval from the " "respective maintainers." @@ -9029,7 +9080,7 @@ msgstr "" "одобрения соответствующих сопровождающих." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3100 +#: documentation/content/en/articles/committers-guide/_index.adoc:3110 msgid "" "As noted, breaking some of these rules can be grounds for suspension or, " "upon repeated offense, permanent removal of commit privileges. Individual " @@ -9079,7 +9130,7 @@ msgstr "" "правильным." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3104 +#: documentation/content/en/articles/committers-guide/_index.adoc:3114 msgid "" "In all other aspects of project operation, core is a subset of committers " "and is bound by the __same rules__. Just because someone is in core this " @@ -9097,13 +9148,13 @@ msgstr "" "только во вторую очередь — основная команда." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3105 +#: documentation/content/en/articles/committers-guide/_index.adoc:3115 #, no-wrap msgid "Details" msgstr "Подробности" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3113 +#: documentation/content/en/articles/committers-guide/_index.adoc:3123 msgid "" "This means that you need to treat other committers as the peer-group " "developers that they are. Despite our occasional attempts to prove the " @@ -9122,7 +9173,7 @@ msgstr "" "всегда — как на публичных форумах, так и в личной переписке." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3115 +#: documentation/content/en/articles/committers-guide/_index.adoc:3125 msgid "" "Being able to work together long term is this project's greatest asset, one " "far more important than any set of changes to the code, and turning " @@ -9136,7 +9187,7 @@ msgstr "" "вместе, ни при каких обстоятельствах не стоит того." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3121 +#: documentation/content/en/articles/committers-guide/_index.adoc:3131 msgid "" "To comply with this rule, do not send email when you are angry or otherwise " "behave in a manner which is likely to strike others as needlessly " @@ -9168,7 +9219,7 @@ msgstr "" "вовлечённые в жалобу, предоставят её добровольно." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3124 +#: documentation/content/en/articles/committers-guide/_index.adoc:3134 msgid "" "All of this is never an option which the project's leadership enjoys in the " "slightest, but unity comes first. No amount of code or good advice is worth " @@ -9179,7 +9230,7 @@ msgstr "" "полезных советов не стоит того, чтобы этим пожертвовать." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3137 +#: documentation/content/en/articles/committers-guide/_index.adoc:3147 msgid "" "You were not always a committer. At one time you were a contributor. " "Remember that at all times. Remember what it was like trying to get help " @@ -9201,7 +9252,7 @@ msgstr "" "чем стали коммиттером. Всегда помните об этом." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3139 +#: documentation/content/en/articles/committers-guide/_index.adoc:3149 msgid "" "Consider the points raised under crossref:committers-guide[respect,Respect " "other committers] and apply them also to contributors." @@ -9210,7 +9261,7 @@ msgstr "" "Уважайте других коммиттеров], и применяйте их также к контрибьюторам." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3146 +#: documentation/content/en/articles/committers-guide/_index.adoc:3156 msgid "" "The repository is not where changes are initially submitted for correctness " "or argued over, that happens first in the mailing lists or by use of the " @@ -9238,17 +9289,17 @@ msgstr "" "несколькими другими коммиттерами." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3148 +#: documentation/content/en/articles/committers-guide/_index.adoc:3158 msgid "When in doubt, ask for review!" msgstr "Если сомневаетесь, запросите рецензию!" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3149 +#: documentation/content/en/articles/committers-guide/_index.adoc:3159 msgid "Respect existing maintainers if listed." msgstr "Уважайте существующих сопровождающих, если они указаны." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3154 +#: documentation/content/en/articles/committers-guide/_index.adoc:3164 msgid "" "Many parts of FreeBSD are not \"owned\" in the sense that any specific " "individual will jump up and yell if you commit a change to \"their\" area, " @@ -9276,7 +9327,7 @@ msgstr "" "работал ли кто-то недавно или преимущественно в этой области." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3160 +#: documentation/content/en/articles/committers-guide/_index.adoc:3170 msgid "" "This may be hard to swallow in times of conflict (when each side is " "convinced that they are in the right, of course) but a version control " @@ -9305,7 +9356,7 @@ msgstr "" "сразу перейти к выяснению, было ли изменение ошибочным или нет." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3161 +#: documentation/content/en/articles/committers-guide/_index.adoc:3171 msgid "" "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically " "permitted by the release engineer or unless they are not applicable to " @@ -9322,7 +9373,7 @@ msgstr "" "полномочия в отношении ветки FreeBSD-STABLE, как указано в правиле №5." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3167 +#: documentation/content/en/articles/committers-guide/_index.adoc:3177 msgid "" "This is another \"do not argue about it\" issue since it is the release " "engineer who is ultimately responsible (and gets beaten up) if a change " @@ -9355,7 +9406,7 @@ msgstr "" "опечаток и т.д.). Другими словами, руководствуйтесь здравым смыслом." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3169 +#: documentation/content/en/articles/committers-guide/_index.adoc:3179 msgid "" "Changes to the security branches (for example, `releng/9.3`) must be " "approved by a member of the `{security-officer}`, or in some cases, by a " @@ -9366,7 +9417,7 @@ msgstr "" "членом группы — `{re}`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3180 +#: documentation/content/en/articles/committers-guide/_index.adoc:3190 msgid "" "This project has a public image to uphold and that image is very important " "to all of us, especially if we are to continue to attract new members. " @@ -9411,7 +9462,7 @@ msgstr "" "принятым этой третьей стороной." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3181 +#: documentation/content/en/articles/committers-guide/_index.adoc:3191 msgid "" "Respect all code freezes and read the `committers` and `developers` mailing " "list on a timely basis so you know when a code freeze is in effect." @@ -9420,7 +9471,7 @@ msgstr "" "`committers` и `developers`, чтобы знать, когда действует заморозка кода." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3184 +#: documentation/content/en/articles/committers-guide/_index.adoc:3194 msgid "" "Committing unapproved changes during a code freeze is a really big mistake " "and committers are expected to keep up-to-date on what is going on before " @@ -9437,7 +9488,7 @@ msgstr "" "перевоспитания FreeBSD, который мы проводим в Гренландии." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3189 +#: documentation/content/en/articles/committers-guide/_index.adoc:3199 msgid "" "Many mistakes are made because someone is in a hurry and just assumes they " "know the right way of doing something. If you have not done it before, " @@ -9456,7 +9507,7 @@ msgstr "" "вы не были бы коммиттером." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3199 +#: documentation/content/en/articles/committers-guide/_index.adoc:3209 msgid "" "If your changes are to the kernel, make sure you can still compile both " "GENERIC and LINT. If your changes are anywhere else, make sure you can " @@ -9485,7 +9536,7 @@ msgstr "" "будут предоставлены соответствующие общие ресурсы для тестирования." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3202 +#: documentation/content/en/articles/committers-guide/_index.adoc:3212 msgid "" "Contributed software is anything under the [.filename]#src/contrib#, [." "filename]#src/crypto#, or [.filename]#src/sys/contrib# trees." @@ -9495,7 +9546,7 @@ msgstr "" "filename]#src/sys/contrib#." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3207 +#: documentation/content/en/articles/committers-guide/_index.adoc:3217 msgid "" "The trees mentioned above are for contributed software usually imported onto " "a vendor branch. Committing something there may cause unnecessary headaches " @@ -9511,7 +9562,7 @@ msgstr "" "сопровождающего." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3211 +#: documentation/content/en/articles/committers-guide/_index.adoc:3221 msgid "" "Reasons for modifying upstream software range from wanting strict control " "over a tightly coupled dependency to lack of portability in the canonical " @@ -9530,7 +9581,7 @@ msgstr "" "необходимо вручную перепроверять при каждом импорте." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3214 +#: documentation/content/en/articles/committers-guide/_index.adoc:3224 msgid "" "If a particular piece of software lacks a maintainer, you are encouraged to " "take up ownership. If you are unsure of the current maintainership email " @@ -9541,13 +9592,13 @@ msgstr "" "текущем сопровождении, напишите на {freebsd-arch} и уточните." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3215 +#: documentation/content/en/articles/committers-guide/_index.adoc:3225 #, no-wrap msgid "Policy on Multiple Architectures" msgstr "Политика поддержки нескольких архитектур" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3218 +#: documentation/content/en/articles/committers-guide/_index.adoc:3228 msgid "" "In an effort to make it easier to keep FreeBSD portable across the platforms " "we support, core has developed this mandate:" @@ -9556,7 +9607,7 @@ msgstr "" "поддерживаем, ядро системы разработало следующее предписание:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3221 +#: documentation/content/en/articles/committers-guide/_index.adoc:3231 msgid "" "Major design work (including major API and ABI changes) must prove itself on " "at least one Tier 1 platform before it may be committed to the source tree." @@ -9566,7 +9617,7 @@ msgstr "" "перед тем, как они могут быть включены в дерево исходного кода." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3225 +#: documentation/content/en/articles/committers-guide/_index.adoc:3235 msgid "" "Developers should also be aware of our Tier Policy for the long term support " "of hardware architectures. The rules here are intended to provide guidance " @@ -9583,13 +9634,13 @@ msgstr "" "чем правила для изменений в процессе разработки." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3227 +#: documentation/content/en/articles/committers-guide/_index.adoc:3237 #, no-wrap msgid "Policy on Multiple Compilers" msgstr "Политика по использованию нескольких компиляторов" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3241 +#: documentation/content/en/articles/committers-guide/_index.adoc:3251 msgid "" "The FreeBSD base system builds with both Clang and GCC. The project does " "this in a careful and controlled way to maximize benefits from this extra " @@ -9640,7 +9691,7 @@ msgstr "" "с этим связаны." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3246 +#: documentation/content/en/articles/committers-guide/_index.adoc:3256 msgid "" "The FreeBSD base system includes an in-tree Clang compiler. Due to being in " "the tree, this compiler is the most supported compiler. All changes must " @@ -9654,7 +9705,7 @@ msgstr "" "проводиться с этим компилятором." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3261 +#: documentation/content/en/articles/committers-guide/_index.adoc:3271 msgid "" "The FreeBSD base system also supports various versions of Clang and GCC as " "out-of-tree compilers. For large or risky changes, committers should do a " @@ -9695,7 +9746,7 @@ msgstr "" "только несколько архитектур могут быть полностью собраны с помощью GCC." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3265 +#: documentation/content/en/articles/committers-guide/_index.adoc:3275 msgid "" "The FreeBSD project also has some CI pipelines on github. For pull requests " "on github and some branches pushed to github forks, a number of cross " @@ -9709,7 +9760,7 @@ msgstr "" "встроенного компилятора на одну или несколько основных версий." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3271 +#: documentation/content/en/articles/committers-guide/_index.adoc:3281 msgid "" "The FreeBSD project is also upgrading compilers. Both Clang and GCC are " "fast moving targets. Some work to change things in the tree, for example " @@ -9730,7 +9781,7 @@ msgstr "" "подозрение на необнаруженную регрессию." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3275 +#: documentation/content/en/articles/committers-guide/_index.adoc:3285 msgid "" "In addition to the compiler, LLVM's LLD and GNU's binutils are used " "indirectly by the compiler. Committers should be mindful of variations in " @@ -9745,7 +9796,7 @@ msgstr "" "рамках CI-задач FreeBSD для Clang или GCC." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3281 +#: documentation/content/en/articles/committers-guide/_index.adoc:3291 msgid "" "The FreeBSD project provides headers and libraries that allow other " "compilers to be used to build software not in the base system. These " @@ -9772,7 +9823,7 @@ msgstr "" "а при обнаружении проблем — оперативно их исправлять." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3286 +#: documentation/content/en/articles/committers-guide/_index.adoc:3296 msgid "" "The FreeBSD build system currently accommodates these different " "environments. As new warnings are added to compilers, the project tries to " @@ -9791,13 +9842,13 @@ msgstr "" "правильную условную обработку любых флагов, специфичных для компилятора." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3287 +#: documentation/content/en/articles/committers-guide/_index.adoc:3297 #, no-wrap msgid "Current Compiler Versions" msgstr "Текущие версии компиляторов" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3290 +#: documentation/content/en/articles/committers-guide/_index.adoc:3300 msgid "" "The versions of supported compilers for a given branch such as `main` or " "`stable/X` varies over time. The authoritative source for supported " @@ -9810,127 +9861,127 @@ msgstr "" "тестируемые в кросс-сборках GitHub Actions и Jenkins." #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3294 +#: documentation/content/en/articles/committers-guide/_index.adoc:3304 #, no-wrap msgid "Branch" msgstr "Ветка" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #, no-wrap msgid "In-tree Compiler" msgstr "Компилятор ветки" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #, no-wrap msgid "llvm12" msgstr "llvm12" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #, no-wrap msgid "llvm13" msgstr "llvm13" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #, no-wrap msgid "llvm14" msgstr "llvm14" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #, no-wrap msgid "llvm15" msgstr "llvm15" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3296 +#: documentation/content/en/articles/committers-guide/_index.adoc:3306 #, no-wrap msgid "llvm18" msgstr "llvm18" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3296 +#: documentation/content/en/articles/committers-guide/_index.adoc:3306 #, no-wrap msgid "amd64-gcc12" msgstr "amd64-gcc12" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3296 +#: documentation/content/en/articles/committers-guide/_index.adoc:3306 #, no-wrap msgid "amd64-gcc13" msgstr "amd64-gcc13" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3296 +#: documentation/content/en/articles/committers-guide/_index.adoc:3306 #, no-wrap msgid "amd64-gcc14" msgstr "amd64-gcc14" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3297 +#: documentation/content/en/articles/committers-guide/_index.adoc:3307 #, no-wrap msgid "amd64-gcc15" msgstr "amd64-gcc15" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3299 +#: documentation/content/en/articles/committers-guide/_index.adoc:3309 #, no-wrap msgid "riscv64-gcc15" msgstr "riscv64-gcc15" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3299 +#: documentation/content/en/articles/committers-guide/_index.adoc:3309 #, no-wrap msgid "main" msgstr "main" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3300 -#: documentation/content/en/articles/committers-guide/_index.adoc:3305 #: documentation/content/en/articles/committers-guide/_index.adoc:3310 #: documentation/content/en/articles/committers-guide/_index.adoc:3315 +#: documentation/content/en/articles/committers-guide/_index.adoc:3320 +#: documentation/content/en/articles/committers-guide/_index.adoc:3325 #, no-wrap msgid "llvm 19" msgstr "llvm 19" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3300 -#: documentation/content/en/articles/committers-guide/_index.adoc:3301 -#: documentation/content/en/articles/committers-guide/_index.adoc:3302 -#: documentation/content/en/articles/committers-guide/_index.adoc:3304 -#: documentation/content/en/articles/committers-guide/_index.adoc:3305 -#: documentation/content/en/articles/committers-guide/_index.adoc:3306 #: documentation/content/en/articles/committers-guide/_index.adoc:3310 #: documentation/content/en/articles/committers-guide/_index.adoc:3311 +#: documentation/content/en/articles/committers-guide/_index.adoc:3312 +#: documentation/content/en/articles/committers-guide/_index.adoc:3314 #: documentation/content/en/articles/committers-guide/_index.adoc:3315 #: documentation/content/en/articles/committers-guide/_index.adoc:3316 +#: documentation/content/en/articles/committers-guide/_index.adoc:3320 +#: documentation/content/en/articles/committers-guide/_index.adoc:3321 +#: documentation/content/en/articles/committers-guide/_index.adoc:3325 +#: documentation/content/en/articles/committers-guide/_index.adoc:3326 #, no-wrap msgid "Y" msgstr "Y" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3304 +#: documentation/content/en/articles/committers-guide/_index.adoc:3314 #, no-wrap msgid "stable/15" msgstr "stable/15" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3309 +#: documentation/content/en/articles/committers-guide/_index.adoc:3319 #, no-wrap msgid "stable/14" msgstr "stable/14" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:3314 +#: documentation/content/en/articles/committers-guide/_index.adoc:3324 #, no-wrap msgid "stable/13" msgstr "stable/13" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3322 +#: documentation/content/en/articles/committers-guide/_index.adoc:3332 msgid "" "GCC toolchains are tested for amd64 and riscv64 via CI jobs in Jenkins. " "LLVM toolchains are tested for aarch64 and amd64 in GitHub's cross-build " @@ -9941,13 +9992,13 @@ msgstr "" "aarch64 и arm64 в кросс-сборках GitHub." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3323 +#: documentation/content/en/articles/committers-guide/_index.adoc:3333 #, no-wrap msgid "Other Suggestions" msgstr "Другие предложения" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3327 +#: documentation/content/en/articles/committers-guide/_index.adoc:3337 msgid "" "When committing documentation changes, use a spell checker before " "committing. For all XML docs, verify that the formatting directives are " @@ -9958,7 +10009,7 @@ msgstr "" "выполнив `make lint` и package:textproc/igor[]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3329 +#: documentation/content/en/articles/committers-guide/_index.adoc:3339 msgid "" "For manual pages, run package:sysutils/manck[] and package:textproc/igor[] " "over the manual page to verify all of the cross references and file " @@ -9971,7 +10022,7 @@ msgstr "" "руководства имеет все необходимые `MLINKS`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3336 +#: documentation/content/en/articles/committers-guide/_index.adoc:3346 msgid "" "Do not mix style fixes with new functionality. A style fix is any change " "which does not modify the functionality of the code. Mixing the changes " @@ -9992,13 +10043,13 @@ msgstr "" "отдельных коммитах, явно обозначенных как таковые в сообщении коммита." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3337 +#: documentation/content/en/articles/committers-guide/_index.adoc:3347 #, no-wrap msgid "Deprecating Features" msgstr "Устаревающие функции" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3340 +#: documentation/content/en/articles/committers-guide/_index.adoc:3350 msgid "" "When it is necessary to remove functionality from software in the base " "system, follow these guidelines whenever possible:" @@ -10007,7 +10058,7 @@ msgstr "" "базовой системе, по возможности следуйте этим рекомендациям:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3342 +#: documentation/content/en/articles/committers-guide/_index.adoc:3352 msgid "" "Mention is made in the manual page and possibly the release notes that the " "option, utility, or interface is deprecated. Use of the deprecated feature " @@ -10018,7 +10069,7 @@ msgstr "" "функции вызывает предупреждение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3343 +#: documentation/content/en/articles/committers-guide/_index.adoc:3353 msgid "" "The option, utility, or interface is preserved until the next major (point " "zero) release." @@ -10027,7 +10078,7 @@ msgstr "" "ноль) релиза." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3344 +#: documentation/content/en/articles/committers-guide/_index.adoc:3354 msgid "" "The option, utility, or interface is removed and no longer documented. It is " "now obsolete. It is also generally a good idea to note its removal in the " @@ -10038,18 +10089,18 @@ msgstr "" "примечаниях к выпуску." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3345 +#: documentation/content/en/articles/committers-guide/_index.adoc:3355 #, no-wrap msgid "Privacy and Confidentiality" msgstr "Конфиденциальность и приватность" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3348 +#: documentation/content/en/articles/committers-guide/_index.adoc:3358 msgid "Most FreeBSD business is done in public." msgstr "Большая часть работы над FreeBSD выполняется публично." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3351 +#: documentation/content/en/articles/committers-guide/_index.adoc:3361 msgid "" "FreeBSD is an _open_ project. Which means that not only can anyone use the " "source code, but that most of the development process is open to public " @@ -10060,14 +10111,14 @@ msgstr "" "для публичного изучения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3352 +#: documentation/content/en/articles/committers-guide/_index.adoc:3362 msgid "Certain sensitive matters must remain private or held under embargo." msgstr "" "Некоторые конфиденциальные вопросы должны оставаться в тайне или быть под " "запретом на разглашение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3358 +#: documentation/content/en/articles/committers-guide/_index.adoc:3368 msgid "" "There unfortunately cannot be complete transparency. As a FreeBSD developer " "you will have a certain degree of privileged access to information. " @@ -10084,7 +10135,7 @@ msgstr "" "большинстве случаев это вопрос неразглашения частных переписок." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3359 +#: documentation/content/en/articles/committers-guide/_index.adoc:3369 msgid "" "The Security Officer has sole control over the release of security " "advisories." @@ -10093,7 +10144,7 @@ msgstr "" "уведомлений о безопасности." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3364 +#: documentation/content/en/articles/committers-guide/_index.adoc:3374 msgid "" "Where there are security problems that affect many different operating " "systems, FreeBSD frequently depends on early access to be able to prepare " @@ -10115,7 +10166,7 @@ msgstr "" "соответствующими знаниями для подготовки исправлений безопасности." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3365 +#: documentation/content/en/articles/committers-guide/_index.adoc:3375 msgid "" "Communications with Core are kept confidential for as long as necessary." msgstr "" @@ -10123,7 +10174,7 @@ msgstr "" "конфиденциальности столько времени, сколько необходимо." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3370 +#: documentation/content/en/articles/committers-guide/_index.adoc:3380 msgid "" "Communications to core will initially be treated as confidential. " "Eventually however, most of Core's business will be summarized into the " @@ -10141,7 +10192,7 @@ msgstr "" "Основной команды." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3371 +#: documentation/content/en/articles/committers-guide/_index.adoc:3381 msgid "" "Non-disclosure Agreements may be required for access to certain commercially " "sensitive data." @@ -10150,7 +10201,7 @@ msgstr "" "коммерчески чувствительной информации." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3374 +#: documentation/content/en/articles/committers-guide/_index.adoc:3384 msgid "" "Access to certain commercially sensitive data may only be available under a " "Non-Disclosure Agreement. The FreeBSD Foundation legal staff must be " @@ -10162,12 +10213,12 @@ msgstr "" "проконсультироваться с юридическим отделом Фонда FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3375 +#: documentation/content/en/articles/committers-guide/_index.adoc:3385 msgid "Private communications must not be made public without permission." msgstr "Приватные сообщения не должны становиться публичными без разрешения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3378 +#: documentation/content/en/articles/committers-guide/_index.adoc:3388 msgid "" "Beyond the specific requirements above there is a general expectation not to " "publish private communications between developers without the consent of all " @@ -10182,7 +10233,7 @@ msgstr "" "корреспондентов, необходимо запросить разрешение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3379 +#: documentation/content/en/articles/committers-guide/_index.adoc:3389 msgid "" "Communications on project-only or restricted access channels must be kept " "private." @@ -10191,7 +10242,7 @@ msgstr "" "доступом, должно оставаться конфиденциальным." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3382 +#: documentation/content/en/articles/committers-guide/_index.adoc:3392 msgid "" "Similarly to personal communications, certain internal communications " "channels, including FreeBSD Committer only mailing lists and restricted " @@ -10204,12 +10255,12 @@ msgstr "" "источников требуется разрешение." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3383 +#: documentation/content/en/articles/committers-guide/_index.adoc:3393 msgid "Core may approve publication." msgstr "Основная команда может одобрить публикацию." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3385 +#: documentation/content/en/articles/committers-guide/_index.adoc:3395 msgid "" "Where it is impractical to obtain permission due to the number of " "correspondents or where permission to publish is unreasonably withheld, Core " @@ -10222,13 +10273,13 @@ msgstr "" "вопросов, которые заслуживают более широкой публикации." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3387 +#: documentation/content/en/articles/committers-guide/_index.adoc:3397 #, no-wrap msgid "Support for Multiple Architectures" msgstr "Поддержка множественных архитектур" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3394 +#: documentation/content/en/articles/committers-guide/_index.adoc:3404 msgid "" "FreeBSD is a highly portable operating system intended to function on many " "different types of hardware architectures. Maintaining clean separation of " @@ -10244,7 +10295,7 @@ msgid "" msgstr "" "FreeBSD — это высокопортативная операционная система, предназначенная для " "работы на множестве различных типов аппаратных архитектур. Поддержание " -"четкого разделения между машинозависимым (MD) и машинонезависимым (MI) " +"чёткого разделения между машинозависимым (MD) и машинонезависимым (MI) " "кодом, а также минимизация MD-кода являются важной частью нашей стратегии по " "сохранению гибкости в отношении текущих тенденций в аппаратном обеспечении. " "Каждая новая аппаратная архитектура, поддерживаемая FreeBSD, существенно " @@ -10256,13 +10307,13 @@ msgstr "" "«целевая аудитория» FreeBSD." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3395 +#: documentation/content/en/articles/committers-guide/_index.adoc:3405 #, no-wrap msgid "Statement of General Intent" msgstr "Заявление об общих намерениях" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3400 +#: documentation/content/en/articles/committers-guide/_index.adoc:3410 msgid "" "The FreeBSD Project targets \"production quality commercial off-the-shelf " "(COTS) workstation, server, and high-end embedded systems\". By retaining a " @@ -10289,7 +10340,7 @@ msgstr "" "дополнительных платформ." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3407 +#: documentation/content/en/articles/committers-guide/_index.adoc:3417 msgid "" "The FreeBSD Project differentiates platform targets into four tiers. Each " "tier includes a list of guarantees consumers may rely on as well as " @@ -10313,13 +10364,13 @@ msgstr "" "ветках." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3408 +#: documentation/content/en/articles/committers-guide/_index.adoc:3418 #, no-wrap msgid "Platform Targets" msgstr "Целевые платформы" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3415 +#: documentation/content/en/articles/committers-guide/_index.adoc:3425 msgid "" "Support for a hardware platform consists of two components: kernel support " "and userland Application Binary Interfaces (ABIs). Kernel platform support " @@ -10345,7 +10396,7 @@ msgstr "" "объектов исключений C++ или соглашения о вызовах для функций C." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3417 +#: documentation/content/en/articles/committers-guide/_index.adoc:3427 msgid "" "A FreeBSD kernel also uses an ABI (sometimes referred to as the Kernel " "Binary Interface (KBI)) which includes the semantics and layouts of public " @@ -10358,7 +10409,7 @@ msgstr "" "ядра." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3422 +#: documentation/content/en/articles/committers-guide/_index.adoc:3432 msgid "" "A FreeBSD kernel may support multiple userland ABIs. For example, FreeBSD's " "amd64 kernel supports FreeBSD amd64 and i386 userland ABIs as well as Linux " @@ -10375,7 +10426,7 @@ msgstr "" "вызовах в C, размеры базовых типов и т.д." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3424 +#: documentation/content/en/articles/committers-guide/_index.adoc:3434 msgid "" "Tiers are defined for both kernels and userland ABIs. In the common case, a " "platform's kernel and FreeBSD ABIs are assigned to the same tier." @@ -10384,13 +10435,13 @@ msgstr "" "случае ядро платформы и ABI FreeBSD назначаются на один и тот же уровень." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3425 +#: documentation/content/en/articles/committers-guide/_index.adoc:3435 #, no-wrap msgid "Tier 1: Fully-Supported Architectures" msgstr "Уровень 1: Полностью поддерживаемые архитектуры" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3430 +#: documentation/content/en/articles/committers-guide/_index.adoc:3440 msgid "" "Tier 1 platforms are the most mature FreeBSD platforms. They are supported " "by the security officer, release engineering, and Ports Management Team. " @@ -10405,7 +10456,7 @@ msgstr "" "разработки." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3432 +#: documentation/content/en/articles/committers-guide/_index.adoc:3442 msgid "" "The FreeBSD Project provides the following guarantees to consumers of Tier 1 " "platforms:" @@ -10414,7 +10465,7 @@ msgstr "" "Уровня 1:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3434 +#: documentation/content/en/articles/committers-guide/_index.adoc:3444 msgid "" "Official FreeBSD release images will be provided by the release engineering " "team." @@ -10423,7 +10474,7 @@ msgstr "" "релизов." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3435 +#: documentation/content/en/articles/committers-guide/_index.adoc:3445 msgid "" "Binary updates and source patches for Security Advisories and Errata Notices " "will be provided for supported releases." @@ -10432,7 +10483,7 @@ msgstr "" "Errata Notices будут предоставляться для поддерживаемых выпусков." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3436 +#: documentation/content/en/articles/committers-guide/_index.adoc:3446 msgid "" "Source patches for Security Advisories will be provided for supported " "branches." @@ -10441,7 +10492,7 @@ msgstr "" "поддерживаемых веток." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3437 +#: documentation/content/en/articles/committers-guide/_index.adoc:3447 msgid "" "Binary updates and source patches for cross-platform Security Advisories " "will typically be provided at the time of the announcement." @@ -10450,7 +10501,7 @@ msgstr "" "выпусков Security Advisories обычно предоставляются во время объявления." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3438 +#: documentation/content/en/articles/committers-guide/_index.adoc:3448 msgid "" "Changes to userland ABIs will generally include compatibility shims to " "ensure correct operation of binaries compiled against any stable branch " @@ -10466,7 +10517,7 @@ msgstr "" "будет явно указано в примечаниях к выпуску." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3439 +#: documentation/content/en/articles/committers-guide/_index.adoc:3449 msgid "" "Changes to certain portions of the kernel ABI will include compatibility " "shims to ensure correct operation of kernel modules compiled against the " @@ -10479,7 +10530,7 @@ msgstr "" "внимание, что не все части ABI ядра защищены." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3440 +#: documentation/content/en/articles/committers-guide/_index.adoc:3450 msgid "" "Official binary packages for third party software will be provided by the " "ports team. For embedded architectures, these packages may be cross-built " @@ -10490,7 +10541,7 @@ msgstr "" "быть кросс-собранными на архитектуре другого типа." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3441 +#: documentation/content/en/articles/committers-guide/_index.adoc:3451 msgid "" "Most relevant ports should either build or have the appropriate filters to " "prevent inappropriate ones from building." @@ -10499,7 +10550,7 @@ msgstr "" "фильтры, чтобы предотвратить сборку неподходящих." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3442 +#: documentation/content/en/articles/committers-guide/_index.adoc:3452 msgid "" "New features which are not inherently platform-specific will be fully " "functional on all Tier 1 architectures." @@ -10508,7 +10559,7 @@ msgstr "" "полностью работоспособны на всех архитектурах Уровня 1." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3443 +#: documentation/content/en/articles/committers-guide/_index.adoc:3453 msgid "" "Features and compatibility shims used by binaries compiled against older " "stable branches may be removed in newer major versions. Such removals will " @@ -10516,11 +10567,11 @@ msgid "" msgstr "" "Функции и прослойки совместимости, используемые программами, " "скомпилированными для старых стабильных веток, могут быть удалены в новых " -"основных версиях. Такие изменения будут четко документированы в примечаниях " +"основных версиях. Такие изменения будут чётко документированы в примечаниях " "к выпуску." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3444 +#: documentation/content/en/articles/committers-guide/_index.adoc:3454 msgid "" "Tier 1 platforms should be fully documented. Basic operations will be " "documented in the FreeBSD Handbook." @@ -10529,12 +10580,12 @@ msgstr "" "будут описаны в Руководстве FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3445 +#: documentation/content/en/articles/committers-guide/_index.adoc:3455 msgid "Tier 1 platforms will be included in the source tree." msgstr "Уровень 1 платформ будет включен в дерево исходных кодов." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3446 +#: documentation/content/en/articles/committers-guide/_index.adoc:3456 msgid "" "Tier 1 platforms should be self-hosting either via the in-tree toolchain or " "an external toolchain. If an external toolchain is required, official binary " @@ -10545,7 +10596,7 @@ msgstr "" "инструментарий, будут предоставлены официальные бинарные пакеты для него." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3448 +#: documentation/content/en/articles/committers-guide/_index.adoc:3458 msgid "" "To maintain maturity of Tier 1 platforms, the FreeBSD Project will maintain " "the following resources to support development:" @@ -10554,7 +10605,7 @@ msgstr "" "следующие ресурсы для разработки:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3450 +#: documentation/content/en/articles/committers-guide/_index.adoc:3460 msgid "" "Build and test automation support either in the FreeBSD.org cluster or some " "other location easily available for all developers. Embedded platforms may " @@ -10567,13 +10618,13 @@ msgstr "" "FreeBSD.org, вместо реального оборудования." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3451 -#: documentation/content/en/articles/committers-guide/_index.adoc:3481 +#: documentation/content/en/articles/committers-guide/_index.adoc:3461 +#: documentation/content/en/articles/committers-guide/_index.adoc:3491 msgid "Inclusion in the `make universe` and `make tinderbox` targets." msgstr "Включение в цели `make universe` и `make tinderbox`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3452 +#: documentation/content/en/articles/committers-guide/_index.adoc:3462 msgid "" "Dedicated hardware in one of the FreeBSD clusters for package building " "(either natively or via qemu-user)." @@ -10582,7 +10633,7 @@ msgstr "" "(нативно или через qemu-user)." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3454 +#: documentation/content/en/articles/committers-guide/_index.adoc:3464 msgid "" "Collectively, developers are required to provide the following to maintain " "the Tier 1 status of a platform:" @@ -10591,7 +10642,7 @@ msgstr "" "платформы Уровня 1:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3456 +#: documentation/content/en/articles/committers-guide/_index.adoc:3466 msgid "" "Changes to the source tree should not knowingly break the build of a Tier 1 " "platform." @@ -10600,7 +10651,7 @@ msgstr "" "платформы Уровня 1." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3457 +#: documentation/content/en/articles/committers-guide/_index.adoc:3467 msgid "" "Tier 1 architectures must have a mature, healthy ecosystem of users and " "active developers." @@ -10609,7 +10660,7 @@ msgstr "" "пользователей и активных разработчиков." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3458 +#: documentation/content/en/articles/committers-guide/_index.adoc:3468 msgid "" "Developers should be able to build packages on commonly available, non-" "embedded Tier 1 systems. This can mean either native builds if non-embedded " @@ -10622,7 +10673,7 @@ msgstr "" "так и кросс-сборки, выполняемые на другой архитектуре Уровня 1." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3459 +#: documentation/content/en/articles/committers-guide/_index.adoc:3469 msgid "" "Changes cannot break the userland ABI. If an ABI change is required, ABI " "compatibility for existing binaries should be provided via use of symbol " @@ -10634,25 +10685,25 @@ msgstr "" "версий разделяемых библиотек." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3460 +#: documentation/content/en/articles/committers-guide/_index.adoc:3470 msgid "" "Changes merged to stable branches cannot break the protected portions of the " "kernel ABI. If a kernel ABI change is required, the change should be " "modified to preserve functionality of existing kernel modules." msgstr "" "Изменения, которым сделано слияние в стабильные ветки, не должны нарушать " -"защищенные части ABI ядра. Если требуется изменение ABI ядра, изменение " +"защищённые части ABI ядра. Если требуется изменение ABI ядра, изменение " "должно быть модифицировано для сохранения функциональности существующих " "модулей ядра." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3461 +#: documentation/content/en/articles/committers-guide/_index.adoc:3471 #, no-wrap msgid "Tier 2: Developmental and Niche Architectures" msgstr "Уровень 2: Развивающиеся и нишевые архитектуры" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3465 +#: documentation/content/en/articles/committers-guide/_index.adoc:3475 msgid "" "Tier 2 platforms are functional, but less mature FreeBSD platforms. They " "are not supported by the security officer, release engineering, and Ports " @@ -10663,7 +10714,7 @@ msgstr "" "командой управления портами." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3469 +#: documentation/content/en/articles/committers-guide/_index.adoc:3479 msgid "" "Tier 2 platforms may be Tier 1 platform candidates that are still under " "active development. Architectures reaching end of life may also be moved " @@ -10679,7 +10730,7 @@ msgstr "" "могут относиться к Уровню 2." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3471 +#: documentation/content/en/articles/committers-guide/_index.adoc:3481 msgid "" "The FreeBSD Project provides the following guarantees to consumers of Tier 2 " "platforms:" @@ -10688,7 +10739,7 @@ msgstr "" "Уровня 2:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3473 +#: documentation/content/en/articles/committers-guide/_index.adoc:3483 msgid "" "The ports infrastructure should include basic support for Tier 2 " "architectures sufficient to support building ports and packages. This " @@ -10701,7 +10752,7 @@ msgstr "" "будут собираемыми или работоспособными." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3474 +#: documentation/content/en/articles/committers-guide/_index.adoc:3484 msgid "" "New features which are not inherently platform-specific should be feasible " "on all Tier 2 architectures if not implemented." @@ -10710,12 +10761,12 @@ msgstr "" "реализуемы на всех архитектурах уровня Уровень 2, если они не реализованы." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3475 +#: documentation/content/en/articles/committers-guide/_index.adoc:3485 msgid "Tier 2 platforms will be included in the source tree." msgstr "Уровень 2 платформ будет включен в дерево исходных кодов." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3476 +#: documentation/content/en/articles/committers-guide/_index.adoc:3486 msgid "" "Tier 2 platforms should be self-hosting either via the in-tree toolchain or " "an external toolchain. If an external toolchain is required, official binary " @@ -10726,7 +10777,7 @@ msgstr "" "инструментарий, будут предоставлены официальные бинарные пакеты для него." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3477 +#: documentation/content/en/articles/committers-guide/_index.adoc:3487 msgid "" "Tier 2 platforms should provide functional kernels and userlands even if an " "official release distribution is not provided." @@ -10735,7 +10786,7 @@ msgstr "" "пользовательские среды, даже если официальный дистрибутив не предоставляется." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3479 +#: documentation/content/en/articles/committers-guide/_index.adoc:3489 msgid "" "To maintain maturity of Tier 2 platforms, the FreeBSD Project will maintain " "the following resources to support development:" @@ -10744,7 +10795,7 @@ msgstr "" "следующие ресурсы для разработки:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3483 +#: documentation/content/en/articles/committers-guide/_index.adoc:3493 msgid "" "Collectively, developers are required to provide the following to maintain " "the Tier 2 status of a platform:" @@ -10753,7 +10804,7 @@ msgstr "" "платформы Уровня 2:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3485 +#: documentation/content/en/articles/committers-guide/_index.adoc:3495 msgid "" "Changes to the source tree should not knowingly break the build of a Tier 2 " "platform." @@ -10762,7 +10813,7 @@ msgstr "" "платформы Уровня 2." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3486 +#: documentation/content/en/articles/committers-guide/_index.adoc:3496 msgid "" "Tier 2 architectures must have an active ecosystem of users and developers." msgstr "" @@ -10770,7 +10821,7 @@ msgstr "" "разработчиков." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3487 +#: documentation/content/en/articles/committers-guide/_index.adoc:3497 msgid "" "While changes are permitted to break the userland ABI, the ABI should not be " "broken gratuitously. Significant userland ABI changes should be restricted " @@ -10781,7 +10832,7 @@ msgstr "" "пользовательского пространства должны ограничиваться основными версиями." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3488 +#: documentation/content/en/articles/committers-guide/_index.adoc:3498 msgid "" "New features that are not yet implemented on Tier 2 architectures should " "provide a means of disabling them on those architectures." @@ -10790,13 +10841,13 @@ msgstr "" "предоставлять возможность их отключения на этих архитектурах." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3489 +#: documentation/content/en/articles/committers-guide/_index.adoc:3499 #, no-wrap msgid "Tier 3: Experimental Architectures" msgstr "Уровень 3: Экспериментальные архитектуры" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3493 +#: documentation/content/en/articles/committers-guide/_index.adoc:3503 msgid "" "Tier 3 platforms have at least partial FreeBSD support. They are _not_ " "supported by the security officer, release engineering, and Ports Management " @@ -10807,7 +10858,7 @@ msgstr "" "управления портами." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3496 +#: documentation/content/en/articles/committers-guide/_index.adoc:3506 msgid "" "Tier 3 platforms are architectures in the early stages of development, for " "non-mainstream hardware platforms, or which are considered legacy systems " @@ -10821,7 +10872,7 @@ msgstr "" "основном репозитории исходного кода." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3499 +#: documentation/content/en/articles/committers-guide/_index.adoc:3509 msgid "" "The FreeBSD Project provides no guarantees to consumers of Tier 3 platforms " "and is not committed to maintaining resources to support development. Tier " @@ -10834,13 +10885,13 @@ msgstr "" "пользовательского пространства не считается стабильным." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3500 +#: documentation/content/en/articles/committers-guide/_index.adoc:3510 #, no-wrap msgid "Unsupported Architectures" msgstr "Неподдерживаемые архитектуры" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3504 +#: documentation/content/en/articles/committers-guide/_index.adoc:3514 msgid "" "Other platforms are not supported in any form by the project. The project " "previously described these as Tier 4 systems." @@ -10849,7 +10900,7 @@ msgstr "" "описывал их как системы Уровня 4." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3507 +#: documentation/content/en/articles/committers-guide/_index.adoc:3517 msgid "" "After a platform transitions to unsupported, all support for the platform is " "removed from the source, ports and documentation trees. Note that ports " @@ -10862,13 +10913,13 @@ msgstr "" "поддерживается в ветке, поддерживаемой портами." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3508 +#: documentation/content/en/articles/committers-guide/_index.adoc:3518 #, no-wrap msgid "Policy on Changing the Tier of an Architecture" msgstr "Политика изменения уровня архитектуры" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3512 +#: documentation/content/en/articles/committers-guide/_index.adoc:3522 msgid "" "Systems may only be moved from one tier to another by approval of the " "FreeBSD Core Team, which shall make that decision in collaboration with the " @@ -10883,25 +10934,25 @@ msgstr "" "быть выполнены до завершения повышения." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3514 +#: documentation/content/en/articles/committers-guide/_index.adoc:3524 #, no-wrap msgid "Ports Specific FAQ" msgstr "Специфичные FAQ по портам" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3517 +#: documentation/content/en/articles/committers-guide/_index.adoc:3527 #, no-wrap msgid "Adding a New Port" msgstr "Добавление нового порта" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3520 +#: documentation/content/en/articles/committers-guide/_index.adoc:3530 #, no-wrap msgid "How do I add a new port?" msgstr "Как добавить новый порт?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3525 +#: documentation/content/en/articles/committers-guide/_index.adoc:3535 msgid "" "Adding a port to the tree is relatively simple. Once the port is ready to be " "added, as explained later crossref:committers-guide[ports-qa-add-new-extra," @@ -10917,13 +10968,13 @@ msgstr "" "например:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3529 +#: documentation/content/en/articles/committers-guide/_index.adoc:3539 #, no-wrap msgid "\tSUBDIR += newport\n" msgstr "\tSUBDIR += newport\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3532 +#: documentation/content/en/articles/committers-guide/_index.adoc:3542 msgid "" "Once the port and its category's Makefile are ready, the new port can be " "committed:" @@ -10932,7 +10983,7 @@ msgstr "" "закоммитить:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3537 +#: documentation/content/en/articles/committers-guide/_index.adoc:3547 #, no-wrap msgid "" "% git add category/Makefile category/newport\n" @@ -10944,24 +10995,24 @@ msgstr "" "% git push\n" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3541 +#: documentation/content/en/articles/committers-guide/_index.adoc:3551 msgid "" "Don't forget to crossref:committers-guide[port-commit-message-formats,setup " "git hooks for the ports tree as explained here]; a specific hook has been " "developed to verify the category's [.filename]#Makefile#." msgstr "" -"Не забудьте crossref:committers-guide[port-commit-message-formats,настроить " -"git-хуки для дерева портов, как описано здесь]; специальный хук был " -"разработан для проверки [.filename]#Makefile# каждой категории." +"Не забудьте crossref:committers-guide[port-commit-message-formats," +"\"настроить git-хуки для дерева портов, как описано здесь\"]; специальный " +"хук был разработан для проверки [.filename]#Makefile# каждой категории." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3544 +#: documentation/content/en/articles/committers-guide/_index.adoc:3554 #, no-wrap msgid "Any other things I need to know when I add a new port?" msgstr "Есть ли что-то ещё, что мне нужно знать при добавлении нового порта?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3547 +#: documentation/content/en/articles/committers-guide/_index.adoc:3557 msgid "" "Check the port, preferably to make sure it compiles and packages correctly." msgstr "" @@ -10969,7 +11020,7 @@ msgstr "" "пакеты правильно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3550 +#: documentation/content/en/articles/committers-guide/_index.adoc:3560 msgid "" "The extref:{porters-handbook}testing[Porters Handbook's Testing Chapter] " "contains more detailed instructions. See the extref:{porters-handbook}" @@ -10982,7 +11033,7 @@ msgstr "" "{porters-handbook}testing[poudriere, testing-poudriere]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3552 +#: documentation/content/en/articles/committers-guide/_index.adoc:3562 msgid "" "You do not necessarily have to eliminate all warnings but make sure you have " "fixed the simple ones." @@ -10991,7 +11042,7 @@ msgstr "" "простые." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3554 +#: documentation/content/en/articles/committers-guide/_index.adoc:3564 msgid "" "If the port came from a submitter who has not contributed to the Project " "before, add that person's name to the extref:{contributors}[Additional " @@ -11002,7 +11053,7 @@ msgstr "" "участники, contrib-additional] списка участников FreeBSD." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3557 +#: documentation/content/en/articles/committers-guide/_index.adoc:3567 msgid "" "Close the PR if the port came in as a PR. To close a PR, change the state " "to `Issue Resolved` and the resolution as `Fixed`." @@ -11011,7 +11062,7 @@ msgstr "" "состояние на `Issue Resolved` и установите решение как `Fixed`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3561 +#: documentation/content/en/articles/committers-guide/_index.adoc:3571 msgid "" "If for some reason using extref:{porters-handbook}testing[poudriere, testing-" "poudriere] to test the new port is not possible, the bare minimum of testing " @@ -11023,7 +11074,7 @@ msgstr "" "последовательность:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3571 +#: documentation/content/en/articles/committers-guide/_index.adoc:3581 #, no-wrap msgid "" "# make install\n" @@ -11043,7 +11094,7 @@ msgstr "" "# make package\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3574 +#: documentation/content/en/articles/committers-guide/_index.adoc:3584 msgid "" "Note that poudriere is the reference for package building, it the port does " "not build in poudriere, it will be removed." @@ -11052,19 +11103,19 @@ msgstr "" "порт не собирается в poudriere, он будет удалён." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3577 +#: documentation/content/en/articles/committers-guide/_index.adoc:3587 #, no-wrap msgid "Removing an Existing Port" msgstr "Удаление существующего порта" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3580 +#: documentation/content/en/articles/committers-guide/_index.adoc:3590 #, no-wrap msgid "How do I remove an existing port?" msgstr "Как удалить существующий порт?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3583 +#: documentation/content/en/articles/committers-guide/_index.adoc:3593 msgid "" "First, please read the section about repository copies. Before you remove " "the port, you have to verify there are no other ports depending on it." @@ -11073,19 +11124,19 @@ msgstr "" "необходимо убедиться, что от него не зависят другие порты." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3585 +#: documentation/content/en/articles/committers-guide/_index.adoc:3595 msgid "Make sure there is no dependency on the port in the ports collection:" msgstr "Убедитесь, что нет зависимостей от порта в коллекции портов:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3586 +#: documentation/content/en/articles/committers-guide/_index.adoc:3596 msgid "The port's PKGNAME appears in exactly one line in a recent INDEX file." msgstr "" "Имя пакета порта (PKGNAME) появляется ровно в одной строке в последнем файле " "INDEX." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3587 +#: documentation/content/en/articles/committers-guide/_index.adoc:3597 msgid "" "No other ports contains any reference to the port's directory or PKGNAME in " "their Makefiles" @@ -11094,7 +11145,7 @@ msgstr "" "Makefiles" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3591 +#: documentation/content/en/articles/committers-guide/_index.adoc:3601 msgid "" "When using Git, consider using man:git-grep[1], it is much faster than `grep " "-r`." @@ -11103,17 +11154,17 @@ msgstr "" "так как он значительно быстрее, чем `grep -r`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3594 +#: documentation/content/en/articles/committers-guide/_index.adoc:3604 msgid "Then, remove the port:" msgstr "Затем удалите порт:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3598 +#: documentation/content/en/articles/committers-guide/_index.adoc:3608 msgid "Remove the port's files and directory with `git rm`." msgstr "Удалите файлы и каталог порта с помощью `git rm`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3599 +#: documentation/content/en/articles/committers-guide/_index.adoc:3609 msgid "" "Remove the `SUBDIR` listing of the port in the parent directory [." "filename]#Makefile#." @@ -11122,18 +11173,18 @@ msgstr "" "каталога." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3600 -#: documentation/content/en/articles/committers-guide/_index.adoc:3615 +#: documentation/content/en/articles/committers-guide/_index.adoc:3610 +#: documentation/content/en/articles/committers-guide/_index.adoc:3625 msgid "Add an entry to [.filename]#ports/MOVED#." msgstr "Добавьте запись в [.filename]#ports/MOVED#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3601 +#: documentation/content/en/articles/committers-guide/_index.adoc:3611 msgid "Remove the port from [.filename]#ports/LEGAL# if it is there." msgstr "Удалите порт из [.filename]#ports/LEGAL#, если он там присутствует." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3606 +#: documentation/content/en/articles/committers-guide/_index.adoc:3616 msgid "" "Alternatively, you can use the rmport script, from [.filename]#ports/Tools/" "scripts#. This script was written by {vd}. When sending questions about " @@ -11146,13 +11197,13 @@ msgstr "" "сопровождающего." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3608 +#: documentation/content/en/articles/committers-guide/_index.adoc:3618 #, no-wrap msgid "How do I move a port to a new location?" msgstr "Как переместить порт в новое место?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3613 +#: documentation/content/en/articles/committers-guide/_index.adoc:3623 msgid "" "Perform a thorough check of the ports collection for any dependencies on the " "old port location/name, and update them. Running `grep` on [." @@ -11167,7 +11218,7 @@ msgstr "" "с помощью man:git-grep[1] по коллекции портов." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3614 +#: documentation/content/en/articles/committers-guide/_index.adoc:3624 msgid "" "Remove the `SUBDIR` entry from the old category Makefile and add a `SUBDIR` " "entry to the new category Makefile." @@ -11176,7 +11227,7 @@ msgstr "" "`SUBDIR` в Makefile новой категории." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3616 +#: documentation/content/en/articles/committers-guide/_index.adoc:3626 msgid "" "Search for entries in xml files inside [.filename]#ports/security/vuxml# and " "adjust them accordingly. In particular, check for previous packages with the " @@ -11187,51 +11238,51 @@ msgstr "" "пакеты с новым именем, версия которых может включать новый порт." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3617 +#: documentation/content/en/articles/committers-guide/_index.adoc:3627 msgid "Move the port with `git mv`." msgstr "Переместите порт с помощью `git mv`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3618 -#: documentation/content/en/articles/committers-guide/_index.adoc:3629 +#: documentation/content/en/articles/committers-guide/_index.adoc:3628 +#: documentation/content/en/articles/committers-guide/_index.adoc:3639 msgid "Commit the changes." msgstr "Зафиксируйте изменения." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3621 +#: documentation/content/en/articles/committers-guide/_index.adoc:3631 #, no-wrap msgid "How do I copy a port to a new location?" msgstr "Как скопировать порт в новое место?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3626 +#: documentation/content/en/articles/committers-guide/_index.adoc:3636 msgid "Copy port with `cp -R old-cat/old-port new-cat/new-port`." msgstr "Скопируйте порт с помощью `cp -R old-cat/old-port new-cat/new-port`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3627 +#: documentation/content/en/articles/committers-guide/_index.adoc:3637 msgid "Add the new port to the [.filename]#new-cat/Makefile#." msgstr "Добавьте новый порт в файл [.filename]#new-cat/Makefile#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3628 +#: documentation/content/en/articles/committers-guide/_index.adoc:3638 msgid "Change stuff in [.filename]#new-cat/new-port#." msgstr "Измените содержимое в [.filename]#new-cat/new-port#." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3632 +#: documentation/content/en/articles/committers-guide/_index.adoc:3642 #, no-wrap msgid "Ports Freeze" msgstr "Заморозка портов" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3635 +#: documentation/content/en/articles/committers-guide/_index.adoc:3645 #, no-wrap msgid "What is a “ports freeze”?" msgstr "Что такое «заморозка портов»?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3642 +#: documentation/content/en/articles/committers-guide/_index.adoc:3652 msgid "" "A “ports freeze” was a restricted state the ports tree was put in before a " "release. It was used to ensure a higher quality for the packages shipped " @@ -11249,7 +11300,7 @@ msgstr "" "стабильной квартальной ветки." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3645 +#: documentation/content/en/articles/committers-guide/_index.adoc:3655 msgid "" "For more information on how to merge commits to the quarterly branch, see " "crossref:committers-guide[ports-qa-misc-request-mfh, What is the procedure " @@ -11261,19 +11312,19 @@ msgstr "" "веткой?]." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3647 +#: documentation/content/en/articles/committers-guide/_index.adoc:3657 #, no-wrap msgid "Quarterly Branches" msgstr "Квартальные ветки" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3650 +#: documentation/content/en/articles/committers-guide/_index.adoc:3660 #, no-wrap msgid "What is the procedure to request authorization for merging a commit to the quarterly branch?" msgstr "Какова процедура получения разрешения на слияние коммита с квартальной веткой?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3653 +#: documentation/content/en/articles/committers-guide/_index.adoc:3663 msgid "" "As of November 30, 2020, there is no need to seek explicit approval to " "commit to the quarterly branch." @@ -11282,13 +11333,13 @@ msgstr "" "квартальную ветку не требуется." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3655 +#: documentation/content/en/articles/committers-guide/_index.adoc:3665 #, no-wrap msgid "What is the procedure for merging commits to the quarterly branch?" msgstr "Какова процедура слияния коммитов в квартальную ветку?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3658 +#: documentation/content/en/articles/committers-guide/_index.adoc:3668 msgid "" "Merging commits to the quarterly branch (a process we call MFH for a " "historical reason) is very similar to MFC'ing a commit in the src " @@ -11299,7 +11350,7 @@ msgstr "" "поэтому в основном:" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3664 +#: documentation/content/en/articles/committers-guide/_index.adoc:3674 #, no-wrap msgid "" "% git checkout 2021Q2\n" @@ -11313,7 +11364,7 @@ msgstr "" "% git push\n" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3668 +#: documentation/content/en/articles/committers-guide/_index.adoc:3678 msgid "" "where `$HASH` is the hash of the commit you want to copy over to the " "quarterly branch. The `-x` parameter ensures the hash `$HASH` of the `main` " @@ -11324,19 +11375,19 @@ msgstr "" "включён в новое сообщение коммита в квартальной ветке." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3670 +#: documentation/content/en/articles/committers-guide/_index.adoc:3680 #, no-wrap msgid "Creating a New Category" msgstr "Создание новой категории" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3673 +#: documentation/content/en/articles/committers-guide/_index.adoc:3683 #, no-wrap msgid "What is the procedure for creating a new category?" msgstr "Какова процедура создания новой категории?" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3678 +#: documentation/content/en/articles/committers-guide/_index.adoc:3688 msgid "" "Please see extref:{porters-handbook}makefiles[Proposing a New Category, " "proposing-categories] in the Porter's Handbook. Once that procedure has " @@ -11351,14 +11402,14 @@ msgstr "" "их обязанностью является:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3682 +#: documentation/content/en/articles/committers-guide/_index.adoc:3692 msgid "Perform any needed moves. (This only applies to physical categories.)" msgstr "" "Выполните все необходимые перемещения. (Это применимо только к физическим " "категориям.)" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3683 +#: documentation/content/en/articles/committers-guide/_index.adoc:3693 msgid "" "Update the `VALID_CATEGORIES` definition in [.filename]#ports/Mk/bsd.port." "mk#." @@ -11367,18 +11418,18 @@ msgstr "" "port.mk#." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3684 +#: documentation/content/en/articles/committers-guide/_index.adoc:3694 msgid "Assign the PR back to you." msgstr "Назначить PR обратно на вас." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3687 +#: documentation/content/en/articles/committers-guide/_index.adoc:3697 #, no-wrap msgid "What do I need to do to implement a new physical category?" msgstr "Что мне нужно сделать для создания новой физической категории?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3692 +#: documentation/content/en/articles/committers-guide/_index.adoc:3702 msgid "" "Upgrade each moved port's [.filename]#Makefile#. Do not connect the new " "category to the build yet." @@ -11387,12 +11438,12 @@ msgstr "" "подключайте новую категорию к сборке." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3694 +#: documentation/content/en/articles/committers-guide/_index.adoc:3704 msgid "To do this, you will need to:" msgstr "Для этого вам потребуется:" #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3698 +#: documentation/content/en/articles/committers-guide/_index.adoc:3708 msgid "" "Change the port's `CATEGORIES` (this was the point of the exercise, " "remember?) The new category is listed first. This will help to ensure that " @@ -11403,7 +11454,7 @@ msgstr "" "правильно." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3699 +#: documentation/content/en/articles/committers-guide/_index.adoc:3709 msgid "" "Run a `make describe`. Since the top-level `make index` that you will be " "running in a few steps is an iteration of `make describe` over the entire " @@ -11416,7 +11467,7 @@ msgstr "" "сэкономит время, избавив от необходимости перезапускать этот шаг позже." #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3700 +#: documentation/content/en/articles/committers-guide/_index.adoc:3710 msgid "" "If you want to be really thorough, now might be a good time to run man:" "portlint[1]." @@ -11425,7 +11476,7 @@ msgstr "" "время запустить man:portlint[1]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3703 +#: documentation/content/en/articles/committers-guide/_index.adoc:3713 msgid "" "Check that the ``PKGORIGIN``s are correct. The ports system uses each port's " "`CATEGORIES` entry to create its `PKGORIGIN`, which is used to connect " @@ -11441,7 +11492,7 @@ msgstr "" "portupgrade[1], не будут работать." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3705 +#: documentation/content/en/articles/committers-guide/_index.adoc:3715 msgid "" "To do this, use the [.filename]#chkorigin.sh# tool: `env PORTSDIR=/path/to/" "ports sh -e /path/to/ports/Tools/scripts/chkorigin.sh`. This will check " @@ -11457,7 +11508,7 @@ msgstr "" "тех портов, которые вы только что переместили!" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3706 +#: documentation/content/en/articles/committers-guide/_index.adoc:3716 msgid "" "On your own local system, test the proposed changes: first, comment out the " "SUBDIR entries in the old ports' categories' [.filename]##Makefile##s; then " @@ -11477,7 +11528,7 @@ msgstr "" "пользователей." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3707 +#: documentation/content/en/articles/committers-guide/_index.adoc:3717 msgid "" "Once this is done, you can commit the updated [.filename]#ports/Makefile# to " "connect the new category to the build and also commit the [." @@ -11488,18 +11539,18 @@ msgstr "" "изменениям в файле [.filename]#Makefile# для старой категории или категорий." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3708 +#: documentation/content/en/articles/committers-guide/_index.adoc:3718 msgid "Add appropriate entries to [.filename]#ports/MOVED#." msgstr "Добавьте соответствующие записи в [.filename]#ports/MOVED#." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3709 +#: documentation/content/en/articles/committers-guide/_index.adoc:3719 msgid "Update the documentation by modifying:" msgstr "Обновите документацию, изменив:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3710 -#: documentation/content/en/articles/committers-guide/_index.adoc:3719 +#: documentation/content/en/articles/committers-guide/_index.adoc:3720 +#: documentation/content/en/articles/committers-guide/_index.adoc:3729 msgid "" "the extref:{porters-handbook}makefiles[list of categories, porting-" "categories] in the Porter's Handbook" @@ -11508,7 +11559,7 @@ msgstr "" "Руководстве FreeBSD по созданию портов" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3712 +#: documentation/content/en/articles/committers-guide/_index.adoc:3722 msgid "" "Only once all the above have been done, and no one is any longer reporting " "problems with the new ports, should the old ports be deleted from their " @@ -11519,13 +11570,13 @@ msgstr "" "прежних мест в репозитории." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3714 +#: documentation/content/en/articles/committers-guide/_index.adoc:3724 #, no-wrap msgid "What do I need to do to implement a new virtual category?" msgstr "Что мне нужно сделать для создания новой виртуальной категории?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3717 +#: documentation/content/en/articles/committers-guide/_index.adoc:3727 msgid "" "This is much simpler than a physical category. Only a few modifications are " "needed:" @@ -11534,27 +11585,27 @@ msgstr "" "изменений:" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3721 -#: documentation/content/en/articles/committers-guide/_index.adoc:3815 +#: documentation/content/en/articles/committers-guide/_index.adoc:3731 +#: documentation/content/en/articles/committers-guide/_index.adoc:3822 #, no-wrap msgid "Miscellaneous Questions" msgstr "Разные вопросы" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3724 +#: documentation/content/en/articles/committers-guide/_index.adoc:3734 #, no-wrap msgid "Are there changes that can be committed without asking the maintainer for approval?" msgstr "Существуют ли изменения, которые можно зафиксировать без запроса одобрения у сопровождающего?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3727 +#: documentation/content/en/articles/committers-guide/_index.adoc:3737 msgid "Blanket approval for most ports applies to these types of fixes:" msgstr "" "Общее одобрение для большинства портов применяется к следующим типам " "исправлений:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3729 +#: documentation/content/en/articles/committers-guide/_index.adoc:3739 msgid "" "Most infrastructure changes to a port (that is, modernizing, but not " "changing the functionality). For example, the blanket covers converting to " @@ -11567,12 +11618,12 @@ msgstr "" "портов." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3730 +#: documentation/content/en/articles/committers-guide/_index.adoc:3740 msgid "Trivial and _tested_ build and runtime fixes." msgstr "Тривиальные и _проверенные_ исправления для сборки и выполнения." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3731 +#: documentation/content/en/articles/committers-guide/_index.adoc:3741 msgid "" "Documentations or metadata changes to ports, like [.filename]#pkg-descr# or " "`COMMENT`." @@ -11581,7 +11632,7 @@ msgstr "" "descr# или `COMMENT`." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3736 +#: documentation/content/en/articles/committers-guide/_index.adoc:3746 msgid "" "Exceptions to this are anything maintained by the {portmgr}, or the " "{security-officer}. No unauthorized commits may ever be made to ports " @@ -11592,13 +11643,13 @@ msgstr "" "поддерживаются этими группами, недопустимы." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3739 +#: documentation/content/en/articles/committers-guide/_index.adoc:3749 #, no-wrap msgid "How do I know if my port is building correctly or not?" msgstr "Как узнать, мой порт собирается правильно или нет?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3743 +#: documentation/content/en/articles/committers-guide/_index.adoc:3753 msgid "" "The packages are built multiple times each week. If a port fails, the " "maintainer will receive an email from `pkg-fallout@FreeBSD.org`." @@ -11607,7 +11658,7 @@ msgstr "" "неудачно, сопровождающий получит письмо от `pkg-fallout@FreeBSD.org`." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3745 +#: documentation/content/en/articles/committers-guide/_index.adoc:3755 msgid "" "Reports for all the package builds (official, experimental, and non-" "regression) are aggregated at link:https://pkg-status.FreeBSD.org[pkg-status." @@ -11618,13 +11669,13 @@ msgstr "" "FreeBSD.org]." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3747 +#: documentation/content/en/articles/committers-guide/_index.adoc:3757 #, no-wrap msgid "I added a new port. Do I need to add it to the [.filename]#INDEX#?" msgstr "Я добавил новый порт. Нужно ли добавлять его в [.filename]#INDEX#?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3750 +#: documentation/content/en/articles/committers-guide/_index.adoc:3760 msgid "" "No. The file can either be generated by running `make index`, or a pre-" "generated version can be downloaded with `make fetchindex`." @@ -11633,13 +11684,13 @@ msgstr "" "загрузить предварительно сгенерированную версию с помощью `make fetchindex`." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3752 +#: documentation/content/en/articles/committers-guide/_index.adoc:3762 #, no-wrap msgid "Are there any other files I am not allowed to touch?" msgstr "Есть ли другие файлы, которые мне нельзя изменять?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3756 +#: documentation/content/en/articles/committers-guide/_index.adoc:3766 msgid "" "Any file directly under [.filename]#ports/#, or any file under a " "subdirectory that starts with an uppercase letter ([.filename]#Mk/#, [." @@ -11654,13 +11705,13 @@ msgstr "" "в эти файлы, если не хотите навлечь на себя их гнев." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3758 +#: documentation/content/en/articles/committers-guide/_index.adoc:3768 #, no-wrap msgid "What is the proper procedure for updating the checksum for a port distfile when the file changes without a version change?" msgstr "Как правильно обновить контрольную сумму для distfile порта, если файл изменился без изменения версии?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3762 +#: documentation/content/en/articles/committers-guide/_index.adoc:3772 msgid "" "When the checksum for a distribution file is updated due to the author " "updating the file without changing the port revision, the commit message " @@ -11681,13 +11732,13 @@ msgstr "" "выяснить, почему файл дистрибутива изменился." #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3764 +#: documentation/content/en/articles/committers-guide/_index.adoc:3774 #, no-wrap msgid "How can an experimental test build of the ports tree (exp-run) be requested?" msgstr "Как можно запросить экспериментальную тестовую сборку дерева портов (exp-run)?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3768 +#: documentation/content/en/articles/committers-guide/_index.adoc:3778 msgid "" "An exp-run must be completed before patches with a significant ports impact " "are committed. The patch can be against the ports tree or the base system." @@ -11697,7 +11748,7 @@ msgstr "" "как к дереву портов, так и к базовой системе." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3770 +#: documentation/content/en/articles/committers-guide/_index.adoc:3780 msgid "" "Full package builds will be done with the patches provided by the submitter, " "and the submitter is required to fix detected problems _(fallout)_ before " @@ -11708,25 +11759,25 @@ msgstr "" "сборки и т.п.)_ перед коммитом." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3774 +#: documentation/content/en/articles/committers-guide/_index.adoc:3784 msgid "Go to the link:https://bugs.freebsd.org/submit[Bugzilla new PR page]." msgstr "" "Перейдите по ссылке link:https://bugs.freebsd.org/submit[Страница создания " "новой PR в Bugzilla]." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3775 +#: documentation/content/en/articles/committers-guide/_index.adoc:3785 msgid "Select the product your patch is about." msgstr "Выберите продукт, к которому относится ваш патч." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3776 +#: documentation/content/en/articles/committers-guide/_index.adoc:3786 msgid "Fill in the bug report as normal. Remember to attach the patch." msgstr "" "Заполните отчёт об ошибке как обычно. Не забудьте приложить исправление." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3777 +#: documentation/content/en/articles/committers-guide/_index.adoc:3787 msgid "" "If at the top it says “Show Advanced Fields” click on it. It will now say " "“Hide Advanced Fields”. Many new fields will be available. If it already " @@ -11738,7 +11789,7 @@ msgstr "" "«Скрыть дополнительные поля», ничего делать не нужно." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3778 +#: documentation/content/en/articles/committers-guide/_index.adoc:3788 msgid "" "In the “Flags” section, set the “exp-run” one to `?`. As for all other " "fields, hovering the mouse over any field shows more details." @@ -11748,22 +11799,22 @@ msgstr "" "дополнительные сведения." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3779 +#: documentation/content/en/articles/committers-guide/_index.adoc:3789 msgid "Submit. Wait for the build to run." msgstr "Отправьте. Дождитесь завершения сборки." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3780 +#: documentation/content/en/articles/committers-guide/_index.adoc:3790 msgid "{portmgr} will reply with a possible fallout." msgstr "{portmgr} ответит с информацией возможных падениях." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3781 +#: documentation/content/en/articles/committers-guide/_index.adoc:3791 msgid "Depending on the fallout:" msgstr "В зависимости от последствий:" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3782 +#: documentation/content/en/articles/committers-guide/_index.adoc:3792 msgid "" "If there is no fallout, the procedure stops here, and the change can be " "committed, pending any other approval required." @@ -11772,7 +11823,7 @@ msgstr "" "быть закоммичено, ожидая любых других необходимых утверждений." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3783 +#: documentation/content/en/articles/committers-guide/_index.adoc:3793 msgid "" "If there is fallout, it _must_ be fixed, either by fixing the ports directly " "in the ports tree, or adding to the submitted patch." @@ -11781,7 +11832,7 @@ msgstr "" "портов, либо добавив изменения в предоставленный патч." #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3784 +#: documentation/content/en/articles/committers-guide/_index.adoc:3794 msgid "" "When this is done, go back to step 6 saying the fallout was fixed and wait " "for the exp-run to be run again. Repeat as long as there are broken ports." @@ -11790,13 +11841,13 @@ msgstr "" "повторного запуска exp-run. Повторяйте, пока остаются неисправные порты." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3787 +#: documentation/content/en/articles/committers-guide/_index.adoc:3797 #, no-wrap msgid "Issues Specific to Developers Who Are Not Committers" msgstr "Проблемы, характерные для разработчиков, не являющихся коммиттерами" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3792 +#: documentation/content/en/articles/committers-guide/_index.adoc:3802 msgid "" "A few people who have access to the FreeBSD machines do not have commit " "bits. Almost all of this document will apply to these developers as well " @@ -11810,17 +11861,17 @@ msgstr "" "ознакомиться со следующим:" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3794 +#: documentation/content/en/articles/committers-guide/_index.adoc:3804 msgid "crossref:committers-guide[admin, Administrative Details]" msgstr "crossref:committers-guide[admin,Административные детали]" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3795 +#: documentation/content/en/articles/committers-guide/_index.adoc:3805 msgid "crossref:committers-guide[conventions-everyone, For Everyone]" msgstr "crossref:committers-guide[conventions-everyone, Для всех]" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3799 +#: documentation/content/en/articles/committers-guide/_index.adoc:3809 msgid "" "Get your mentor to add you to the \"Additional Contributors\" ([." "filename]#doc/shared/contrib-additional.adoc#), if you are not already " @@ -11830,56 +11881,57 @@ msgstr "" "\" ([.filename]#doc/shared/contrib-additional.adoc#), если вас там ещё нет." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3801 +#: documentation/content/en/articles/committers-guide/_index.adoc:3811 msgid "crossref:committers-guide[developer.relations, Developer Relations]" msgstr "" "crossref:committers-guide[developer.relations, Отношения с разработчиками]" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3802 +#: documentation/content/en/articles/committers-guide/_index.adoc:3812 msgid "crossref:committers-guide[ssh.guide, SSH Quick-Start Guide]" msgstr "" "crossref:committers-guide[ssh.guide, Руководство по быстрому началу работы с " "SSH]" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3803 +#: documentation/content/en/articles/committers-guide/_index.adoc:3813 msgid "" "crossref:committers-guide[rules, The FreeBSD Committers' Big List of Rules]" msgstr "" "crossref:committers-guide[rules, Большой список правил коммиттеров FreeBSD]" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3805 +#: documentation/content/en/articles/committers-guide/_index.adoc:3815 #, no-wrap -msgid "Information About Google Analytics" -msgstr "Информация о Google Analytics" +msgid "Information About Analytics" +msgstr "Информация об аналитике вебсайтов" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3808 +#: documentation/content/en/articles/committers-guide/_index.adoc:3818 msgid "" -"As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project " -"website to collect anonymized usage statistics regarding usage of the site." +"The Project website uses https://plausible.io/[Plausible Analytics] to " +"collect anonymized usage statistics regarding usage of the site since 2022." msgstr "" -"По состоянию на 12 декабря 2012 года на сайте проекта FreeBSD был включен " -"Google Analytics для сбора анонимной статистики использования сайта." +"Вебсайт Проекта использует https://plausible.io/[Plausible Analytics] для " +"сбора анонимной статистики использования сайта с 2022 года." -#. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3812 +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:3820 msgid "" -"As of March 3, 2022, Google Analytics was removed from the FreeBSD Project." +"Previously, Google Analytics was enabled from December 12, 2012 to March 3, " +"2022." msgstr "" -"По состоянию на 3 марта 2022 года Google Analytics был удалён из проекта " -"FreeBSD." +"Ранее, Google Analytics был включен с 12 декабря 2012 года по 3 марта 2022 " +"года." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3817 +#: documentation/content/en/articles/committers-guide/_index.adoc:3824 #, no-wrap msgid "How do I access people.FreeBSD.org to put up personal or project information?" msgstr "Как получить доступ к people.FreeBSD.org для размещения личной или проектной информации?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3821 +#: documentation/content/en/articles/committers-guide/_index.adoc:3828 msgid "" "`people.FreeBSD.org` is the same as `freefall.FreeBSD.org`. Just create a [." "filename]#public_html# directory. Anything you place in that directory will " @@ -11892,13 +11944,13 @@ msgstr "" "[https://people.FreeBSD.org/]." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3822 +#: documentation/content/en/articles/committers-guide/_index.adoc:3829 #, no-wrap msgid "Where are the mailing list archives stored?" msgstr "Где хранятся архивы списков рассылки?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3825 +#: documentation/content/en/articles/committers-guide/_index.adoc:3832 msgid "" "The mailing lists are archived under [.filename]#/local/mail# on `freefall." "FreeBSD.org`." @@ -11907,13 +11959,13 @@ msgstr "" "org`." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3826 +#: documentation/content/en/articles/committers-guide/_index.adoc:3833 #, no-wrap msgid "I would like to mentor a new committer. What process do I need to follow?" msgstr "Я хочу стать наставником нового коммиттера. Какой процесс мне нужно пройти?" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3829 +#: documentation/content/en/articles/committers-guide/_index.adoc:3836 msgid "" "See the https://www.freebsd.org/internal/new-account/[New Account Creation " "Procedure] document on the internal pages." @@ -11922,19 +11974,19 @@ msgstr "" "создания новой учётной записи] на внутренних страницах." #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3831 +#: documentation/content/en/articles/committers-guide/_index.adoc:3838 #, no-wrap msgid "Benefits and Perks for FreeBSD Committers" msgstr "Преимущества и привилегии для коммиттеров FreeBSD" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3834 +#: documentation/content/en/articles/committers-guide/_index.adoc:3841 #, no-wrap msgid "Recognition" msgstr "Признание" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3838 +#: documentation/content/en/articles/committers-guide/_index.adoc:3845 msgid "" "Recognition as a competent software engineer is the longest lasting value. " "In addition, getting a chance to work with some of the best people that " @@ -11946,28 +11998,13 @@ msgstr "" "бонус!" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3840 -#, no-wrap -msgid "FreeBSD Mall" -msgstr "FreeBSD Mall" - -#. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3843 -msgid "" -"FreeBSD committers can get a free 4-CD or DVD set at conferences from http://" -"www.freebsdmall.com[FreeBSD Mall, Inc.]." -msgstr "" -"Коммиттеры FreeBSD могут бесплатно получить набор из 4 CD или DVD на " -"конференциях через http://www.freebsdmall.com[FreeBSD Mall, Inc.]." - -#. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3845 +#: documentation/content/en/articles/committers-guide/_index.adoc:3847 #, no-wrap msgid "`Gandi.net`" msgstr "`Gandi.net`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3848 +#: documentation/content/en/articles/committers-guide/_index.adoc:3850 msgid "" "https://gandi.net[Gandi] provides website hosting, cloud computing, domain " "registration, and X.509 certificate services." @@ -11976,7 +12013,7 @@ msgstr "" "вычислений, регистрации доменов и сертификатов X.509." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3852 +#: documentation/content/en/articles/committers-guide/_index.adoc:3854 msgid "" "Gandi offers an E-rate discount to all FreeBSD developers. To streamline " "the process of getting the discount first set up a Gandi account, fill in " @@ -11991,13 +12028,13 @@ msgstr "" "`@freebsd.org`, указав ваш идентификатор Gandi." #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3854 +#: documentation/content/en/articles/committers-guide/_index.adoc:3856 #, no-wrap msgid "`rsync.net`" msgstr "`rsync.net`" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3857 +#: documentation/content/en/articles/committers-guide/_index.adoc:3859 msgid "" "https://rsync.net[rsync.net] provides cloud storage for offsite backup that " "is optimized for UNIX users. Their service runs entirely on FreeBSD and ZFS." @@ -12007,7 +12044,7 @@ msgstr "" "полностью работает на FreeBSD и ZFS." #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3858 +#: documentation/content/en/articles/committers-guide/_index.adoc:3861 msgid "" "rsync.net offers a free-forever 500 GB account to FreeBSD developers. Simply " "sign up at https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd." @@ -12018,6 +12055,147 @@ msgstr "" "html[https://www.rsync.net/freebsd.html], используя ваш адрес `@freebsd." "org`, чтобы получить этот бесплатный аккаунт." +#. type: Title === +#: documentation/content/en/articles/committers-guide/_index.adoc:3863 +#, no-wrap +msgid "`Watchgoose`" +msgstr "`Watchgoose`" + +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:3866 +msgid "" +"https://watchgoose.com/[Watchgoose] provides hosted monitoring for cron jobs " +"and backups, as well as other scheduled and recurring tasks that can send a " +"start or completion signal." +msgstr "" +"<a href=\"https://watchgoose.com/\">Watchgoose</a> предоставляет размещённый " +"мониторинг для задач cron и резервных копий, а также других запланированных " +"и повторяющихся задач, которые могут отправлять сигнал о начале или " +"завершении." + +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:3869 +msgid "" +"FreeBSD committers are eligible for a complimentary paid plan matched to " +"their monitoring needs. To request access, create a Watchgoose.com account " +"and email mailto:support@watchgoose.com[support@watchgoose.com] from an " +"`@freebsd.org` address, including the email address used (from the FreeBSD." +"org domain) for the Watchgoose account." +msgstr "" +"Коммиттеры FreeBSD имеют право на бесплатный платный план, соответствующий " +"их потребностям в мониторинге. Чтобы запросить доступ, создайте учетную " +"запись на Watchgoose.com и отправьте письмо на mailto:support@watchgoose." +"com[support@watchgoose.com] с адреса в домене `@freebsd.org`, указав адрес " +"электронной почты (из домена FreeBSD.org), использованный для учетной записи " +"Watchgoose." + +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:3870 +msgid "" +"See the https://watchgoose.com/open-source/[Watchgoose Open Source support " +"program] for more information." +msgstr "" +"См. https://watchgoose.com/open-source/[программу поддержки открытого " +"исходного кода Watchgoose] для получения дополнительной информации." + +#~ msgid "" +#~ "Any committer may make changes to any other tree with an \"Approved by\" " +#~ "from a non-mentored committer with the appropriate bit. Mentored " +#~ "committers can provide a \"Reviewed by\" but not an \"Approved by\"." +#~ msgstr "" +#~ "Любой коммиттер может вносить изменения в любое другое дерево с пометкой " +#~ "\"Approved by\" от некурируемого коммиттера с соответствующими правами. " +#~ "Курируемые коммиттеры (имеющие наставника) могут предоставлять пометку " +#~ "\"Reviewed by\", но не \"Approved by\"." + +#~ msgid "" +#~ "The FreeBSD project strongly discourages the so-called \"advertising " +#~ "clause\" in new code. Due to the large number of contributors to the " +#~ "FreeBSD project, complying with this clause for many commercial vendors " +#~ "has become difficult. If you have code in the tree with the advertising " +#~ "clause, please consider removing it. In fact, please consider using the " +#~ "above license for your code." +#~ msgstr "" +#~ "Проект FreeBSD настоятельно не рекомендует использовать так называемую " +#~ "«рекламную оговорку» в новом коде. Из-за большого числа участников " +#~ "проекта FreeBSD соблюдение этой оговорки стало затруднительным для многих " +#~ "коммерческих вендоров. Если ваш код в дереве содержит рекламную оговорку, " +#~ "пожалуйста, рассмотрите возможность её удаления. Более того, пожалуйста, " +#~ "рассмотрите возможность использования вышеуказанной лицензии для вашего " +#~ "кода." + +#~ msgid "" +#~ "The FreeBSD project discourages completely new licenses and variations on " +#~ "the standard licenses. New licenses require the approval of {core-email} " +#~ "to reside in the `src` repository. The more different licenses that are " +#~ "used in the tree, the more problems that this causes to those wishing to " +#~ "utilize this code, typically from unintended consequences from a poorly " +#~ "worded license." +#~ msgstr "" +#~ "Проект FreeBSD не приветствует полностью новые лицензии и вариации " +#~ "стандартных лицензий. Новые лицензии требуют одобрения {core-email} для " +#~ "размещения в репозитории `src`. Чем больше различных лицензий " +#~ "используется в дереве, тем больше проблем это создаёт для тех, кто желает " +#~ "использовать этот код, обычно из-за непредвиденных последствий плохо " +#~ "сформулированной лицензии." + +#~ msgid "" +#~ "The project uses https://spdx.dev[SPDX] tags in our source base. At " +#~ "present, these tags are indented to help automated tools reconstruct " +#~ "license requirements mechanically. All _SPDX-License-Identifier_ tags in " +#~ "the tree should be considered to be informative. All files in the " +#~ "FreeBSD source tree with these tags also have a copy of the license which " +#~ "governs use of that file. In the event of a discrepancy, the verbatim " +#~ "license is controlling. The project tries to follow the https://spdx." +#~ "github.io/spdx-spec/v2.2.2/[SPDX Specification, Version 2.2]. How to " +#~ "mark source files and valid algebraic expressions are found in https://" +#~ "spdx.github.io/spdx-spec/v2.2.2/SPDX-license-expressions/[Annex D] and " +#~ "https://spdx.github.io/spdx-spec/v2.2.2/using-SPDX-short-identifiers-in-" +#~ "source-files/[Annex E]. The project draws identifiers from SPDX's list " +#~ "of valid https://spdx.org/licenses/[short license identifiers]. The " +#~ "project uses only the _SPDX-License-Identifier_ tag." +#~ msgstr "" +#~ "Проект использует теги https://spdx.dev[SPDX] в нашей исходной базе. На " +#~ "данный момент эти теги выделены отступами, чтобы автоматизированные " +#~ "средства могли программно извлекать лицензионные условия. Все теги _SPDX-" +#~ "License-Identifier_ в дереве следует считать информативными. Все файлы в " +#~ "дереве исходных кодов FreeBSD с этими тегами также содержат копию " +#~ "лицензии, регулирующей использование данного файла. Если возникает " +#~ "противоречие, руководствоваться следует дословным текстом лицензии. " +#~ "Проект старается следовать https://spdx.github.io/spdx-spec/v2.2.2/" +#~ "[Спецификации SPDX, версия 2.2]. Инструкцию, как помечать исходные файлы, " +#~ "и допустимые алгебраические выражения можно найти в https://spdx.github." +#~ "io/spdx-spec/v2.2.2/SPDX-license-expressions/[Приложении D] и https://" +#~ "spdx.github.io/spdx-spec/v2.2.2/using-SPDX-short-identifiers-in-source-" +#~ "files/[Приложении E]. Проект берет идентификаторы из списка допустимых " +#~ "https://spdx.org/licenses/[кратких лицензионных идентификаторов] SPDX. " +#~ "Проект использует только тег _SPDX-License-Identifier_." + +#~ msgid "" +#~ "As of March 2021, approximately 25,000 out of 90,000 files in the tree " +#~ "have been marked." +#~ msgstr "" +#~ "По состоянию на март 2021 года примерно 25 000 из 90 000 файлов в дереве " +#~ "были помечены." + +#~ msgid "" +#~ "As of March 3, 2022, Google Analytics was removed from the FreeBSD " +#~ "Project." +#~ msgstr "" +#~ "По состоянию на 3 марта 2022 года Google Analytics был удалён из проекта " +#~ "FreeBSD." + +#, no-wrap +#~ msgid "FreeBSD Mall" +#~ msgstr "FreeBSD Mall" + +#~ msgid "" +#~ "FreeBSD committers can get a free 4-CD or DVD set at conferences from " +#~ "http://www.freebsdmall.com[FreeBSD Mall, Inc.]." +#~ msgstr "" +#~ "Коммиттеры FreeBSD могут бесплатно получить набор из 4 CD или DVD на " +#~ "конференциях через http://www.freebsdmall.com[FreeBSD Mall, Inc.]." + #, no-wrap #~ msgid "" #~ "/*\n" diff --git a/documentation/content/ru/articles/contributing/_index.adoc b/documentation/content/ru/articles/contributing/_index.adoc index f06748b796..cbc6debad2 100644 --- a/documentation/content/ru/articles/contributing/_index.adoc +++ b/documentation/content/ru/articles/contributing/_index.adoc @@ -89,7 +89,7 @@ FreeBSD разрабатывает большое и постоянно раст . Если вам известны исправления ошибок, которые были успешно применены в -CURRENT, но не были перенесены в -STABLE в течение разумного срока (обычно пары недель), отправьте коммиттеру вежливое напоминание. . Переместите стороннее программное обеспечение в [.filename]#src/contrib# в дереве исходных кодов. . Убедитесь, что код в [.filename]#src/contrib# актуален. -. Соберите дерево исходников (или только его часть) с включенными дополнительными предупреждениями и устраните эти предупреждения. Список предупреждений при сборке также можно найти в нашем https://ci.freebsd.org[CI], выбрав сборку и отметив "LLVM/Clang Warnings". +. Соберите дерево исходников (или только его часть) с включёнными дополнительными предупреждениями и устраните эти предупреждения. Список предупреждений при сборке также можно найти в нашем https://ci.freebsd.org[CI], выбрав сборку и отметив "LLVM/Clang Warnings". . Исправление предупреждений для портов, которые используют устаревшие функции, такие как `gets()` или включают [.filename]#malloc.h#. . Если вы внесли свой вклад в какие-либо порты и вам пришлось внести изменения, специфичные для FreeBSD, отправьте свои исправления оригинальным авторам (это облегчит вашу жизнь, когда они выпустят следующую версию). . Получите копии официальных стандартов, таких как POSIX(R). Сравните поведение FreeBSD с требованиями стандарта. Если поведение отличается, особенно в сложных или малоизученных аспектах спецификации, отправьте PR об этом. Если вы можете, предложите исправление и включите патч в PR. Если вы считаете, что стандарт ошибочен, обратитесь в орган по стандартизации с просьбой рассмотреть этот вопрос. @@ -194,7 +194,7 @@ https://wiki.freebsd.org/IdeasPage[Список проектов и идей Fre В случае значительного вклада в виде большого объёма работы или добавления важной новой функции в FreeBSD, почти всегда необходимо либо отправить изменения в виде tar-файлов, либо загрузить их на веб- или FTP-сайт для доступа других людей. Если у вас нет доступа к веб- или FTP-сайту, запросите на соответствующем списке рассылки FreeBSD, чтобы кто-то разместил изменения для вас. -При работе с большими объёмами кода неизбежно возникает деликатная тема авторских прав. FreeBSD предпочитает свободные лицензии, такие как BSD или ISC. Копилефтные лицензии (copyleft — требование той же лицензии для производных продуктов), например GPLv2, иногда допускаются. Полный список можно найти на странице link:https://www.FreeBSD.org/internal/software-license/[политики лицензирования основной команды]. +При работе с большими объёмами кода неизбежно возникает деликатная тема авторских прав. FreeBSD предпочитает свободные лицензии, такие как BSD или ISC. Копилефтные лицензии (copyleft — требование той же лицензии для производных продуктов), например GPLv2, иногда допускаются. Полный список можно найти в статье extref:{license-guide}[Политики лицензирования FreeBSD]. === Деньги или оборудование diff --git a/documentation/content/ru/articles/contributing/_index.po b/documentation/content/ru/articles/contributing/_index.po index 64a6502df8..743cb6b852 100644 --- a/documentation/content/ru/articles/contributing/_index.po +++ b/documentation/content/ru/articles/contributing/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2026-02-22 15:58+0000\n" -"PO-Revision-Date: 2026-04-26 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-08-08 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlescontributing_index/ru/>\n" @@ -32,17 +32,17 @@ msgid "Contributing to FreeBSD" msgstr "Участие в проекте FreeBSD" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:45 +#: documentation/content/en/articles/contributing/_index.adoc:44 msgid "pass:[<!-- vale FreeBSD.Pronouns = NO -->]" msgstr "pass:[<!-- vale FreeBSD.Pronouns = NO -->]" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:48 +#: documentation/content/en/articles/contributing/_index.adoc:47 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:50 +#: documentation/content/en/articles/contributing/_index.adoc:49 msgid "" "This article describes the different ways in which an individual or " "organization may contribute to the FreeBSD Project." @@ -51,12 +51,12 @@ msgstr "" "или организация могут внести вклад в проект FreeBSD." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:52 +#: documentation/content/en/articles/contributing/_index.adoc:51 msgid "'''" msgstr "'''" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:59 +#: documentation/content/en/articles/contributing/_index.adoc:58 msgid "" "So you want to contribute to FreeBSD? That is great! FreeBSD _relies_ on the " "contributions of its user base to survive. Your contributions are not only " @@ -67,7 +67,7 @@ msgstr "" "только ценятся, они жизненно важны для дальнейшего развития FreeBSD." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:62 +#: documentation/content/en/articles/contributing/_index.adoc:61 msgid "" "A large and growing number of international contributors, of greatly varying " "ages and areas of technical expertise, develop FreeBSD. There is always " @@ -80,7 +80,7 @@ msgstr "" "приветствуется." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:66 +#: documentation/content/en/articles/contributing/_index.adoc:65 msgid "" "As a volunteer, what you do is limited only by what you want to do. " "However, we do ask that you are aware of what other members of the FreeBSD " @@ -93,7 +93,7 @@ msgstr "" "волонтёром." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:70 +#: documentation/content/en/articles/contributing/_index.adoc:69 msgid "" "The FreeBSD project is responsible for an entire operating system " "environment, rather than just a kernel or a few scattered utilities. As " @@ -110,7 +110,7 @@ msgstr "" "области, почти наверняка могут помочь проекту." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:78 +#: documentation/content/en/articles/contributing/_index.adoc:77 msgid "" "Commercial entities engaged in FreeBSD-related enterprises are also " "encouraged to contact us. Do you need a special extension to make your " @@ -132,13 +132,13 @@ msgstr "" "на него ещё раз." #. type: Title == -#: documentation/content/en/articles/contributing/_index.adoc:80 +#: documentation/content/en/articles/contributing/_index.adoc:79 #, no-wrap msgid "What Is Needed" msgstr "Что необходимо" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:83 +#: documentation/content/en/articles/contributing/_index.adoc:82 msgid "" "The following list of tasks and sub-projects represents something of an " "amalgam of various [.filename]#TODO# lists and user requests." @@ -147,13 +147,13 @@ msgstr "" "объединение различных списков [.filename]#TODO# и запросов пользователей." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:85 +#: documentation/content/en/articles/contributing/_index.adoc:84 #, no-wrap msgid "Ongoing Non-Programmer Tasks" msgstr "Текущие задачи для непрограммистов" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:90 +#: documentation/content/en/articles/contributing/_index.adoc:89 msgid "" "Many people who are involved in FreeBSD are not programmers. The Project " "includes documentation writers, Web designers, and support people. All that " @@ -166,7 +166,7 @@ msgstr "" "готовность учиться." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:94 +#: documentation/content/en/articles/contributing/_index.adoc:93 msgid "" "Read through the FAQ and Handbook periodically. If anything is poorly " "explained, ambiguous, out of date or incorrect, let us know. Even better, " @@ -179,7 +179,7 @@ msgstr "" "присылать и обычный текст)." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:100 +#: documentation/content/en/articles/contributing/_index.adoc:99 msgid "" "Help translate FreeBSD documentation into your native language. If " "documentation already exists for your language, you can help translate " @@ -205,7 +205,7 @@ msgstr "" "установке." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:103 +#: documentation/content/en/articles/contributing/_index.adoc:102 msgid "" "Read the {freebsd-questions} occasionally (or even regularly). It can be " "very satisfying to share your expertise and help people solve their " @@ -218,13 +218,13 @@ msgstr "" "также могут быть источником идей для улучшений." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:105 +#: documentation/content/en/articles/contributing/_index.adoc:104 #, no-wrap msgid "Ongoing Programmer Tasks" msgstr "Текущие задачи программистов" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:109 +#: documentation/content/en/articles/contributing/_index.adoc:108 msgid "" "Most of the tasks listed here may require a considerable investment of time, " "an in-depth knowledge of the FreeBSD kernel, or both. However, there are " @@ -236,7 +236,7 @@ msgstr "" "\"." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:111 +#: documentation/content/en/articles/contributing/_index.adoc:110 msgid "" "If you run FreeBSD-CURRENT and have a good Internet connection, there is a " "machine `current.FreeBSD.org` which builds a full release once a day-every " @@ -249,7 +249,7 @@ msgstr "" "с неё и сообщайте о любых сбоях в процессе." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:114 +#: documentation/content/en/articles/contributing/_index.adoc:113 msgid "" "Learn about changes or problems that have already been proposed. There may " "be a problem you can comment constructively on or with patches you can " @@ -261,7 +261,7 @@ msgstr "" "попытаться исправить одну из проблем самостоятельно." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:115 +#: documentation/content/en/articles/contributing/_index.adoc:114 msgid "" "One way is to read the {freebsd-bugs} (for issues submitted through " "Bugzilla)." @@ -270,7 +270,7 @@ msgstr "" "помощью Bugzilla)." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:116 +#: documentation/content/en/articles/contributing/_index.adoc:115 msgid "" "If you know of any bug fixes which have been successfully applied to -" "CURRENT but have not been merged into -STABLE after a decent interval " @@ -281,7 +281,7 @@ msgstr "" "пары недель), отправьте коммиттеру вежливое напоминание." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:117 +#: documentation/content/en/articles/contributing/_index.adoc:116 msgid "" "Move contributed software to [.filename]#src/contrib# in the source tree." msgstr "" @@ -289,25 +289,25 @@ msgstr "" "дереве исходных кодов." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:118 +#: documentation/content/en/articles/contributing/_index.adoc:117 msgid "Make sure code in [.filename]#src/contrib# is up to date." msgstr "Убедитесь, что код в [.filename]#src/contrib# актуален." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:120 +#: documentation/content/en/articles/contributing/_index.adoc:119 msgid "" "Build the source tree (or just part of it) with extra warnings enabled and " "clean up the warnings. A list of build warnings can also be found from our " "https://ci.freebsd.org[CI] by selecting a build and checking \"LLVM/Clang " "Warnings\"." msgstr "" -"Соберите дерево исходников (или только его часть) с включенными " +"Соберите дерево исходников (или только его часть) с включёнными " "дополнительными предупреждениями и устраните эти предупреждения. Список " "предупреждений при сборке также можно найти в нашем https://ci.freebsd." "org[CI], выбрав сборку и отметив \"LLVM/Clang Warnings\"." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:121 +#: documentation/content/en/articles/contributing/_index.adoc:120 msgid "" "Fix warnings for ports which do deprecated things like using `gets()` or " "including [.filename]#malloc.h#." @@ -316,7 +316,7 @@ msgstr "" "функции, такие как `gets()` или включают [.filename]#malloc.h#." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:122 +#: documentation/content/en/articles/contributing/_index.adoc:121 msgid "" "If you have contributed any ports and you had to make FreeBSD-specific " "changes, send your patches back to the original authors (this will make your " @@ -327,7 +327,7 @@ msgstr "" "авторам (это облегчит вашу жизнь, когда они выпустят следующую версию)." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:127 +#: documentation/content/en/articles/contributing/_index.adoc:126 msgid "" "Get copies of formal standards like POSIX(R). Compare FreeBSD's behavior to " "that required by the standard. If the behavior differs, particularly in " @@ -344,18 +344,18 @@ msgstr "" "просьбой рассмотреть этот вопрос." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:128 +#: documentation/content/en/articles/contributing/_index.adoc:127 msgid "Suggest further tasks for this list!" msgstr "Предложите дополнительные задачи для этого списка!" #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:129 +#: documentation/content/en/articles/contributing/_index.adoc:128 #, no-wrap msgid "Work through the Bugzilla Problem Report Database" msgstr "Пройдитесь по базе данных отчётов о проблемах Bugzilla" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:136 +#: documentation/content/en/articles/contributing/_index.adoc:135 msgid "" "The https://bugs.FreeBSD.org/search/[FreeBSD Problem Report list] shows all " "the current active problem reports and requests for enhancement that have " @@ -377,7 +377,7 @@ msgstr "" "исправления вовсе." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:139 +#: documentation/content/en/articles/contributing/_index.adoc:138 msgid "" "Start with the PRs that have not been assigned to anyone else. If a PR is " "assigned to someone else, but it looks like something you can handle, email " @@ -392,13 +392,13 @@ msgstr "" "обсудить." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:140 +#: documentation/content/en/articles/contributing/_index.adoc:139 #, no-wrap msgid "Ongoing Ports Tasks" msgstr "Текущие задачи портов" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:145 +#: documentation/content/en/articles/contributing/_index.adoc:144 msgid "" "The Ports Collection is a perpetual work in progress. We want to provide " "our users with an easy to use, up to date, high quality repository of third " @@ -411,7 +411,7 @@ msgstr "" "временем и усилиями, чтобы помочь нам достичь этой цели." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:149 +#: documentation/content/en/articles/contributing/_index.adoc:148 msgid "" "Anyone can get involved, and there are lots of different ways to do so. " "Contributing to ports is an excellent way to help \"give back\" something to " @@ -423,7 +423,7 @@ msgstr "" "роли или интересный вызов на дождливый день — мы будем рады вашей помощи!" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:151 +#: documentation/content/en/articles/contributing/_index.adoc:150 msgid "" "There are a number of easy ways you can contribute to keeping the ports tree " "up to date and in good working order:" @@ -432,7 +432,7 @@ msgstr "" "актуальном состоянии и в хорошем рабочем порядке:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:153 +#: documentation/content/en/articles/contributing/_index.adoc:152 msgid "" "Find some cool or useful software and extref:{porters-handbook}[create a " "port] for it." @@ -441,7 +441,7 @@ msgstr "" "handbook}[создайте порт] для него." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:155 +#: documentation/content/en/articles/contributing/_index.adoc:154 msgid "" "There are a large number of ports that have no maintainer. Become a " "maintainer and crossref:contributing[adopt-port, Adopting an unmaintained " @@ -452,7 +452,7 @@ msgstr "" "неподдерживаемый порт]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:156 +#: documentation/content/en/articles/contributing/_index.adoc:155 msgid "" "If you have created or adopted a port, be aware of crossref:" "contributing[maintain-port, The challenge for port maintainers]." @@ -461,7 +461,7 @@ msgstr "" "contributing[maintain-port, Задача для сопровождающих портов]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:157 +#: documentation/content/en/articles/contributing/_index.adoc:156 msgid "" "When you are looking for a quick challenge you could crossref:" "contributing[fix-broken, Finding and fixing a broken port]." @@ -470,13 +470,13 @@ msgstr "" "Найти и исправить сломанный порт]." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:158 +#: documentation/content/en/articles/contributing/_index.adoc:157 #, no-wrap msgid "Pick one of the items from the Ideas page" msgstr "Выберите один из пунктов со страницы Идеи" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:162 +#: documentation/content/en/articles/contributing/_index.adoc:161 msgid "" "The https://wiki.freebsd.org/IdeasPage[FreeBSD list of projects and ideas " "for volunteers] is also available for people willing to contribute to the " @@ -489,13 +489,13 @@ msgstr "" "программистов, так и для не-программистов, с информацией о каждом проекте." #. type: Title == -#: documentation/content/en/articles/contributing/_index.adoc:164 +#: documentation/content/en/articles/contributing/_index.adoc:163 #, no-wrap msgid "How to Contribute" msgstr "Как внести свой вклад" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:167 +#: documentation/content/en/articles/contributing/_index.adoc:166 msgid "" "Contributions to the system generally fall into one or more of the following " "5 categories:" @@ -504,13 +504,13 @@ msgstr "" "категорий:" #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:169 +#: documentation/content/en/articles/contributing/_index.adoc:168 #, no-wrap msgid "Bug Reports and General Commentary" msgstr "Отчёты об ошибках и общие комментарии" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:174 +#: documentation/content/en/articles/contributing/_index.adoc:173 msgid "" "An idea or suggestion of _general_ technical interest should be mailed to " "the {freebsd-hackers}. Likewise, people with an interest in such things " @@ -526,7 +526,7 @@ msgstr "" "mail]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:177 +#: documentation/content/en/articles/contributing/_index.adoc:176 msgid "" "If you are submitting a simple patch to the src repo, please consider " "submitting it to the project's GitHub mirror as https://github.com/freebsd/" @@ -537,7 +537,7 @@ msgstr "" "freebsd-src/pulls[запрос на включение]. Подходящие отправки должны:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:180 +#: documentation/content/en/articles/contributing/_index.adoc:179 msgid "" "It is ready or nearly ready to be committed. A committer should be able to " "land this patch with less than 10 minutes of additional work." @@ -546,17 +546,17 @@ msgstr "" "применить этот патч с менее чем 10 минутами дополнительной работы." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:181 +#: documentation/content/en/articles/contributing/_index.adoc:180 msgid "It passes all the GitHub CI jobs." msgstr "Он проходит все задания GitHub CI." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:182 +#: documentation/content/en/articles/contributing/_index.adoc:181 msgid "You can respond to feedback quickly." msgstr "Вы можете быстро реагировать на обратную связь." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:184 +#: documentation/content/en/articles/contributing/_index.adoc:183 msgid "" "It touches fewer than about 10 files and the changes are less than about 200 " "lines. Changes larger than this may be OK, or you may be asked to submit " @@ -567,7 +567,7 @@ msgstr "" "отправить несколько запросов на включение более удобного размера." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:186 +#: documentation/content/en/articles/contributing/_index.adoc:185 msgid "" "Each logical change is a separate commit within the pull request. Commit " "messages for each change should follow extref:{committers-guide}#commit-log-" @@ -579,7 +579,7 @@ msgstr "" "коммитов]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:188 +#: documentation/content/en/articles/contributing/_index.adoc:187 msgid "" "All commits have your name and valid email address as you'd like to see them " "in the FreeBSD repository as the author. Fake github.com addresses cannot " @@ -590,7 +590,7 @@ msgstr "" "адреса github.com использовать нельзя." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:190 +#: documentation/content/en/articles/contributing/_index.adoc:189 msgid "" "The scope of the pull request should not change during review. If the " "review suggests changes that expand the scope, please create an independent " @@ -601,7 +601,7 @@ msgstr "" "request." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:192 +#: documentation/content/en/articles/contributing/_index.adoc:191 msgid "" "Fixup commits should be squashed with the commit they are fixing. Each " "commit in your branch should be suitable for FreeBSD's repository." @@ -611,7 +611,7 @@ msgstr "" "FreeBSD." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:193 +#: documentation/content/en/articles/contributing/_index.adoc:192 msgid "" "Commits should include one or more `Signed-off-by:` lines with full name and " "email address certifying https://developercertificate.org/[Developer " @@ -622,7 +622,7 @@ msgstr "" "developercertificate.org/[Сертификат происхождения разработчика]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:198 +#: documentation/content/en/articles/contributing/_index.adoc:197 msgid "" "When updating pull request, please rebase with a forced push rather than a " "merge commit. More complex changes may be submitted as pull requests, but " @@ -645,7 +645,7 @@ msgstr "" "форум для их доработки." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:202 +#: documentation/content/en/articles/contributing/_index.adoc:201 msgid "" "Pull requests submitted to the ports repository may or may not see action, " "based on the whims of developers. For now, you will have a better " @@ -659,7 +659,7 @@ msgstr "" "порты]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:204 +#: documentation/content/en/articles/contributing/_index.adoc:203 msgid "" "The docs team also accepts pull requests via GitHub, but has not established " "any policy for them yet." @@ -668,7 +668,7 @@ msgstr "" "установила для них никакой политики." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:211 +#: documentation/content/en/articles/contributing/_index.adoc:210 msgid "" "If you find a bug or are submitting a specific change, please report it " "using the https://bugs.FreeBSD.org/submit/[Bugzilla bug submission form]. " @@ -681,8 +681,8 @@ msgid "" "man:bzip2[1]) prior to uploading them." msgstr "" "Если вы обнаружили ошибку или хотите отправить конкретное изменение, " -"пожалуйста, сообщите об этом, используя https://bugs.FreeBSD.org/submit/[" -"форму Bugzilla отправки отчёта об ошибках]. Постарайтесь заполнить каждое " +"пожалуйста, сообщите об этом, используя https://bugs.FreeBSD.org/submit/" +"[форму Bugzilla отправки отчёта об ошибках]. Постарайтесь заполнить каждое " "поле отчёта. Если патчи не превышают 65 КБ, включите их непосредственно в " "отчёт. Если патч подходит для применения к исходному дереву, укажите " "`[PATCH]` в кратком описании отчёта. При включении патчей _не_ используйте " @@ -692,7 +692,7 @@ msgstr "" "перед загрузкой." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:214 +#: documentation/content/en/articles/contributing/_index.adoc:213 msgid "" "After filing a report, you should receive confirmation along with a tracking " "number. Keep this tracking number so that you can update us with details " @@ -703,7 +703,7 @@ msgstr "" "дополнительные сведения о проблеме." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:216 +#: documentation/content/en/articles/contributing/_index.adoc:215 msgid "" "See also extref:{problem-reports}[this article] on how to write good problem " "reports." @@ -712,13 +712,13 @@ msgstr "" "отчёты о проблемах." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:217 +#: documentation/content/en/articles/contributing/_index.adoc:216 #, no-wrap msgid "Changes to the Documentation" msgstr "Изменения в документации" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:222 +#: documentation/content/en/articles/contributing/_index.adoc:221 msgid "" "Changes to the documentation are overseen by the {freebsd-doc}. Please look " "at the extref:{fdp-primer}[FreeBSD Documentation Project Primer] for " @@ -732,13 +732,13 @@ msgstr "" "способом, что и другие отчёты об ошибках." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:223 +#: documentation/content/en/articles/contributing/_index.adoc:222 #, no-wrap msgid "Changes to Existing Source Code" msgstr "Изменения в существующем исходном коде" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:228 +#: documentation/content/en/articles/contributing/_index.adoc:227 msgid "" "An addition or change to the existing source code is a somewhat trickier " "affair and depends a lot on how far out of date you are with the current " @@ -758,7 +758,7 @@ msgstr "" "current-stable]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:231 +#: documentation/content/en/articles/contributing/_index.adoc:230 msgid "" "Working from older sources unfortunately means that your changes may " "sometimes be too obsolete or too divergent for easy re-integration into " @@ -773,7 +773,7 @@ msgstr "" "обсуждается текущее состояние системы." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:234 +#: documentation/content/en/articles/contributing/_index.adoc:233 msgid "" "Assuming that you can manage to secure fairly up-to-date sources to base " "your changes on, the next step is to produce a set of diffs to send to the " @@ -784,7 +784,7 @@ msgstr "" "отправки сопровождающим FreeBSD. Это делается с помощью команды man:diff[1]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:236 +#: documentation/content/en/articles/contributing/_index.adoc:235 msgid "" "The preferred man:diff[1] format for submitting patches is the unified " "output format generated by `diff -u`." @@ -793,24 +793,24 @@ msgstr "" "унифицированный формат вывода, создаваемый командой `diff -u`." #. type: delimited block . 4 -#: documentation/content/en/articles/contributing/_index.adoc:240 +#: documentation/content/en/articles/contributing/_index.adoc:239 #, no-wrap msgid "% diff -u oldfile newfile\n" msgstr "% diff -u oldfile newfile\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:243 +#: documentation/content/en/articles/contributing/_index.adoc:242 msgid "or" msgstr "или" #. type: delimited block . 4 -#: documentation/content/en/articles/contributing/_index.adoc:247 +#: documentation/content/en/articles/contributing/_index.adoc:246 #, no-wrap msgid "% diff -u -r -N olddir newdir\n" msgstr "% diff -u -r -N olddir newdir\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:250 +#: documentation/content/en/articles/contributing/_index.adoc:249 msgid "" "would generate a set of unified diffs for the given source file or directory " "hierarchy." @@ -819,12 +819,12 @@ msgstr "" "или иерархии каталогов." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:252 +#: documentation/content/en/articles/contributing/_index.adoc:251 msgid "See man:diff[1] for more information." msgstr "См. man:diff[1] для получения дополнительной информации." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:256 +#: documentation/content/en/articles/contributing/_index.adoc:255 msgid "" "Once you have a set of diffs (which you may test with the man:patch[1] " "command), you may submit them for inclusion with FreeBSD as a Bugzilla " @@ -844,7 +844,7 @@ msgstr "" "заголовок отчёта." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:258 +#: documentation/content/en/articles/contributing/_index.adoc:257 msgid "" "If you feel it appropriate (for example you have added, deleted, or renamed " "files), bundle your changes into a `tar` file." @@ -853,7 +853,7 @@ msgstr "" "переименовали файлы), упакуйте свои изменения в файл `tar`." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:262 +#: documentation/content/en/articles/contributing/_index.adoc:261 msgid "" "If your change is of a potentially sensitive nature, such as if you are " "unsure of copyright issues governing its further distribution then you " @@ -871,7 +871,7 @@ msgstr "" "поэтому вам следует писать им только в случае действительной необходимости." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:265 +#: documentation/content/en/articles/contributing/_index.adoc:264 msgid "" "Please refer to man:intro[9] and man:style[9] for some information on coding " "style. We would appreciate it if you were at least aware of this " @@ -882,13 +882,13 @@ msgstr "" "ознакомитесь с этой информацией перед отправкой кода." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:266 +#: documentation/content/en/articles/contributing/_index.adoc:265 #, no-wrap msgid "New Code or Major Value-Added Packages" msgstr "Новый код или основные пакеты с добавленной стоимостью" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:270 +#: documentation/content/en/articles/contributing/_index.adoc:269 msgid "" "In the case of a significant contribution of a large body work, or the " "addition of an important new feature to FreeBSD, it becomes almost always " @@ -905,29 +905,28 @@ msgstr "" "для вас." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:275 +#: documentation/content/en/articles/contributing/_index.adoc:274 msgid "" "When working with large amounts of code, the touchy subject of copyrights " "also invariably comes up. FreeBSD prefers free software licenses such as " "BSD or ISC. Copyleft licenses such as GPLv2 are sometimes permitted. The " -"complete listing can be found on the link:https://www.FreeBSD.org/internal/" -"software-license/[core team licensing policy] page." +"complete listing can be found in the extref:{license-guide}[FreeBSD License " +"Policies] article." msgstr "" "При работе с большими объёмами кода неизбежно возникает деликатная тема " "авторских прав. FreeBSD предпочитает свободные лицензии, такие как BSD или " "ISC. Копилефтные лицензии (copyleft — требование той же лицензии для " "производных продуктов), например GPLv2, иногда допускаются. Полный список " -"можно найти на странице link:https://www.FreeBSD.org/internal/" -"software-license/[политики лицензирования основной команды]." +"можно найти в статье extref:{license-guide}[Политики лицензирования FreeBSD]." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:276 +#: documentation/content/en/articles/contributing/_index.adoc:275 #, no-wrap msgid "Money or Hardware" msgstr "Деньги или оборудование" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:280 +#: documentation/content/en/articles/contributing/_index.adoc:279 msgid "" "We are always very happy to accept donations to further the cause of the " "FreeBSD Project and, in a volunteer effort like ours, a little can go a long " @@ -942,13 +941,13 @@ msgstr "" "обычно нет средств на их приобретение." #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:282 +#: documentation/content/en/articles/contributing/_index.adoc:281 #, no-wrap msgid "Donating Funds" msgstr "Пожертвование средств" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:287 +#: documentation/content/en/articles/contributing/_index.adoc:286 msgid "" "The https://www.freebsdfoundation.org[FreeBSD Foundation] is a non-profit, " "tax-exempt foundation established to further the goals of the FreeBSD " @@ -964,12 +963,12 @@ msgstr "" "вычитаются из налогооблагаемого федерального дохода." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:289 +#: documentation/content/en/articles/contributing/_index.adoc:288 msgid "Donations may be sent in check form to:" msgstr "Пожертвования можно отправить в виде чека по адресу:" #. type: delimited block * 4 -#: documentation/content/en/articles/contributing/_index.adoc:297 +#: documentation/content/en/articles/contributing/_index.adoc:296 #, no-wrap msgid "" "The FreeBSD Foundation\n" @@ -985,7 +984,7 @@ msgstr "" "USA" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:300 +#: documentation/content/en/articles/contributing/_index.adoc:299 msgid "" "The FreeBSD Foundation is also able to accept https://www.freebsdfoundation." "org/donate/[online donations] through various payment options." @@ -994,7 +993,7 @@ msgstr "" "[онлайн-пожертвования] через различные варианты оплаты." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:303 +#: documentation/content/en/articles/contributing/_index.adoc:302 msgid "" "More information about the FreeBSD Foundation can be found in https://people." "FreeBSD.org/~jdp/foundation/announcement.html[The FreeBSD Foundation -- an " @@ -1007,13 +1006,13 @@ msgstr "" "info@FreeBSDFoundation.org[info@FreeBSDFoundation.org]." #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:304 +#: documentation/content/en/articles/contributing/_index.adoc:303 #, no-wrap msgid "Donating Hardware" msgstr "Пожертвование оборудования" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:308 +#: documentation/content/en/articles/contributing/_index.adoc:307 msgid "" "The FreeBSD Project happily accepts donations of hardware that it can find " "good use for. If you are interested in donating hardware, please contact " @@ -1025,25 +1024,25 @@ msgstr "" "[Офисом по связям с пожертвованиями]." #. type: Title == -#: documentation/content/en/articles/contributing/_index.adoc:310 +#: documentation/content/en/articles/contributing/_index.adoc:309 #, no-wrap msgid "Contributing to ports" msgstr "Вклад в порты" #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:313 +#: documentation/content/en/articles/contributing/_index.adoc:312 #, no-wrap msgid "Adopting an unmaintained port" msgstr "Принятие сопровождения неподдерживаемого порта" #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:315 +#: documentation/content/en/articles/contributing/_index.adoc:314 #, no-wrap msgid "Choosing an unmaintained port" msgstr "Выбор неподдерживаемого порта" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:321 +#: documentation/content/en/articles/contributing/_index.adoc:320 msgid "" "Taking over maintainership of ports that are unmaintained is a great way to " "get involved. Unmaintained ports are only updated and fixed when somebody " @@ -1058,7 +1057,7 @@ msgstr "" "порта, который вы используете регулярно." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:324 +#: documentation/content/en/articles/contributing/_index.adoc:323 msgid "" "Unmaintained ports have their `MAINTAINER` set to `ports@FreeBSD.org`. Many " "unmaintained ports can have pending updates, this can be seen at the https://" @@ -1070,7 +1069,7 @@ msgstr "" "org.html[сканере дистрибутивных файлов портов FreeBSD]." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:326 +#: documentation/content/en/articles/contributing/_index.adoc:325 msgid "" "On https://portsfallout.com/fallout?port=&maintainer=ports%40FreeBSD." "org[PortsFallout] can be seen a list of unmaintained ports with errors." @@ -1079,7 +1078,7 @@ msgstr "" "org[PortsFallout] можно увидеть список неподдерживаемых портов с ошибками." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:329 +#: documentation/content/en/articles/contributing/_index.adoc:328 msgid "" "Some ports affect a large number of others due to dependencies and secondary " "port relationships. Generally, we want people to have some experience " @@ -1090,7 +1089,7 @@ msgstr "" "опыт, прежде чем они начнут сопровождать такие порты." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:333 +#: documentation/content/en/articles/contributing/_index.adoc:332 msgid "" "You can find out whether or not a port has dependencies or secondary ports " "by looking at a primary index of ports called [.filename]#INDEX#. (The name " @@ -1107,13 +1106,13 @@ msgstr "" "распознать такие порты, просмотрев [.filename]#Makefile# других портов." #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:334 +#: documentation/content/en/articles/contributing/_index.adoc:333 #, no-wrap msgid "How to adopt the port" msgstr "Как принять сопровождение порта" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:339 +#: documentation/content/en/articles/contributing/_index.adoc:338 msgid "" "First make sure you understand your crossref:contributing[maintain-port, The " "challenge for port maintainers]. Also read the extref:{porters-handbook}" @@ -1126,7 +1125,7 @@ msgstr "" "больше, чем вам комфортно выполнять._" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:345 +#: documentation/content/en/articles/contributing/_index.adoc:344 msgid "" "You may request maintainership of any unmaintained port as soon as you " "wish. Simply set `MAINTAINER` to your own email address and send a Problem " @@ -1146,7 +1145,7 @@ msgstr "" "или обновляющих порты, — лучший способ её установить." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:349 +#: documentation/content/en/articles/contributing/_index.adoc:348 msgid "" "File your PR with Product `Ports & Packages`. A committer will examine your " "PR, commit the changes, and finally close the PR. Sometimes this process " @@ -1157,13 +1156,13 @@ msgstr "" "некоторое время (коммиттеры тоже волонтеры :)." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:351 +#: documentation/content/en/articles/contributing/_index.adoc:350 #, no-wrap msgid "The challenge for port maintainers" msgstr "Задача для сопровождающих портов" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:354 +#: documentation/content/en/articles/contributing/_index.adoc:353 msgid "" "This section will give you an idea of why ports need to be maintained and " "outline the responsibilities of a port maintainer." @@ -1172,13 +1171,13 @@ msgstr "" "ознакомитесь с обязанностями сопровождающего портов." #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:356 +#: documentation/content/en/articles/contributing/_index.adoc:355 #, no-wrap msgid "Why ports require maintenance" msgstr "Почему порты требуют обслуживания" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:361 +#: documentation/content/en/articles/contributing/_index.adoc:360 msgid "" "Creating a port is a once-off task. Ensuring that a port is up to date and " "continues to build and run requires an ongoing maintenance effort. " @@ -1191,7 +1190,7 @@ msgstr "" "этих целей." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:364 +#: documentation/content/en/articles/contributing/_index.adoc:363 msgid "" "The foremost reason ports need maintenance is to bring the latest and " "greatest in third party software to the FreeBSD community. An additional " @@ -1204,30 +1203,30 @@ msgstr "" "портов в рамках коллекции Ports по мере её развития." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:366 +#: documentation/content/en/articles/contributing/_index.adoc:365 msgid "As a maintainer, you will need to manage the following challenges:" msgstr "Как сопровождающему, вам потребуется управлять следующими задачами:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:368 +#: documentation/content/en/articles/contributing/_index.adoc:367 #, no-wrap msgid "*New software versions and updates.* New versions and updates of existing ported software become available all the time, and these need to be incorporated into the Ports Collection to provide up-to-date software.\n" msgstr "*Новые версии программного обеспечения и обновления.* Новые версии и обновления существующего портированного программного обеспечения появляются постоянно, и их необходимо включать в Коллекцию портов, чтобы обеспечить актуальное ПО.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:370 +#: documentation/content/en/articles/contributing/_index.adoc:369 #, no-wrap msgid "*Changes to dependencies.* If significant changes are made to the dependencies of your port, it may need to be updated so that it will continue to work correctly.\n" msgstr "*Изменения в зависимостях.* Если в зависимостях вашего порта были внесены значительные изменения, возможно, его потребуется обновить, чтобы он продолжал работать корректно.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:372 +#: documentation/content/en/articles/contributing/_index.adoc:371 #, no-wrap msgid "*Changes affecting dependent ports.* If other ports depend on a port that you maintain, changes to your port may require coordination with other maintainers.\n" msgstr "*Изменения, затрагивающие зависимые порты.* Если другие порты зависят от порта, который вы поддерживаете, изменения в вашем порте могут потребовать согласования с другими сопровождающими.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:375 +#: documentation/content/en/articles/contributing/_index.adoc:374 #, no-wrap msgid "" "*Interaction with other users, maintainers and developers.* Part of being a maintainer is taking on a support role.\n" @@ -1237,7 +1236,7 @@ msgstr "" "От вас не ожидают предоставления общей поддержки (но мы приветствуем это, если вы решите её оказывать). Ваша задача — быть точкой координации по вопросам, связанным с вашими портами, специфичным для FreeBSD.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:379 +#: documentation/content/en/articles/contributing/_index.adoc:378 #, no-wrap msgid "" "*Bug hunting.* A port may be affected by bugs which are specific to FreeBSD.\n" @@ -1249,7 +1248,7 @@ msgstr "" "Ещё лучше тщательно тестировать порт для выявления проблем до их попадания в Коллекцию портов.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:382 +#: documentation/content/en/articles/contributing/_index.adoc:381 #, no-wrap msgid "" "*Changes to ports infrastructure and policy.* Occasionally the systems that are used to build ports and packages are updated or a new recommendation affecting the infrastructure is made.\n" @@ -1259,7 +1258,7 @@ msgstr "" "Вам следует учитывать эти изменения, если ваши порты затронуты и требуют обновления.\n" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:385 +#: documentation/content/en/articles/contributing/_index.adoc:384 #, no-wrap msgid "" "*Changes to the base system.* FreeBSD is under constant development.\n" @@ -1269,19 +1268,19 @@ msgstr "" "Изменения в программном обеспечении, библиотеках, ядре или даже изменения политики могут вызвать каскадные требования к изменениям в портах.\n" #. type: Title ==== -#: documentation/content/en/articles/contributing/_index.adoc:386 +#: documentation/content/en/articles/contributing/_index.adoc:385 #, no-wrap msgid "Maintainer responsibilities" msgstr "Обязанности сопровождающего" #. type: Title ===== -#: documentation/content/en/articles/contributing/_index.adoc:388 +#: documentation/content/en/articles/contributing/_index.adoc:387 #, no-wrap msgid "Keep your ports up to date" msgstr "Поддерживайте свои порты в актуальном состоянии" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:391 +#: documentation/content/en/articles/contributing/_index.adoc:390 msgid "" "This section outlines the process to follow to keep your ports up to date." msgstr "" @@ -1289,7 +1288,7 @@ msgstr "" "поддерживать ваши порты в актуальном состоянии." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:394 +#: documentation/content/en/articles/contributing/_index.adoc:393 msgid "" "This is an overview. More information about upgrading a port is available " "in the extref:{porters-handbook}[Porter's Handbook]." @@ -1298,12 +1297,12 @@ msgstr "" "extref:{porters-handbook}[Руководстве FreeBSD по созданию портов]." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:398 +#: documentation/content/en/articles/contributing/_index.adoc:397 msgid "Watch for updates" msgstr "Следите за обновлениями" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:403 +#: documentation/content/en/articles/contributing/_index.adoc:402 msgid "" "Monitor the upstream vendor for new versions, updates and security fixes for " "the software. Announcement mailing lists or news web pages are useful for " @@ -1320,7 +1319,7 @@ msgstr "" "обновление." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:406 +#: documentation/content/en/articles/contributing/_index.adoc:405 msgid "" "You may also receive automated email from the `FreeBSD Ports Version Check` " "informing you that a newer version of your port's distfile is available. " @@ -1333,12 +1332,12 @@ msgstr "" "системе (включая инструкции по остановке будущих писем)." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:407 +#: documentation/content/en/articles/contributing/_index.adoc:406 msgid "Incorporate changes" msgstr "Вносите изменения" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:410 +#: documentation/content/en/articles/contributing/_index.adoc:409 msgid "" "When they become available, incorporate the changes into the port. You need " "to be able to generate a patch between the original port and your updated " @@ -1348,17 +1347,17 @@ msgstr "" "создавать патч между оригинальным портом и вашим обновлённым портом." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:411 +#: documentation/content/en/articles/contributing/_index.adoc:410 msgid "Review and test" msgstr "Проверяйте и тестируйте" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:413 +#: documentation/content/en/articles/contributing/_index.adoc:412 msgid "Thoroughly review and test your changes:" msgstr "Тщательно проверьте и протестируйте свои изменения:" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:416 +#: documentation/content/en/articles/contributing/_index.adoc:415 msgid "" "Build, install and test your port on as many platforms and architectures as " "you can. It is common for a port to work on one branch or platform and fail " @@ -1369,7 +1368,7 @@ msgstr "" "ветке или на одной платформе, но не работает в другой." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:419 +#: documentation/content/en/articles/contributing/_index.adoc:418 msgid "" "Make sure your port's dependencies are complete. The recommended way of " "doing this is by installing your own ports tinderbox. See crossref:" @@ -1382,7 +1381,7 @@ msgstr "" "участников разработки портов]." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:421 +#: documentation/content/en/articles/contributing/_index.adoc:420 msgid "" "Check that the packing list is up to date. This involves adding in any new " "files and directories and removing unused entries." @@ -1391,7 +1390,7 @@ msgstr "" "файлов и каталогов и удаление неиспользуемых записей." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:423 +#: documentation/content/en/articles/contributing/_index.adoc:422 msgid "" "Verify your port using man:portlint[1] as a guide. See crossref:" "contributing[resources, Resources for ports maintainers and contributors] " @@ -1402,7 +1401,7 @@ msgstr "" "портов] для важной информации об использовании portlint." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:426 +#: documentation/content/en/articles/contributing/_index.adoc:425 msgid "" "Consider whether changes to your port might cause any other ports to break. " "If this is the case, coordinate the changes with the maintainers of those " @@ -1419,13 +1418,13 @@ msgstr "" "ports-mgmt/poudriere[], могли их обновить." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:428 -#: documentation/content/en/articles/contributing/_index.adoc:497 +#: documentation/content/en/articles/contributing/_index.adoc:427 +#: documentation/content/en/articles/contributing/_index.adoc:496 msgid "Submit changes" msgstr "Представляйте изменения" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:431 +#: documentation/content/en/articles/contributing/_index.adoc:430 msgid "" "Send your update by submitting a Problem Report with an explanation of the " "changes and a patch containing the differences between the original port and " @@ -1438,7 +1437,7 @@ msgstr "" "FreeBSD] для получения информации о том, как правильно оформить PR." #. type: delimited block = 6 -#: documentation/content/en/articles/contributing/_index.adoc:437 +#: documentation/content/en/articles/contributing/_index.adoc:436 msgid "" "Please do not submit a man:shar[1] archive of the entire port; instead, use " "man:git-format-patch[1] or man:diff[1] `-ruN`. In this way, committers can " @@ -1454,12 +1453,12 @@ msgstr "" "информацию." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:439 +#: documentation/content/en/articles/contributing/_index.adoc:438 msgid "Wait" msgstr "Ждите" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:443 +#: documentation/content/en/articles/contributing/_index.adoc:442 msgid "" "At some stage a committer will deal with your PR. It may take minutes, or " "it may take one or two weeks - so please be patient. If it takes any " @@ -1472,12 +1471,12 @@ msgstr "" "#bsdports на EFNet или #freebsd-ports на Libera, например." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:444 +#: documentation/content/en/articles/contributing/_index.adoc:443 msgid "Give feedback" msgstr "Предоставляйте обратную связь" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:447 +#: documentation/content/en/articles/contributing/_index.adoc:446 msgid "" "If a committer finds a problem with your changes, they will most likely " "refer it back to you. A prompt response will help get your PR committed " @@ -1490,12 +1489,12 @@ msgstr "" "попытке разрешить возникшие проблемы." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:448 +#: documentation/content/en/articles/contributing/_index.adoc:447 msgid "And Finally" msgstr "И наконец" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:452 +#: documentation/content/en/articles/contributing/_index.adoc:451 msgid "" "Your changes will be committed and your port will have been updated. The PR " "will then be closed by the committer. That is it!" @@ -1504,13 +1503,13 @@ msgstr "" "будет закрыт коммиттером. Вот и все!" #. type: Title ===== -#: documentation/content/en/articles/contributing/_index.adoc:454 +#: documentation/content/en/articles/contributing/_index.adoc:453 #, no-wrap msgid "Ensure your ports continue to build correctly" msgstr "Убедитесь, что ваши порты продолжают собираться корректно" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:457 +#: documentation/content/en/articles/contributing/_index.adoc:456 msgid "" "This section is about discovering and fixing problems that stop your ports " "from building correctly." @@ -1519,7 +1518,7 @@ msgstr "" "правильной сборке портов." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:460 +#: documentation/content/en/articles/contributing/_index.adoc:459 msgid "" "FreeBSD only guarantees that the Ports Collection works on the `-STABLE` " "branches. In theory, you should be able to get by with running the latest " @@ -1532,7 +1531,7 @@ msgstr "" "возможность использовать саму ветку, это ещё лучше." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:464 +#: documentation/content/en/articles/contributing/_index.adoc:463 msgid "" "Since the majority of FreeBSD installations run on PC-compatible machines " "(what is termed the `i386` architecture), we expect you to keep the port " @@ -1547,7 +1546,7 @@ msgstr "" "вас нет одной из таких машин." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:469 +#: documentation/content/en/articles/contributing/_index.adoc:468 msgid "" "The usual failure modes for non-`x86` machines are that the original " "programmers assumed that, for instance, pointers are `int`-s, or that a " @@ -1564,7 +1563,7 @@ msgstr "" "поддержкой своего кода, вам, возможно, придется сделать это самостоятельно." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:472 +#: documentation/content/en/articles/contributing/_index.adoc:471 msgid "" "These are the tasks you need to perform to ensure your port is able to be " "built:" @@ -1573,12 +1572,12 @@ msgstr "" "может быть собран:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:476 +#: documentation/content/en/articles/contributing/_index.adoc:475 msgid "Watch for build failures" msgstr "Следите за ошибками сборки" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:478 +#: documentation/content/en/articles/contributing/_index.adoc:477 msgid "" "Check your mail for mail from `pkg-fallout@FreeBSD.org` and the http://" "portscout.FreeBSD.org[distfiles scanner] to see if any of the port which are " @@ -1589,13 +1588,13 @@ msgstr "" "либо порты, которые не собираются." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:479 -#: documentation/content/en/articles/contributing/_index.adoc:528 +#: documentation/content/en/articles/contributing/_index.adoc:478 +#: documentation/content/en/articles/contributing/_index.adoc:527 msgid "Collect information" msgstr "Собрать информацию" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:483 +#: documentation/content/en/articles/contributing/_index.adoc:482 msgid "" "Once you are aware of a problem, collect information to help you fix it. " "Build errors reported by `pkg-fallout` are accompanied by logs which will " @@ -1610,12 +1609,12 @@ msgstr "" "диагностике, например:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:485 +#: documentation/content/en/articles/contributing/_index.adoc:484 msgid "Build logs" msgstr "Логи сборки" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:486 +#: documentation/content/en/articles/contributing/_index.adoc:485 msgid "" "The commands and options used to build the port (including options set in [." "filename]#/etc/make.conf#)" @@ -1624,36 +1623,36 @@ msgstr "" "установленные в [.filename]#/etc/make.conf#)" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:487 +#: documentation/content/en/articles/contributing/_index.adoc:486 msgid "" "A list of packages installed on their system as shown by man:pkg-info[8]" msgstr "" "Список пакетов, установленных в системе, как показано в man:pkg-info[8]" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:488 +#: documentation/content/en/articles/contributing/_index.adoc:487 msgid "The version of FreeBSD they are running as shown by man:uname[1] `-a`" msgstr "" "Версия FreeBSD, которую они используют, как показано в man:uname[1] `-a`" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:489 +#: documentation/content/en/articles/contributing/_index.adoc:488 msgid "When their ports collection was last updated" msgstr "Когда их коллекция портов была последний раз обновлена" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:490 +#: documentation/content/en/articles/contributing/_index.adoc:489 msgid "When their ports tree and [.filename]#INDEX# was last updated" msgstr "" "Когда их дерево портов и файл [.filename]#INDEX# были последний раз обновлены" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:492 +#: documentation/content/en/articles/contributing/_index.adoc:491 msgid "Investigate and find a solution" msgstr "Изучить и найти решение" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:496 +#: documentation/content/en/articles/contributing/_index.adoc:495 msgid "" "Unfortunately there is no straightforward process to follow to do this. " "Remember, though: if you are stuck, ask for help! The {freebsd-ports} is a " @@ -1665,7 +1664,7 @@ msgstr "" "проектов часто очень отзывчивы." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:499 +#: documentation/content/en/articles/contributing/_index.adoc:498 msgid "" "Just as with updating a port, you should now incorporate changes, review and " "test, submit your changes in a PR, and provide feedback if required." @@ -1675,12 +1674,12 @@ msgstr "" "обратную связь." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:500 +#: documentation/content/en/articles/contributing/_index.adoc:499 msgid "Send patches to upstream authors" msgstr "Отправляйте исправления авторам вышестоящих проектов" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:505 +#: documentation/content/en/articles/contributing/_index.adoc:504 msgid "" "In some cases, you will have to make patches to the port to make it run on " "FreeBSD. Some (but not all) upstream authors will accept such patches back " @@ -1696,20 +1695,18 @@ msgstr "" "рассмотрите возможность отправки соответствующих исправлений авторам." #. type: Title ===== -#: documentation/content/en/articles/contributing/_index.adoc:507 +#: documentation/content/en/articles/contributing/_index.adoc:506 #, no-wrap msgid "Investigate bug reports and Bugzilla Problem Reports related to your port" -msgstr "" -"Изучать отчёты об ошибках и отчеты о проблемах Bugzilla, связанные с вашим " -"портом" +msgstr "Изучать отчёты об ошибках и отчеты о проблемах Bugzilla, связанные с вашим портом" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:510 +#: documentation/content/en/articles/contributing/_index.adoc:509 msgid "This section is about discovering and fixing bugs." msgstr "Этот раздел посвящён поиску и исправлению ошибок." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:513 +#: documentation/content/en/articles/contributing/_index.adoc:512 msgid "" "FreeBSD-specific bugs are generally caused by assumptions about the build " "and runtime environments that do not apply to FreeBSD. You are less likely " @@ -1722,7 +1719,7 @@ msgstr "" "диагностики." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:515 +#: documentation/content/en/articles/contributing/_index.adoc:514 msgid "" "These are the tasks you need to perform to ensure your port continues to " "work as intended:" @@ -1731,12 +1728,12 @@ msgstr "" "должным образом:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:519 +#: documentation/content/en/articles/contributing/_index.adoc:518 msgid "Respond to bug reports" msgstr "Отвечать на отчёты об ошибках" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:522 +#: documentation/content/en/articles/contributing/_index.adoc:521 msgid "" "Bugs may be reported to you through email via the https://bugs.FreeBSD.org/" "search/[Bugzilla Problem Report database]. Bugs may also be reported " @@ -1747,7 +1744,7 @@ msgstr "" "пользователи могут сообщать об ошибках напрямую вам." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:525 +#: documentation/content/en/articles/contributing/_index.adoc:524 msgid "" "You should respond to PRs and other reports within 14 days, but please try " "not to take that long. Try to respond as soon as possible, even if it is " @@ -1759,7 +1756,7 @@ msgstr "" "прежде чем вы сможете заняться PR." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:527 +#: documentation/content/en/articles/contributing/_index.adoc:526 msgid "" "If you have not responded after 14 days, any committer may commit from a PR " "that you have not responded to via a `maintainer-timeout`." @@ -1768,7 +1765,7 @@ msgstr "" "коммит из PR, на который вы не ответили, используя `maintainer-timeout`." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:530 +#: documentation/content/en/articles/contributing/_index.adoc:529 msgid "" "If the person reporting the bug has not also provided a fix, you need to " "collect the information that will allow you to generate one." @@ -1777,7 +1774,7 @@ msgstr "" "необходимо собрать информацию, которая позволит вам создать исправление." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:533 +#: documentation/content/en/articles/contributing/_index.adoc:532 msgid "" "If the bug is reproducible, you can collect most of the required information " "yourself. If not, ask the person who reported the bug to collect the " @@ -1788,7 +1785,7 @@ msgstr "" "ошибке, собрать информацию для вас, например:" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:535 +#: documentation/content/en/articles/contributing/_index.adoc:534 msgid "" "A detailed description of their actions, expected program behavior and " "actual behavior" @@ -1797,12 +1794,12 @@ msgstr "" "фактического поведения" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:536 +#: documentation/content/en/articles/contributing/_index.adoc:535 msgid "Copies of input data used to trigger the bug" msgstr "Копии входных данных, использованных для выявления ошибки" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:537 +#: documentation/content/en/articles/contributing/_index.adoc:536 msgid "" "Information about their build and execution environment - for example, a " "list of installed packages and the output of man:env[1]" @@ -1811,22 +1808,22 @@ msgstr "" "пакетов и вывод команды man:env[1]" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:538 +#: documentation/content/en/articles/contributing/_index.adoc:537 msgid "Core dumps" msgstr "Файлы дампов ядра" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:539 +#: documentation/content/en/articles/contributing/_index.adoc:538 msgid "Stack traces" msgstr "Стеки вызовов функций" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:541 +#: documentation/content/en/articles/contributing/_index.adoc:540 msgid "Eliminate incorrect reports" msgstr "Устраните некорректные отчёты" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:547 +#: documentation/content/en/articles/contributing/_index.adoc:546 msgid "" "Some bug reports may be incorrect. For example, the user may have simply " "misused the program; or their installed packages may be out of date and " @@ -1844,12 +1841,12 @@ msgstr "" "исправление было применено до следующего релиза вышестоящего проекта." #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:548 +#: documentation/content/en/articles/contributing/_index.adoc:547 msgid "Find a solution" msgstr "Найдите решение" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:551 +#: documentation/content/en/articles/contributing/_index.adoc:550 msgid "" "As with build errors, you will need to sort out a fix to the problem. " "Again, remember to ask if you are stuck!" @@ -1858,12 +1855,12 @@ msgstr "" "забывайте спросить, если застряли!" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:552 +#: documentation/content/en/articles/contributing/_index.adoc:551 msgid "Submit or approve changes" msgstr "Представить или утвердить изменения" #. type: Plain text -#: documentation/content/en/articles/contributing/_index.adoc:555 +#: documentation/content/en/articles/contributing/_index.adoc:554 msgid "" "Just as with updating a port, you should now incorporate changes, review and " "test, and submit your changes in a Bugzilla PR (or send a follow-up if a PR " @@ -1878,13 +1875,13 @@ msgstr "" "дополнение, указав, одобряете ли вы эти изменения или нет." #. type: Title ===== -#: documentation/content/en/articles/contributing/_index.adoc:557 +#: documentation/content/en/articles/contributing/_index.adoc:556 #, no-wrap msgid "Providing support" msgstr "Предоставление поддержки" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:562 +#: documentation/content/en/articles/contributing/_index.adoc:561 msgid "" "Part of being a maintainer is providing support - not for the software in " "general - but for the port and any FreeBSD-specific quirks and problems. " @@ -1898,7 +1895,7 @@ msgstr "" "обращение будет касаться именно FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:566 +#: documentation/content/en/articles/contributing/_index.adoc:565 msgid "" "Occasionally you may have to invoke your skills in diplomacy, and kindly " "point users seeking general support to the appropriate resources. Less " @@ -1915,7 +1912,7 @@ msgstr "" "так, конечно!), и предложите попробовать FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:569 +#: documentation/content/en/articles/contributing/_index.adoc:568 msgid "" "Sometimes users and developers will decide that you are a busy person whose " "time is valuable and do some of the work for you. For example, they might:" @@ -1924,23 +1921,23 @@ msgstr "" "ценно, и выполняют часть работы за вас. Например, они могут:" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:571 +#: documentation/content/en/articles/contributing/_index.adoc:570 msgid "submit a Bugzilla PR or send you patches to update your port," msgstr "" "отправить PR в Bugzilla или прислать свои патчи для обновления вашего порта," #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:572 +#: documentation/content/en/articles/contributing/_index.adoc:571 msgid "investigate and perhaps provide a fix to a PR, or" msgstr "исследовать и, возможно, предоставить исправление для PR, или" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:573 +#: documentation/content/en/articles/contributing/_index.adoc:572 msgid "otherwise submit changes to your port." msgstr "иначе отправить изменения в ваш порт." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:579 +#: documentation/content/en/articles/contributing/_index.adoc:578 msgid "" "In these cases your main obligation is to respond in a timely manner. " "Again, the timeout for non-responsive maintainers is 14 days. After this " @@ -1956,7 +1953,7 @@ msgstr "" "или обсудите их изменения с ними." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:581 +#: documentation/content/en/articles/contributing/_index.adoc:580 msgid "" "If you can make them feel that their contribution is appreciated (and it " "should be) you will have a better chance persuading them to do more things " @@ -1967,19 +1964,19 @@ msgstr "" "будущем :-)." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:583 +#: documentation/content/en/articles/contributing/_index.adoc:582 #, no-wrap msgid "Finding and fixing a broken port" msgstr "Поиск и исправление сломанного порта" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:586 +#: documentation/content/en/articles/contributing/_index.adoc:585 msgid "" "There are some really good places to find a port that needs some attention." msgstr "Есть несколько хороших мест, где можно найти порт, требующий внимания." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:589 +#: documentation/content/en/articles/contributing/_index.adoc:588 msgid "" "You can use the https://bugs.freebsd.org/search[web interface] to the " "Problem Report database to search through and view unresolved Bugzilla PRs. " @@ -1993,7 +1990,7 @@ msgstr "" "просмотром описаний вы сможете найти что-то интересное для работы." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:591 +#: documentation/content/en/articles/contributing/_index.adoc:590 msgid "" "https://portsfallout.com/[PortsFallout] shows port issues gathered from the " "FreeBSD package building." @@ -2002,7 +1999,7 @@ msgstr "" "собранные при сборке пакетов FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:593 +#: documentation/content/en/articles/contributing/_index.adoc:592 msgid "" "It is OK to send changes for a maintained port as well, but remember to ask " "the maintainer in case they are already working on the problem." @@ -2011,7 +2008,7 @@ msgstr "" "уточнить у сопровождающего, не работает ли он уже над этой проблемой." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:598 +#: documentation/content/en/articles/contributing/_index.adoc:597 msgid "" "Once you have found a bug or problem, collect information, investigate and " "fix! If there is an existing PR, follow up to that. Otherwise create a new " @@ -2023,13 +2020,13 @@ msgstr "" "порядке, приняты." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:600 +#: documentation/content/en/articles/contributing/_index.adoc:599 #, no-wrap msgid "When to call it quits" msgstr "Как прекратить сопровождение" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:607 +#: documentation/content/en/articles/contributing/_index.adoc:606 msgid "" "As your interests and commitments change, you may find that you no longer " "have time to continue some (or all) of your ports contributions. That is " @@ -2050,7 +2047,7 @@ msgstr "" "удовольствия, вероятно, пришло время позволить кому-то другому заняться этим!" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:611 +#: documentation/content/en/articles/contributing/_index.adoc:610 msgid "" "In any case, the Ports Management Team (`portmgr`) reserves the right to " "reset your maintainership if you have not actively maintained your port in " @@ -2065,13 +2062,13 @@ msgstr "" "ожидающие обновления, над которыми не велась работа в течение этого времени." #. type: Title === -#: documentation/content/en/articles/contributing/_index.adoc:613 +#: documentation/content/en/articles/contributing/_index.adoc:612 #, no-wrap msgid "Resources for ports maintainers and contributors" msgstr "Ресурсы для сопровождающих и участников портов" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:617 +#: documentation/content/en/articles/contributing/_index.adoc:616 msgid "" "The extref:{porters-handbook}[Porter's Handbook] is your hitchhiker's guide " "to the ports system. Keep it handy!" @@ -2080,7 +2077,7 @@ msgstr "" "путеводитель по системе портов. Держите его под рукой!" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:620 +#: documentation/content/en/articles/contributing/_index.adoc:619 msgid "" "extref:{problem-reports}[Writing FreeBSD Problem Reports] describes how to " "best formulate and submit a Problem Report. Following this article will " @@ -2092,7 +2089,7 @@ msgstr "" "ваших PR." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:622 +#: documentation/content/en/articles/contributing/_index.adoc:621 msgid "" "The https://bugs.freebsd.org/bugzilla/query.cgi[Bugzilla Problem Report " "database]." @@ -2101,7 +2098,7 @@ msgstr "" "Bugzilla]." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:625 +#: documentation/content/en/articles/contributing/_index.adoc:624 msgid "" "The http://portscout.FreeBSD.org[FreeBSD Ports distfile scanner (portscout)] " "can show you ports for which the distfiles are not fetchable. You can check " @@ -2115,7 +2112,7 @@ msgstr "" "которым требуется обновление `MASTER_SITES`." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:628 +#: documentation/content/en/articles/contributing/_index.adoc:627 msgid "" "package:ports-mgmt/poudriere[] is the most thorough way to test a port " "through the entire cycle of installation, packaging, and deinstallation. " @@ -2128,7 +2125,7 @@ msgstr "" "GitHub]" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:632 +#: documentation/content/en/articles/contributing/_index.adoc:631 msgid "" "man:portlint[1] is an application which can be used to verify that your port " "conforms to many important stylistic and functional guidelines. portlint is " @@ -2144,7 +2141,7 @@ msgstr "" "{porters-handbook}[Руководству портировщика] или попросите совета." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:637 +#: documentation/content/en/articles/contributing/_index.adoc:636 msgid "" "The {freebsd-ports} is for general ports-related discussion. It is a good " "place to ask for help. You can link:https://lists.freebsd.org/[subscribe, " @@ -2157,7 +2154,7 @@ msgstr "" "ознакомиться с архивами {freebsd-ports-bugs} и {svn-ports-head}." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:639 +#: documentation/content/en/articles/contributing/_index.adoc:638 msgid "" "https://portsfallout.com/[PortsFallout] is a place to help in searching for " "the https://lists.freebsd.org/archives/freebsd-pkg-fallout/[FreeBSD package-" @@ -2168,13 +2165,13 @@ msgstr "" "package-fallout]." #. type: Title == -#: documentation/content/en/articles/contributing/_index.adoc:641 +#: documentation/content/en/articles/contributing/_index.adoc:640 #, no-wrap msgid "Getting Started in Other Areas" msgstr "Начало работы в других областях" #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:645 +#: documentation/content/en/articles/contributing/_index.adoc:644 msgid "" "Looking for something interesting to get started that is not mentioned " "elsewhere in this article? The FreeBSD Project has several Wiki pages " @@ -2186,7 +2183,7 @@ msgstr "" "которых новые участники могут найти идеи о том, как начать." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:647 +#: documentation/content/en/articles/contributing/_index.adoc:646 msgid "" "The https://wiki.freebsd.org/JuniorJobs[Junior Jobs] page has a list of " "projects that might be of interest to people just getting started in " @@ -2197,7 +2194,7 @@ msgstr "" "FreeBSD и хочет попробовать свои силы в интересных задачах." #. type: delimited block = 4 -#: documentation/content/en/articles/contributing/_index.adoc:648 +#: documentation/content/en/articles/contributing/_index.adoc:647 msgid "" "The https://wiki.freebsd.org/IdeasPage[Ideas Page] contains various \"nice " "to have\" or \"interesting\" things to work on in the Project." diff --git a/documentation/content/ru/articles/cups/_index.adoc b/documentation/content/ru/articles/cups/_index.adoc index eb624708b0..9850c0def6 100644 --- a/documentation/content/ru/articles/cups/_index.adoc +++ b/documentation/content/ru/articles/cups/_index.adoc @@ -116,11 +116,11 @@ application/octet-stream [[printing-cups-configuring-printers]] == Настройка принтеров на сервере печати CUPS -После того, как система CUPS была установлена и сконфигурирована, системный администратор может начать конфигурирование локальных принтеров, подключенных к серверу печати CUPS. Эта часть процесса очень похожа, если не идентична настройке принтеров CUPS в других UNIX(R)-подобных операционных системах, таких как дистрибутивы Linux(R). +После того, как система CUPS была установлена и сконфигурирована, системный администратор может начать конфигурирование локальных принтеров, подключённых к серверу печати CUPS. Эта часть процесса очень похожа, если не идентична настройке принтеров CUPS в других UNIX(R)-подобных операционных системах, таких как дистрибутивы Linux(R). -Основным способом управления и администрирования сервера CUPS является веб-интерфейс, на который можно попасть запустив веб-браузер и набрав http://localhost:631[http://localhost:631] в его адресной строке. Если сервер CUPS находится на другой машине в сети, замените `localhost` на IP адрес сервера. Веб-интерфейс CUPS достаточно очевиден, там есть разделы для управления принтерами и заданиями на печать, авторизацией пользователей и т.п. Кроме того, в правой части страницы администрирования есть несколько флажков (check-box), дающих удобный доступ к часто меняемым установкам, таким как разрешение публичного доступа к подключенным к системе принтерам, предоставление удалённого управления сервером CUPS, изменение уровня доступа пользователей к принтерам и их заданиям на печать. +Основным способом управления и администрирования сервера CUPS является веб-интерфейс, на который можно попасть запустив веб-браузер и набрав http://localhost:631[http://localhost:631] в его адресной строке. Если сервер CUPS находится на другой машине в сети, замените `localhost` на IP адрес сервера. Веб-интерфейс CUPS достаточно очевиден, там есть разделы для управления принтерами и заданиями на печать, авторизацией пользователей и т.п. Кроме того, в правой части страницы администрирования есть несколько флажков (check-box), дающих удобный доступ к часто меняемым установкам, таким как разрешение публичного доступа к подключённым к системе принтерам, предоставление удалённого управления сервером CUPS, изменение уровня доступа пользователей к принтерам и их заданиям на печать. -Добавление принтера в общем такое же простое, как нажатие "Add Printer" на странице администрирования веб-интерфейса сервера CUPS или как нажатие одной из кнопок "New Printers Found" на той же странице администрирования. Когда перед вами предстанет выпадающий список "Device", просто выберите требуемый локально подключенный принтер, а дальше следуйте подсказкам интерфейса. В случае если были установлены порты или пакеты package:print/gutenprint-cups[] или package:print/hplip[], как указывалось выше, дополнительные драйвера печати будут доступны на последующих страницах, что может обеспечить большую надёжность и расширенные возможности. +Добавление принтера в общем такое же простое, как нажатие "Add Printer" на странице администрирования веб-интерфейса сервера CUPS или как нажатие одной из кнопок "New Printers Found" на той же странице администрирования. Когда перед вами предстанет выпадающий список "Device", просто выберите требуемый локально подключённый принтер, а дальше следуйте подсказкам интерфейса. В случае если были установлены порты или пакеты package:print/gutenprint-cups[] или package:print/hplip[], как указывалось выше, дополнительные драйвера печати будут доступны на последующих страницах, что может обеспечить большую надёжность и расширенные возможности. [[printing-cups-clients]] == Конфигурирование клиентов CUPS diff --git a/documentation/content/ru/articles/cups/_index.po b/documentation/content/ru/articles/cups/_index.po index 5bb61eced9..b7995faaf1 100644 --- a/documentation/content/ru/articles/cups/_index.po +++ b/documentation/content/ru/articles/cups/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2023-05-21 14:43-0300\n" -"PO-Revision-Date: 2026-04-05 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-05-18 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlescups_index/ru/>\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" #. type: YAML Front Matter: description @@ -32,30 +32,30 @@ msgid "CUPS on FreeBSD" msgstr "Универсальная система печати Unix на FreeBSD" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:44 +#: documentation/content/en/articles/cups/_index.adoc:43 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:46 +#: documentation/content/en/articles/cups/_index.adoc:45 msgid "An article about configuring CUPS on FreeBSD." msgstr "" "Эта статья посвящена конфигурированию Универсальной Системы Печати UNIX " "(CUPS) на FreeBSD." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:48 +#: documentation/content/en/articles/cups/_index.adoc:47 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:52 +#: documentation/content/en/articles/cups/_index.adoc:51 #, no-wrap msgid "An Introduction to the Common Unix Printing System (CUPS)" msgstr "Знакомимся с универсальной системой печати UNIX (CUPS)" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:56 +#: documentation/content/en/articles/cups/_index.adoc:55 msgid "" "CUPS, the Common UNIX Printing System, provides a portable printing layer " "for UNIX(R)-based operating systems. It has been developed by Easy Software " @@ -69,7 +69,7 @@ msgstr "" "разработчиков и пользователей UNIX(R)." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:61 +#: documentation/content/en/articles/cups/_index.adoc:60 msgid "" "CUPS uses the Internet Printing Protocol (IPP) as the basis for managing " "print jobs and queues. The Line Printer Daemon (LPD), Server Message Block " @@ -80,8 +80,8 @@ msgid "" "accessing printers in mixed environments of FreeBSD, Linux(R), Mac OS(R) X, " "or Windows(R)." msgstr "" -"Универсальная система печати UNIX использует протокол межсетевой печати (" -"Internet Printing Protocol, IPP) как основу для управления заданиями на " +"Универсальная система печати UNIX использует протокол межсетевой печати " +"(Internet Printing Protocol, IPP) как основу для управления заданиями на " "печать и очередями. Также частично поддерживаются следующие протоколы: LPD, " "SMB и AppSocket (также известный как JetDirect). CUPS даёт возможность " "обзора сетевых принтеров и использования опций, базирующихся на ПостСкрипт " @@ -91,20 +91,20 @@ msgstr "" "Linux(R), Mac OS(R) X или Windows(R)." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:63 +#: documentation/content/en/articles/cups/_index.adoc:62 msgid "The main site for CUPS is http://www.cups.org/[http://www.cups.org/]." msgstr "" "Официальный сайт универсальной системы печати UNIX - http://www.cups.org/" "[http://www.cups.org/]." #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:65 +#: documentation/content/en/articles/cups/_index.adoc:64 #, no-wrap msgid "Installing the CUPS Print Server" msgstr "Установка сервера печати CUPS" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:68 +#: documentation/content/en/articles/cups/_index.adoc:67 msgid "" "To install CUPS using a precompiled binary, issue the following command from " "a root terminal:" @@ -112,13 +112,13 @@ msgstr "" "Для установки CUPS используя пакет, запустите на выполнение такую команду:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:72 +#: documentation/content/en/articles/cups/_index.adoc:71 #, no-wrap msgid "# pkg install cups\n" msgstr "# pkg install cups\n" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:76 +#: documentation/content/en/articles/cups/_index.adoc:75 msgid "" "Other optional, but recommended, packages are package:print/gutenprint[] and " "package:print/hplip[], both of which add drivers and utilities for a variety " @@ -132,13 +132,13 @@ msgstr "" "cups#." #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:78 +#: documentation/content/en/articles/cups/_index.adoc:77 #, no-wrap msgid "Configuring the CUPS Print Server" msgstr "Настройка сервера печати CUPS" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:82 +#: documentation/content/en/articles/cups/_index.adoc:81 msgid "" "After installation, a few files must be edited to configure the CUPS " "server. First, create or modify, as the case may be, the file [.filename]#/" @@ -153,7 +153,7 @@ msgstr "" "связать принтеры с группой пользователей `cups`:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:90 +#: documentation/content/en/articles/cups/_index.adoc:89 #, no-wrap msgid "" "[system=10]\n" @@ -169,7 +169,7 @@ msgstr "" "add path 'usb/X.Y.Z' mode 0660 group cups\n" #. type: delimited block = 4 -#: documentation/content/en/articles/cups/_index.adoc:96 +#: documentation/content/en/articles/cups/_index.adoc:95 msgid "" "Note that _X_, _Y_, and _Z_ should be replaced with the target USB device " "listed in the [.filename]#/dev/usb# directory that corresponds to the " @@ -185,12 +185,12 @@ msgstr "" "dev/usb#." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:99 +#: documentation/content/en/articles/cups/_index.adoc:98 msgid "Next, add two lines to [.filename]#/etc/rc.conf# as follows:" msgstr "Затем, добавьте следующие две записи в [.filename]#/etc/rc.conf#:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:104 +#: documentation/content/en/articles/cups/_index.adoc:103 #, no-wrap msgid "" "cupsd_enable=\"YES\"\n" @@ -200,7 +200,7 @@ msgstr "" "devfs_system_ruleset=\"system\"\n" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:107 +#: documentation/content/en/articles/cups/_index.adoc:106 msgid "" "These two entries will start the CUPS print server on boot and invoke the " "local devfs rule created above, respectively." @@ -209,7 +209,7 @@ msgstr "" "и применять локальное правило devfs, созданное выше." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:109 +#: documentation/content/en/articles/cups/_index.adoc:108 msgid "" "To enable CUPS printing under certain Microsoft(R) Windows(R) clients, the " "line below should be uncommented in [.filename]#/usr/local/etc/cups/mime." @@ -221,13 +221,13 @@ msgstr "" "mime.convs#:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:113 +#: documentation/content/en/articles/cups/_index.adoc:112 #, no-wrap msgid "application/octet-stream\n" msgstr "application/octet-stream\n" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:116 +#: documentation/content/en/articles/cups/_index.adoc:115 msgid "" "Once these changes have been made, the man:devfs[8] and CUPS systems must " "both be restarted, either by rebooting the computer or issuing the following " @@ -238,7 +238,7 @@ msgstr "" "пользователя `root` следующие две команды:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:121 +#: documentation/content/en/articles/cups/_index.adoc:120 #, no-wrap msgid "" "# service devfs restart\n" @@ -248,13 +248,13 @@ msgstr "" "# service cupsd restart\n" #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:124 +#: documentation/content/en/articles/cups/_index.adoc:123 #, no-wrap msgid "Configuring Printers on the CUPS Print Server" msgstr "Настройка принтеров на сервере печати CUPS" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:128 +#: documentation/content/en/articles/cups/_index.adoc:127 msgid "" "After the CUPS system has been installed and configured, the administrator " "can begin configuring the local printers attached to the CUPS print server. " @@ -264,12 +264,12 @@ msgid "" msgstr "" "После того, как система CUPS была установлена и сконфигурирована, системный " "администратор может начать конфигурирование локальных принтеров, " -"подключенных к серверу печати CUPS. Эта часть процесса очень похожа, если не " +"подключённых к серверу печати CUPS. Эта часть процесса очень похожа, если не " "идентична настройке принтеров CUPS в других UNIX(R)-подобных операционных " "системах, таких как дистрибутивы Linux(R)." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:133 +#: documentation/content/en/articles/cups/_index.adoc:132 msgid "" "The primary means for managing and administering the CUPS server is through " "the web-based interface, which can be found by launching a web browser and " @@ -285,19 +285,19 @@ msgid "" "to the printers and print jobs." msgstr "" "Основным способом управления и администрирования сервера CUPS является веб-" -"интерфейс, на который можно попасть запустив веб-браузер и набрав " -"http://localhost:631[http://localhost:631] в его адресной строке. Если " -"сервер CUPS находится на другой машине в сети, замените `localhost` на IP " -"адрес сервера. Веб-интерфейс CUPS достаточно очевиден, там есть разделы для " -"управления принтерами и заданиями на печать, авторизацией пользователей и " -"т.п. Кроме того, в правой части страницы администрирования есть несколько " -"флажков (check-box), дающих удобный доступ к часто меняемым установкам, " -"таким как разрешение публичного доступа к подключенным к системе принтерам, " +"интерфейс, на который можно попасть запустив веб-браузер и набрав http://" +"localhost:631[http://localhost:631] в его адресной строке. Если сервер CUPS " +"находится на другой машине в сети, замените `localhost` на IP адрес сервера. " +"Веб-интерфейс CUPS достаточно очевиден, там есть разделы для управления " +"принтерами и заданиями на печать, авторизацией пользователей и т.п. Кроме " +"того, в правой части страницы администрирования есть несколько флажков " +"(check-box), дающих удобный доступ к часто меняемым установкам, таким как " +"разрешение публичного доступа к подключённым к системе принтерам, " "предоставление удалённого управления сервером CUPS, изменение уровня доступа " "пользователей к принтерам и их заданиям на печать." #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:137 +#: documentation/content/en/articles/cups/_index.adoc:136 msgid "" "Adding a printer is generally as easy as clicking \"Add Printer\" at the " "Administration screen of the CUPS web interface, or clicking one of the " @@ -313,20 +313,20 @@ msgstr "" "странице администрирования веб-интерфейса сервера CUPS или как нажатие одной " "из кнопок \"New Printers Found\" на той же странице администрирования. Когда " "перед вами предстанет выпадающий список \"Device\", просто выберите " -"требуемый локально подключенный принтер, а дальше следуйте подсказкам " +"требуемый локально подключённый принтер, а дальше следуйте подсказкам " "интерфейса. В случае если были установлены порты или пакеты package:print/" "gutenprint-cups[] или package:print/hplip[], как указывалось выше, " "дополнительные драйвера печати будут доступны на последующих страницах, что " "может обеспечить большую надёжность и расширенные возможности." #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:139 +#: documentation/content/en/articles/cups/_index.adoc:138 #, no-wrap msgid "Configuring CUPS Clients" msgstr "Конфигурирование клиентов CUPS" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:143 +#: documentation/content/en/articles/cups/_index.adoc:142 msgid "" "Once the CUPS server has been configured and printers have been added and " "published to the network, the next step is to configure the clients, or the " @@ -341,13 +341,13 @@ msgstr "" "большинстве этой информации вы не нуждаетесь." #. type: Title === -#: documentation/content/en/articles/cups/_index.adoc:145 +#: documentation/content/en/articles/cups/_index.adoc:144 #, no-wrap msgid "UNIX(R) Clients" msgstr "Клиенты UNIX(R)" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:151 +#: documentation/content/en/articles/cups/_index.adoc:150 msgid "" "CUPS will also need to be installed on your UNIX(R) clients. Once CUPS is " "installed on the clients, then CUPS printers that are shared across the " @@ -364,28 +364,28 @@ msgstr "" "системы печати на клиенте, CUPS-принтеры, присутствующие в сети, чаще всего " "автоматически находятся менеджерами принтеров разных графических оболочек, " "таких как GNOME или KDE. В качестве альтернативы, вы можете воспользоваться " -"веб-интерфейсом CUPS на клиентской машине по адресу " -"http://localhost:631[http://localhost:631] и на странице администрирования " -"выбрать \"Add Printer\". Когда перед вами предстанет выпадающий список " -"\"Device\", просто выберите сетевой CUPS принтер, если он был обнаружен " -"автоматически, или выберите `ipp` или `http` и введите IPP или HTTP адрес " -"(URI) сетевого CUPS принтера:" +"веб-интерфейсом CUPS на клиентской машине по адресу http://" +"localhost:631[http://localhost:631] и на странице администрирования выбрать " +"\"Add Printer\". Когда перед вами предстанет выпадающий список \"Device\", " +"просто выберите сетевой CUPS принтер, если он был обнаружен автоматически, " +"или выберите `ipp` или `http` и введите IPP или HTTP адрес (URI) сетевого " +"CUPS принтера:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:155 +#: documentation/content/en/articles/cups/_index.adoc:154 #, no-wrap msgid "ipp://server-name-or-ip/printers/printername\n" msgstr "ipp://server-name-or-ip/printers/printername\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:160 -#: documentation/content/en/articles/cups/_index.adoc:182 +#: documentation/content/en/articles/cups/_index.adoc:159 +#: documentation/content/en/articles/cups/_index.adoc:181 #, no-wrap msgid "http://server-name-or-ip:631/printers/printername\n" msgstr "http://server-name-or-ip:631/printers/printername\n" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:163 +#: documentation/content/en/articles/cups/_index.adoc:162 msgid "" "If the CUPS clients have difficulty finding other CUPS printers shared " "across the network, sometimes it is helpful to add or create a file [." @@ -396,13 +396,13 @@ msgstr "" "client.conf# с добавлением единственной записи, подобной следующей:" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:167 +#: documentation/content/en/articles/cups/_index.adoc:166 #, no-wrap msgid "ServerName server-ip\n" msgstr "ServerName server-ip\n" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:170 +#: documentation/content/en/articles/cups/_index.adoc:169 msgid "" "In this case, _server-ip_ would be replaced by the local IP address of the " "CUPS server on the network." @@ -411,13 +411,13 @@ msgstr "" "сети." #. type: Title === -#: documentation/content/en/articles/cups/_index.adoc:172 +#: documentation/content/en/articles/cups/_index.adoc:171 #, no-wrap msgid "Windows(R) Clients" msgstr "Клиенты Windows(R)" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:178 +#: documentation/content/en/articles/cups/_index.adoc:177 msgid "" "Versions of Windows(R) prior to XP did not have the capability to natively " "network with IPP-based printers. However, Windows(R) XP and later versions " @@ -434,7 +434,7 @@ msgstr "" "сетевой принтер (`Network Printer`), а затем ввести URI следующего формата:" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:185 +#: documentation/content/en/articles/cups/_index.adoc:184 msgid "" "If one has an older version of Windows(R) without native IPP printing " "support, then the general means of connecting to a CUPS printer is to use " @@ -447,13 +447,13 @@ msgstr "" "статьи." #. type: Title == -#: documentation/content/en/articles/cups/_index.adoc:187 +#: documentation/content/en/articles/cups/_index.adoc:186 #, no-wrap msgid "CUPS Troubleshooting" msgstr "Устранение неполадок с CUPS" #. type: Plain text -#: documentation/content/en/articles/cups/_index.adoc:196 +#: documentation/content/en/articles/cups/_index.adoc:195 msgid "" "Difficulties with CUPS often lies in permissions. First, double check the " "man:devfs[8] permissions as outlined above. Next, check the actual " @@ -487,7 +487,7 @@ msgstr "" "доступа." #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:202 +#: documentation/content/en/articles/cups/_index.adoc:201 #, no-wrap msgid "" "# Log general information in error_log - change \"info\" to \"debug\" for\n" @@ -499,7 +499,7 @@ msgstr "" "LogLevel info\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:205 +#: documentation/content/en/articles/cups/_index.adoc:204 #, no-wrap msgid "" "# Administrator user group...\n" @@ -509,7 +509,7 @@ msgstr "" "SystemGroup wheel\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:210 +#: documentation/content/en/articles/cups/_index.adoc:209 #, no-wrap msgid "" "# Listen for connections on Port 631.\n" @@ -523,7 +523,7 @@ msgstr "" "Listen /var/run/cups.sock\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:217 +#: documentation/content/en/articles/cups/_index.adoc:216 #, no-wrap msgid "" "# Show shared printers on the local network.\n" @@ -541,7 +541,7 @@ msgstr "" "BrowseAddress 192.168.1.* # change to local LAN settings\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:221 +#: documentation/content/en/articles/cups/_index.adoc:220 #, no-wrap msgid "" "# Default authentication type, when authentication is required...\n" @@ -553,7 +553,7 @@ msgstr "" "DefaultEncryption Never # comment this line to allow encryption\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:228 +#: documentation/content/en/articles/cups/_index.adoc:227 #, no-wrap msgid "" "# Allow access to the server from any machine on the LAN\n" @@ -571,7 +571,7 @@ msgstr "" "</Location>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:236 +#: documentation/content/en/articles/cups/_index.adoc:235 #, no-wrap msgid "" "# Allow access to the admin pages from any machine on the LAN\n" @@ -591,7 +591,7 @@ msgstr "" "</Location>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:245 +#: documentation/content/en/articles/cups/_index.adoc:244 #, no-wrap msgid "" "# Allow access to configuration files from any machine on the LAN\n" @@ -613,7 +613,7 @@ msgstr "" "</Location>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:256 +#: documentation/content/en/articles/cups/_index.adoc:255 #, no-wrap msgid "" "# Set the default printer/job policies...\n" @@ -630,19 +630,16 @@ msgstr "" "# Set the default printer/job policies...\n" "<Policy default>\n" " # Job-related operations must be done by the owner or an administrator...\n" -" <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs " -"\\\n" -"Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-" -"Subscription \\\n" -"Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job " -"Resume-Job \\\n" +" <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs \\\n" +"Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription \\\n" +"Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job \\\n" "CUPS-Move-Job>\n" " Require user @OWNER @SYSTEM\n" " Order deny,allow\n" " </Limit>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:267 +#: documentation/content/en/articles/cups/_index.adoc:266 #, no-wrap msgid "" " # All administration operations require an administrator to authenticate...\n" @@ -656,16 +653,11 @@ msgid "" " Order deny,allow\n" " </Limit>\n" msgstr "" -" # All administration operations require an administrator to authenticate..." -"\n" -" <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer " -"\\\n" -"Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-" -"New-Jobs \\\n" -"Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-" -"Printer \\\n" -"Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-" -"Class \\\n" +" # All administration operations require an administrator to authenticate...\n" +" <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer \\\n" +"Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs \\\n" +"Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer \\\n" +"Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class \\\n" "CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\n" " AuthType Basic\n" " Require user @SYSTEM\n" @@ -673,7 +665,7 @@ msgstr "" " </Limit>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:273 +#: documentation/content/en/articles/cups/_index.adoc:272 #, no-wrap msgid "" " # Only the owner or an administrator can cancel or authenticate a job...\n" @@ -689,7 +681,7 @@ msgstr "" " </Limit>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/cups/_index.adoc:278 +#: documentation/content/en/articles/cups/_index.adoc:277 #, no-wrap msgid "" " <Limit All>\n" diff --git a/documentation/content/ru/articles/freebsd-questions/_index.adoc b/documentation/content/ru/articles/freebsd-questions/_index.adoc index b79b392cf6..d10a193976 100644 --- a/documentation/content/ru/articles/freebsd-questions/_index.adoc +++ b/documentation/content/ru/articles/freebsd-questions/_index.adoc @@ -101,11 +101,11 @@ FreeBSD-questions является списком рассылки, распро При посылке сообщения в список рассылки FreeBSD-questions, имейте в виду следующее: -* Помните, что за ответы на вопросы о FreeBSD никто денег не получает. Все делают это в свободное время. Вы можете привлечь внимание, послав четко сформулированный вопрос, содержащий как можно больше относящейся к делу информации. Вы можете не получить внимания, послав неполный, непонятный или примитивный вопрос. В действительности можно посылать сообщение в список рассылки FreeBSD-questions и не получить ответа, даже если вы следуете этим правилам. Еще более вероятно не получить ответа, если вы им не следуете. В оставшейся части документа мы рассмотрим, как получить максимум от вопроса во FreeBSD-questions. +* Помните, что за ответы на вопросы о FreeBSD никто денег не получает. Все делают это в свободное время. Вы можете привлечь внимание, послав чётко сформулированный вопрос, содержащий как можно больше относящейся к делу информации. Вы можете не получить внимания, послав неполный, непонятный или примитивный вопрос. В действительности можно посылать сообщение в список рассылки FreeBSD-questions и не получить ответа, даже если вы следуете этим правилам. Еще более вероятно не получить ответа, если вы им не следуете. В оставшейся части документа мы рассмотрим, как получить максимум от вопроса во FreeBSD-questions. * Не всякий человек, могущий ответить на вопрос о FreeBSD, читает все сообщения: обычно читается строка с темой письма и решается, представляет ли сообщение интерес. То есть в ваших интересах указать тему письма. "FreeBSD problem" или "Help" недостаточно. Если вы не укажете тему вообще, то многие даже не потрудятся прочесть сообщение. Если тема сообщения недостаточно конкретна, то люди, которые могут ответить, могут его не прочесть. * Оформляйте ваше сообщение так, чтобы оно было читабельно, и ПОЖАЛУЙСТА, НЕ КРИЧИТЕ!!!!!. Мы понимаем, что для многих английский не является родным языком, и не исключаем этого, однако действительно очень трудно и мучительно читать сообщение, полное опечаток или в котором отсутствуют разделители строк. + -Не упускайте из виду эффект, который производит плохо отформатированное письмо, причем не только в списке рассылки FreeBSD-questions. По вашему почтовому сообщению люди составляют мнение о вас, и если сообщение плохо отформатировано, содержит по одной строке на абзац, неправильно разделено или полно ошибок, то о вас сложится плохое впечатление. +Не упускайте из виду эффект, который производит плохо отформатированное письмо, причём не только в списке рассылки FreeBSD-questions. По вашему почтовому сообщению люди составляют мнение о вас, и если сообщение плохо отформатировано, содержит по одной строке на абзац, неправильно разделено или полно ошибок, то о вас сложится плохое впечатление. + Множество плохо форматированных сообщений возникает из-за http://www.lemis.com/email.html[неправильно работающих или плохо настроенных почтовых программ]. Известно, что следующие почтовые программы могут посылать неправильно отформатированные сообщения без вашего ведома об этом: diff --git a/documentation/content/ru/articles/freebsd-questions/_index.po b/documentation/content/ru/articles/freebsd-questions/_index.po index 3d16e19ca8..472e8ae45c 100644 --- a/documentation/content/ru/articles/freebsd-questions/_index.po +++ b/documentation/content/ru/articles/freebsd-questions/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2025-11-08 16:17+0000\n" -"PO-Revision-Date: 2026-04-05 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-05-18 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlesfreebsd-questions_index/ru/>\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" #. type: Title = @@ -26,12 +26,12 @@ msgid "How to get Best Results from the FreeBSD-questions Mailing List" msgstr "Как работать со списком рассылки FreeBSD-questions c максимальной отдачей" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:44 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:43 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:47 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:46 msgid "" "This document provides useful information for people looking to prepare an e-" "mail to the FreeBSD-questions mailing list. Advice and hints are given that " @@ -43,25 +43,25 @@ msgstr "" "полезных ответов." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:49 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:48 msgid "" "This document is regularly posted to the FreeBSD-questions mailing list." msgstr "" "Этот документ регулярно публикуется в списке рассылки FreeBSD-questions." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:51 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:50 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:54 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:53 #, no-wrap msgid "Introduction" msgstr "Введение" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:58 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:57 msgid "" "`FreeBSD-questions` is a mailing list maintained by the FreeBSD project to " "help people who have questions about the normal use of FreeBSD. Another " @@ -75,7 +75,7 @@ msgstr "" "будущей работы над системой." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:65 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:64 msgid "" "The term \"hacker\" has nothing to do with breaking into other people's " "computers. The correct term for the latter activity is \"cracker\", but the " @@ -88,11 +88,11 @@ msgstr "" "других людей. Правильным термином для обозначения такой деятельности " "является \"кракер\", однако популярная пресса этого ещё не поняла. Хакеры " "FreeBSD нарушением защиты не занимаются. Более полное описание хакеров " -"находится в руководстве Эрика Рэймонда (Eric Raymond) http://www.catb.org/~" -"esr/faqs/hacker-howto.html[Как стать хакером]" +"находится в руководстве Эрика Рэймонда (Eric Raymond) http://www.catb.org/" +"~esr/faqs/hacker-howto.html[Как стать хакером]" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:68 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:67 msgid "" "This is a regular posting aimed to help both those seeking advice from " "FreeBSD-questions (the \"newcomers\"), and also those who answer the " @@ -103,7 +103,7 @@ msgstr "" "на эти вопросы отвечает (\"хакеры\")." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:72 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:71 msgid "" "Inevitably there is some friction, which stems from the different viewpoints " "of the two groups. The newcomers accuse the hackers of being arrogant, " @@ -122,7 +122,7 @@ msgstr "" "части такие мнения появляются из-за чувства разочарования." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:75 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:74 msgid "" "In this document, I would like to do something to relieve this frustration " "and help everybody get better results from FreeBSD-questions. In the " @@ -135,13 +135,13 @@ msgstr "" "на них отвечать." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:76 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:75 #, no-wrap msgid "How to Subscribe to FreeBSD-questions" msgstr "Как подписаться на FreeBSD-questions" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:82 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:81 msgid "" "FreeBSD-questions is a mailing list, so you need mail access. Point your " "WWW browser to the {freebsd-questions}. In the section titled \"Subscribe " @@ -155,7 +155,7 @@ msgstr "" "электронной почты\" (Your email address); другие поля являются опциональными." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:84 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:83 msgid "" "You will receive a confirmation message from mlmmj; follow the included " "instructions to complete your subscription." @@ -164,13 +164,13 @@ msgstr "" "инструкциям для завершения подписки." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:85 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:84 #, no-wrap msgid "How to Unsubscribe from FreeBSD-questions" msgstr "Как отписаться от FreeBSD-questions" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:90 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:89 msgid "" "Point your WWW browser to the {freebsd-questions}. In the section titled " "\"Subscribe or unsubscribe online\" fill in the \"Your email address\" field " @@ -183,7 +183,7 @@ msgstr "" "+unsubscribe@freebsd.org." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:92 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:91 msgid "" "A confirmation message will be sent to you from mlmmj; follow the included " "instructions to finish unsubscribing." @@ -192,13 +192,13 @@ msgstr "" "приложенным инструкциям, чтобы завершить отмену подписки." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:93 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:92 #, no-wrap msgid "Should I ask `-questions` or `-hackers`?" msgstr "Нужно задавать вопросы в `-questions` или `-hackers`?" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:98 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:97 msgid "" "Two mailing lists handle general questions about FreeBSD, `FreeBSD-" "questions` and `FreeBSD-hackers`. In some cases, it is not really clear " @@ -211,7 +211,7 @@ msgstr "" "98% всех случаев:" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:100 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:99 msgid "" "If the question is of a general nature, ask `FreeBSD-questions`. Examples " "might be questions about installing FreeBSD or the use of a particular " @@ -222,7 +222,7 @@ msgstr "" "утилит UNIX(R)." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:101 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:100 msgid "" "If you think the question relates to a bug, but you are not sure, or you do " "not know how to look for it, send the message to `FreeBSD-questions`." @@ -231,7 +231,7 @@ msgstr "" "знаете, как её исправить, пошлите сообщение во `FreeBSD-questions`." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:102 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:101 msgid "" "If the question relates to a bug, and you are _sure_ that it is a bug (for " "example, you can pinpoint the place in the code where it happens, and you " @@ -243,7 +243,7 @@ msgstr "" "hackers`." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:103 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:102 msgid "" "If the question relates to enhancements to FreeBSD, and you can make " "suggestions about how to implement them, then send the message to `FreeBSD-" @@ -253,26 +253,26 @@ msgstr "" "предложения по её реализации, то посылайте сообщение во `FreeBSD-hackers`." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:106 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:105 msgid "" "There are also a number of other extref:{handbook}eresources[specialized " "mailing lists, eresources-mail], which caters to more specific interests. " "The criteria above still apply, and it is in your interest to stick to them, " "since you are more likely to get good results that way." msgstr "" -"Имеется также некоторое количество других extref:{handbook}eresources[" -"специализированных списков рассылки, eresources-mail]. Здесь также подходит " -"указанный выше критерий, и в ваших интересах следовать ему, потому что " -"именно так можно получить результат." +"Имеется также некоторое количество других extref:{handbook}" +"eresources[специализированных списков рассылки, eresources-mail]. Здесь " +"также подходит указанный выше критерий, и в ваших интересах следовать ему, " +"потому что именно так можно получить результат." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:107 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:106 #, no-wrap msgid "Before Submitting a Question" msgstr "Перед посылкой вопроса" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:110 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:109 msgid "" "You can (and should) do some things yourself before asking a question on one " "of the mailing lists:" @@ -281,7 +281,7 @@ msgstr "" "одном из списков рассылки:" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:112 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:111 msgid "" "Try solving the problem on your own. If you post a question which shows that " "you have tried to solve the problem, your question will generally attract " @@ -298,7 +298,7 @@ msgstr "" "отвечая на вопросы, посылаемые в списки рассылки." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:113 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:112 msgid "" "Read the manual pages, and the FreeBSD documentation (either installed in [." "filename]#/usr/doc# or accessible via WWW at http://www.FreeBSD.org[http://" @@ -311,7 +311,7 @@ msgstr "" "extref:{faq}[FAQ]." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:114 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:113 msgid "" "Browse and/or search the archives for the mailing list, to see if your " "question or a similar one has been asked (and possibly answered) on the " @@ -328,7 +328,7 @@ msgstr "" "#mailinglists] соответственно." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:115 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:114 msgid "" "Use a search engine such as http://www.google.com[Google] or http://www." "yahoo.com[Yahoo] to find answers to your question." @@ -338,13 +338,13 @@ msgstr "" "http://www.google.com/bsd[BSD ориентированный поисковой интерфейс]." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:116 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:115 #, no-wrap msgid "How to Submit a Question" msgstr "Как посылать вопрос" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:119 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:118 msgid "" "When submitting a question to FreeBSD-questions, consider the following " "points:" @@ -353,7 +353,7 @@ msgstr "" "следующее:" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:121 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:120 msgid "" "Remember that nobody gets paid for answering a FreeBSD question. They do it " "of their own free will. You can influence this free will positively by " @@ -366,7 +366,7 @@ msgid "" "question to FreeBSD-questions." msgstr "" "Помните, что за ответы на вопросы о FreeBSD никто денег не получает. Все " -"делают это в свободное время. Вы можете привлечь внимание, послав четко " +"делают это в свободное время. Вы можете привлечь внимание, послав чётко " "сформулированный вопрос, содержащий как можно больше относящейся к делу " "информации. Вы можете не получить внимания, послав неполный, непонятный или " "примитивный вопрос. В действительности можно посылать сообщение в список " @@ -376,7 +376,7 @@ msgstr "" "во FreeBSD-questions." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:122 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:121 msgid "" "Not everybody who answers FreeBSD questions reads every message: they look " "at the subject line and decide whether it interests them. Clearly, it is in " @@ -394,7 +394,7 @@ msgstr "" "прочесть." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:123 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:122 msgid "" "Format your message so that it is legible, and PLEASE DO NOT SHOUT!!!!!. We " "appreciate that a lot of people do not speak English as their first " @@ -408,7 +408,7 @@ msgstr "" "строк." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:126 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:125 msgid "" "Do not underestimate the effect that a poorly formatted mail message has, " "not just on the FreeBSD-questions mailing list. Your mail message is all " @@ -416,13 +416,13 @@ msgid "" "badly spelt, or full of errors, it will give people a poor impression of you." msgstr "" "Не упускайте из виду эффект, который производит плохо отформатированное " -"письмо, причем не только в списке рассылки FreeBSD-questions. По вашему " +"письмо, причём не только в списке рассылки FreeBSD-questions. По вашему " "почтовому сообщению люди составляют мнение о вас, и если сообщение плохо " "отформатировано, содержит по одной строке на абзац, неправильно разделено " "или полно ошибок, то о вас сложится плохое впечатление." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:129 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:128 msgid "" "A lot of badly formatted messages come from http://www.lemis.com/email." "html[bad mailers or badly configured mailers]. The following mailers are " @@ -435,22 +435,22 @@ msgstr "" "неправильно отформатированные сообщения без вашего ведома об этом:" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:131 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:130 msgid "exmh" msgstr "exmh" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:132 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:131 msgid "Microsoft(R) Exchange" msgstr "Microsoft(R) Exchange" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:133 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:132 msgid "Microsoft(R) Outlook(R)" msgstr "Microsoft(R) Outlook(R)" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:135 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:134 msgid "" "Try not to use MIME: a lot of people use mailers which do not get on very " "well with MIME." @@ -459,7 +459,7 @@ msgstr "" "очень хорошо работают с MIME." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:136 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:135 msgid "" "Make sure your time and time zone are set correctly. This may seem a little " "silly, since your message still gets there, but many of the people you are " @@ -476,7 +476,7 @@ msgstr "" "что оно потерялось и даже не взглянут на него." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:137 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:136 msgid "" "Do not include unrelated questions in the same message. Firstly, a long " "message tends to scare people off, and secondly, it is more difficult to get " @@ -487,7 +487,7 @@ msgstr "" "людей, которые могут ответить на все вопросы, и прочитали такое сообщение." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:138 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:137 msgid "" "Specify as much information as possible. This is a difficult area, and we " "need to expand on what information you need to submit, but here is a start:" @@ -496,7 +496,7 @@ msgstr "" "какую информацию нужно сообщать, а поначалу:" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:140 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:139 msgid "" "In nearly every case, it is important to know the version of FreeBSD you are " "running. This is particularly the case for FreeBSD-CURRENT, where you should " @@ -509,7 +509,7 @@ msgstr "" "сообщения о -CURRENT в список рассылки FreeBSD-questions." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:141 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:140 msgid "" "With any problem which _could_ be hardware related, tell us about your " "hardware. In case of doubt, assume it is possible that it is hardware. What " @@ -523,7 +523,7 @@ msgstr "" "установлено памяти? Какое периферийное оборудование?" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:143 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:142 msgid "" "There is a judgement call here, of course, but the output of the man:" "dmesg[8] command can frequently be very useful, since it tells not just what " @@ -534,7 +534,7 @@ msgstr "" "только об оборудовании, с которым вы работаете, но также и о версии FreeBSD." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:144 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:143 msgid "" "If you get error messages, do not say \"I get error messages\", say (for " "example) \"I get the error message 'No route to host'\"." @@ -544,7 +544,7 @@ msgstr "" "host'\"." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:145 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:144 msgid "" "If your system panics, do not say \"My system panicked\", say (for example) " "\"my system panicked with the message 'free vnode isn't'\"." @@ -554,7 +554,7 @@ msgstr "" "isn't'\"." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:146 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:145 msgid "" "If you have difficulty installing FreeBSD, please tell us what hardware you " "have. In particular, it is important to know the IRQs and I/O addresses of " @@ -565,7 +565,7 @@ msgstr "" "адаптеров, установленных в вашей машине." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:147 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:146 msgid "" "If you have difficulty getting PPP to run, describe the configuration. Which " "version of PPP do you use? What kind of authentication do you have? Do you " @@ -578,7 +578,7 @@ msgstr "" "получили в файле протокола?" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:149 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:148 msgid "" "A lot of the information you need to supply is the output of programs, such " "as man:dmesg[8], or console messages, which usually appear in [.filename]#/" @@ -600,19 +600,19 @@ msgstr "" "вывод в файл и включите его в письмо. Например," #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:153 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:152 #, no-wrap msgid "% dmesg > /tmp/dmesg.out\n" msgstr "% dmesg > /tmp/dmesg.out\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:156 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:155 msgid "This redirects the information to the file [.filename]#/tmp/dmesg.out#." msgstr "" "Эта команда перенаправляет информацию в файл [.filename]#/tmp/dmesg.out#." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:157 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:156 msgid "" "If you do all this, and you still do not get an answer, there could be other " "reasons. For example, the problem is so complicated that nobody knows the " @@ -631,7 +631,7 @@ msgstr "" "сообщения снова и снова только повредит вашей репутации." #. type: Plain text -#: documentation/content/en/articles/freebsd-questions/_index.adoc:160 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:159 msgid "" "To summarize, let's assume you know the answer to the following question " "(yes, it is the same one in each case). You choose which of these two " @@ -642,13 +642,13 @@ msgstr "" "степени готовы ответить:" #. type: Block title -#: documentation/content/en/articles/freebsd-questions/_index.adoc:161 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:160 #, no-wrap msgid "Message 1" msgstr "Сообщение 1" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:171 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:170 #, no-wrap msgid "" "Subject: HELP!!?!??\n" @@ -664,19 +664,19 @@ msgstr "" "so why don't you guys tell me what I doing wrong.\n" #. type: Block title -#: documentation/content/en/articles/freebsd-questions/_index.adoc:174 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:173 #, no-wrap msgid "Message 2" msgstr "Сообщение 2" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:180 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:179 #, no-wrap msgid "Subject: Problems installing FreeBSD\n" msgstr "Subject: Problems installing FreeBSD\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:187 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:186 #, no-wrap msgid "" "I've just got the FreeBSD 2.1.5 CDROM from Walnut Creek, and I'm having a lot\n" @@ -694,13 +694,13 @@ msgstr "" "Missing Operating System.\n" #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:190 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:189 #, no-wrap msgid "How to Follow up to a Question" msgstr "Как дополнить вопрос" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:195 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:194 msgid "" "Often you will want to send in additional information to a question you have " "already sent. The best way to do this is to reply to your original " @@ -711,7 +711,7 @@ msgstr "" "сообщение. Здесь есть три момента:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:197 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:196 msgid "" "You include the original message text, so people will know what you are " "talking about. Do not forget to trim unnecessary text out, though." @@ -720,7 +720,7 @@ msgstr "" "Однако не забудьте удалить ненужный текст." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:198 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:197 msgid "" "The text in the subject line stays the same (you did remember to put one in, " "did you not?). Many mailers will sort messages by subject. This helps group " @@ -731,7 +731,7 @@ msgstr "" "теме письма. Это поможет при группировке сообщений." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:199 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:198 msgid "" "The message reference numbers in the header will refer to the previous " "message. Some mailers, such as http://www.mutt.org/[mutt], can _thread_ " @@ -742,20 +742,20 @@ msgstr "" "[mutt], могут _упорядочивать_ сообщения, показывая точную связь между ними." #. type: Title == -#: documentation/content/en/articles/freebsd-questions/_index.adoc:200 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:199 #, no-wrap msgid "How to Answer a Question" msgstr "Как отвечать на вопрос" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:203 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:202 msgid "Before you answer a question to FreeBSD-questions, consider:" msgstr "" "Перед тем, как отвечать на вопрос в списке рассылки FreeBSD-questions, " "имейте в виду:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:205 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:204 msgid "" "A lot of the points on submitting questions also apply to answering " "questions. Read them." @@ -764,7 +764,7 @@ msgstr "" "Прочтите эти замечания." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:206 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:205 msgid "" "Has somebody already answered the question? The easiest way to check this is " "to sort your incoming mail by subject: then (hopefully) you will see the " @@ -775,7 +775,7 @@ msgstr "" "с последующими ответами все вместе." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:209 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:208 msgid "" "If somebody has already answered it, it does not automatically mean that you " "should not send another answer. But it makes sense to read all the other " @@ -785,7 +785,7 @@ msgstr "" "посылать свой ответ. Но сначала имеет смысл прочитать все другие ответы." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:210 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:209 msgid "" "Do you have something to contribute beyond what has already been said? In " "general, \"Yeah, me too\" answers do not help much, although there are " @@ -801,7 +801,7 @@ msgstr "" "сообщение \"me too\", включите также относящуюся к делу информацию." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:211 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:210 msgid "" "Are you sure you understand the question? Very frequently, the person who " "asks the question is confused or does not express themselves very well. Even " @@ -819,7 +819,7 @@ msgstr "" "всегда можете запросить более подробную информацию." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:212 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:211 msgid "" "Are you sure your answer is correct? If not, wait a day or so. If nobody " "else comes up with a better answer, you can still reply and say, for " @@ -833,7 +833,7 @@ msgstr "" "frog?\"." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:213 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:212 msgid "" "Unless there is a good reason to do otherwise, reply to the sender and to " "FreeBSD-questions. Many people on the FreeBSD-questions are \"lurkers\": " @@ -852,7 +852,7 @@ msgstr "" "лишние строки Cc:." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:214 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:213 msgid "" "Include relevant text from the original message. Trim it to the minimum, but " "do not overdo it. It should still be possible for somebody who did not read " @@ -863,7 +863,7 @@ msgstr "" "первоначального сообщения, должен понять, о чём же идёт речь." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:215 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:214 msgid "" "Use some technique to identify which text came from the original message, " "and which text you add. I personally find that prepending \"`>`\" to the " @@ -878,7 +878,7 @@ msgstr "" "читабельным." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:216 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:215 msgid "" "Put your response in the correct place (after the text to which it replies). " "It is very difficult to read a thread of responses where each reply comes " @@ -889,7 +889,7 @@ msgstr "" "перед текстом, к которому относится." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:217 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:216 msgid "" "Most mailers change the subject line on a reply by prepending a text such as " "\"Re: \". If your mailer does not do it automatically, you should do it " @@ -900,7 +900,7 @@ msgstr "" "автоматически, вы должны делать это вручную." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:218 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:217 msgid "" "If the submitter did not abide by format conventions (lines too long, " "inappropriate subject line) _please_ fix it. In the case of an incorrect " @@ -916,7 +916,7 @@ msgstr "" "будет меньше проблем." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:221 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:220 msgid "" "In such cases, it is appropriate to say what you did and why you did it, but " "try not to be rude. If you find you can not answer without being rude, do " @@ -927,7 +927,7 @@ msgstr "" "грубость, воздержитесь от ответа вообще." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-questions/_index.adoc:223 +#: documentation/content/en/articles/freebsd-questions/_index.adoc:222 msgid "" "If you just want to reply to a message because of its bad format, just reply " "to the submitter, not to the list. You can just send him this message in " diff --git a/documentation/content/ru/articles/freebsd-releng/_index.adoc b/documentation/content/ru/articles/freebsd-releng/_index.adoc index 723571040f..8364251011 100644 --- a/documentation/content/ru/articles/freebsd-releng/_index.adoc +++ b/documentation/content/ru/articles/freebsd-releng/_index.adoc @@ -1,14 +1,14 @@ --- authors: - - + - author: 'Glen Barber' email: gjb@FreeBSD.org description: 'Описывает подход, используемый командой разработки релизов FreeBSD для создания релизов операционной системы FreeBSD производственного качества. В нём описаны инструменты, доступные тем, кто заинтересован в создании настраиваемых релизов FreeBSD для корпоративного внедрения или коммерческой продуктивизации' organizations: - - + - organization: 'The FreeBSD Foundation' webpage: https://www.freebsdfoundation.org/ - - + - organization: 'Rubicon Communications, LLC (Netgate)' webpage: https://www.netgate.com/ tags: ["releases", "engineering", "process", "FreeBSD"] @@ -203,7 +203,7 @@ crossref:freebsd-releng[releng-wrapup, Завершение цикла выпу Вполне типично, что многие разработчики сообщают команде {teamRe} о различных работах в процессе выполнения. В некоторых случаях может быть запрошено продление для работы в процессе, а в других случаях может быть сделан запрос на "общее одобрение" для определённого подмножества дерева. -При таких запросах важно убедиться, что обсуждаются сроки (даже если они приблизительные). Для общих одобрений следует четко указать продолжительность действия такого одобрения. Например, разработчик FreeBSD может запросить общее одобрение с начала периода мягкой заморозки кода до начала сборок `RC`. +При таких запросах важно убедиться, что обсуждаются сроки (даже если они приблизительные). Для общих одобрений следует чётко указать продолжительность действия такого одобрения. Например, разработчик FreeBSD может запросить общее одобрение с начала периода мягкой заморозки кода до начала сборок `RC`. [NOTE] ==== @@ -326,7 +326,7 @@ KBI/KPI стабильность подразумевает, что вызов [[releng-ports-beta-rc]] === Изменения в портах во время `BETA`, `RC` и финального `RELEASE` -Для каждой сборки в течение цикла выпуска файлы `MANIFEST`, содержащие `SHA256` для различных дистрибутивных наборов, таких как `base.txz`, `kernel.txz` и других, добавляются в порт package:misc/freebsd-release-manifests[]. Это позволяет другим утилитам, кроме , таким как package:ports-mgmt/poudriere[], безопасно использовать эти наборы дистрибутива, предоставляя механизм для проверки контрольных сумм. +Для каждой сборки в течение цикла выпуска файлы `MANIFEST`, содержащие `SHA256` для различных дистрибутивных наборов, таких как `base.txz`, `kernel.txz` и других, добавляются в порт package:misc/freebsd-release-manifests[]. Это позволяет другим утилитам, помимо man:bsdinstall[8], таким как package:ports-mgmt/poudriere[], безопасно использовать эти дистрибутивные наборы, предоставляя механизм для проверки контрольных сумм. [[releng-head]] == Выпуск релиза от {branchHead} @@ -373,7 +373,7 @@ KBI/KPI стабильность подразумевает, что вызов |Обновите версию FreeBSD и удалите уведомление о `WITNESS` |[.filename]#contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h# -a| +a| [source,shell,subs="attributes"] .... @@ -563,7 +563,7 @@ a| [[releng-build-scripts]] === Скрипты сборки релизов -До выхода FreeBSD 9.0-RELEASE файл [.filename]#src/release/Makefile# был обновлен для поддержки , а скрипт [.filename]#src/release/generate-release.sh# был добавлен в качестве обёртки для автоматизации вызова целей. +До выхода FreeBSD 9.0-RELEASE файл [.filename]#src/release/Makefile# был обновлен для поддержки man:bsdinstall[8], а скрипт [.filename]#src/release/generate-release.sh# был добавлен в качестве обёртки для автоматизации вызова целей man:release[7]. До выхода FreeBSD 9.2-RELEASE был представлен [.filename]#src/release/release.sh#, который, основываясь на [.filename]#src/release/generate-release.sh#, включал поддержку указания конфигурационных файлов для переопределения различных опций и переменных окружения. Поддержка конфигурационных файлов обеспечила возможность кросс-сборки каждого архитектурного варианта для релиза путем указания отдельного конфигурационного файла для каждого вызова. @@ -592,7 +592,7 @@ KERNEL="GENERIC64" # /bin/sh /usr/src/release/release.sh -c $HOME/release.conf .... -См. [.filename]#src/release/release.conf.sample# для получения дополнительных сведений и примеров использования. +См. man:release[7] и [.filename]#src/release/release.conf.sample# для получения дополнительных сведений и примеров использования. [[releng-build-release]] === Сборка релизов FreeBSD @@ -641,7 +641,7 @@ KERNEL="GENERIC64" * Создание структуры каталогов, соответствующей иерархии на `ftp-master` + -Если `EVERYTHINGISFINE` определено в конфигурационных файлах сборки, [.filename]#main.conf# в случае скриптов сборки, упомянутых выше, это происходит автоматически после завершения сборки, создавая структуру каталогов в [.filename]#${DESTDIR}/R/ftp-stage# с путями, соответствующими ожидаемым на `ftp-master`. Это эквивалентно выполнению следующего в каталоге: +Если `EVERYTHINGISFINE` определено в конфигурационных файлах сборки, [.filename]#main.conf# в случае скриптов сборки, упомянутых выше, это происходит автоматически в man:chroot[8] после завершения сборки, создавая структуру каталогов в [.filename]#${DESTDIR}/R/ftp-stage# с путями, соответствующими ожидаемым на `ftp-master`. Это эквивалентно выполнению следующего в man:chroot[8]: + [source, shell, subs="attributes"] .... @@ -661,14 +661,14 @@ KERNEL="GENERIC64" [[releng-mirrors-publishing]] === Публикация установочных носителей FreeBSD -Как только образы размещены в [.filename]#/archive/tmp/#, они готовы к публикации путем размещения в [.filename]#/archive/pub/FreeBSD#. Для уменьшения времени распространения используются жёсткие ссылки из [.filename]#/archive/tmp# в [.filename]#/archive/pub/FreeBSD#. +Как только образы размещены в [.filename]#/archive/tmp/#, они готовы к публикации путем размещения в [.filename]#/archive/pub/FreeBSD#. Для уменьшения времени распространения используется man:pax[1] для создания жёстких ссылкок из [.filename]#/archive/tmp# в [.filename]#/archive/pub/FreeBSD#. [NOTE] ==== Для эффективной работы и [.filename]#/archive/tmp#, и [.filename]#/archive/pub# должны находиться в одной логической файловой системе. ==== -Однако есть оговорка: после этого необходимо использовать rsync для исправления символических ссылок в [.filename]#pub/FreeBSD/snapshots/ISO-IMAGES#, которые будут заменены на жёсткие ссылки, что увеличит время распространения. +Однако есть оговорка: после этого необходимо использовать rsync после man:pax[1] для исправления символических ссылок в [.filename]#pub/FreeBSD/snapshots/ISO-IMAGES#, которые man:pax[1] заменит на жёсткие ссылки, что увеличит время распространения. [NOTE] ==== diff --git a/documentation/content/ru/articles/freebsd-releng/_index.po b/documentation/content/ru/articles/freebsd-releng/_index.po index c5e71f0061..96297b48e6 100644 --- a/documentation/content/ru/articles/freebsd-releng/_index.po +++ b/documentation/content/ru/articles/freebsd-releng/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2024-12-29 08:30-0500\n" -"PO-Revision-Date: 2026-04-05 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:54+0100\n" +"PO-Revision-Date: 2026-08-08 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlesfreebsd-releng_index/ru/>\n" @@ -22,12 +22,7 @@ msgstr "" #: documentation/content/en/articles/freebsd-releng/_index.adoc:1 #, no-wrap msgid "Describes the approach used by the FreeBSD release engineering team to make production quality releases of the FreeBSD Operating System. It describes the tools available for those interested in producing customized FreeBSD releases for corporate rollouts or commercial productization" -msgstr "" -"Описывает подход, используемый командой разработки релизов FreeBSD для " -"создания релизов операционной системы FreeBSD производственного качества. В " -"нём описаны инструменты, доступные тем, кто заинтересован в создании " -"настраиваемых релизов FreeBSD для корпоративного внедрения или коммерческой " -"продуктивизации" +msgstr "Описывает подход, используемый командой разработки релизов FreeBSD для создания релизов операционной системы FreeBSD производственного качества. В нём описаны инструменты, доступные тем, кто заинтересован в создании настраиваемых релизов FreeBSD для корпоративного внедрения или коммерческой продуктивизации" #. type: Title = #: documentation/content/en/articles/freebsd-releng/_index.adoc:1 @@ -37,41 +32,41 @@ msgid "FreeBSD Release Engineering" msgstr "Подготовка релизов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:63 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:62 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:65 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:64 msgid "" "This article describes the release engineering process of the FreeBSD " "Project." msgstr "В этой статье описывается процесс разработки релизов проекта FreeBSD." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:67 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:66 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:71 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:70 #, no-wrap msgid "Introduction to the FreeBSD Release Engineering Process" msgstr "Введение в процесс разработки релизов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:75 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:74 msgid "" "Development of FreeBSD has a very specific workflow. In general, all " "changes to the FreeBSD base system are committed to the {branchHead} branch, " "which reflects the top of the source tree." msgstr "" "Разработка FreeBSD следует очень специфичному рабочему процессу. В общем " -"случае все изменения в базовой системе FreeBSD вносятся в ветку {branchHead}" -", которая отражает вершину дерева исходного кода." +"случае все изменения в базовой системе FreeBSD вносятся в ветку " +"{branchHead}, которая отражает вершину дерева исходного кода." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:78 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:77 msgid "" "After a reasonable testing period, changes can then be merged to the " "{branchStable} branches. The default minimum timeframe before merging to " @@ -82,7 +77,7 @@ msgstr "" "ветки {branchStable} составляет три (3) дня." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:80 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:79 msgid "" "Although a general rule to wait a minimum of three days before merging from " "{branchHead}, there are a few special circumstances where an immediate merge " @@ -96,7 +91,7 @@ msgstr "" "выпуска." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:83 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:82 msgid "" "After several months, and the number of changes in the {branchStable} branch " "have grown significantly, it is time to release the next version of " @@ -108,7 +103,7 @@ msgstr "" "Исторически такие выпуски называются релизами \"с точкой\"." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:86 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:85 msgid "" "In between releases from the {branchStable} branches, approximately every " "two (2) years, a release will be cut directly from {branchHead}. These " @@ -119,7 +114,7 @@ msgstr "" "назывались выпуском «точка-ноль (dot-zero)»." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:88 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:87 msgid "" "This article will highlight the workflow and responsibilities of the " "{teamRe} for both \"dot-zero\" and \"point\"' releases." @@ -128,44 +123,42 @@ msgstr "" "выпуска \"точка-ноль\", так и для \"промежуточных\" выпусков." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:90 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:89 msgid "The following sections of this article describe:" msgstr "Следующие разделы этой статьи описывают:" #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:91 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:90 #, no-wrap msgid "crossref:freebsd-releng[releng-prep, General Information and Preparation]" msgstr "crossref:freebsd-releng[releng-prep, Общая информация и подготовка]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:93 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:92 msgid "General information and preparation before starting the release cycle." msgstr "Общая информация и подготовка перед началом цикла выпуска." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:94 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:93 #, no-wrap msgid "crossref:freebsd-releng[releng-website, Website Changes During the Release Cycle]" -msgstr "" -"crossref:freebsd-releng[releng-website, Изменения на веб-сайте в течение " -"цикла выпуска]" +msgstr "crossref:freebsd-releng[releng-website, Изменения на веб-сайте в течение цикла выпуска]" #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:96 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:281 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:95 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:280 #, no-wrap msgid "Website Changes During the Release Cycle" msgstr "Изменения на веб-сайте в течение цикла выпуска" #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:97 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:96 #, no-wrap msgid "crossref:freebsd-releng[releng-terms, Release Engineering Terminology]" msgstr "crossref:freebsd-releng[releng-terms, Терминология выпуска релизов]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:99 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:98 msgid "" "Terminology and general information, such as the \"code slush\" and \"code " "freeze\", used throughout this document." @@ -174,37 +167,35 @@ msgstr "" "slush)\" и \"заморозка кода (code freeze)\", используемые в этом документе." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:100 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:99 #, no-wrap msgid "crossref:freebsd-releng[releng-head, Release from {branchHead}]" msgstr "crossref:freebsd-releng[releng-head, Выпуск релиза от {branchHead}]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:102 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:101 msgid "The Release Engineering process for a \"dot-zero\" release." msgstr "Процесс Release Engineering для релиза \"точка-ноль\"." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:103 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:102 #, no-wrap msgid "crossref:freebsd-releng[releng-stable, Release from {branchStable}]" msgstr "crossref:freebsd-releng[releng-stable, Выпуск релиза от {branchStable}]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:105 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:104 msgid "The Release Engineering process for a \"point\" release." msgstr "Процесс Release Engineering для \"точечного\" выпуска." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:106 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:105 #, no-wrap msgid "crossref:freebsd-releng[releng-building, Building FreeBSD Installation Media]" -msgstr "" -"crossref:freebsd-releng[releng-building, Создание установочных носителей " -"FreeBSD]" +msgstr "crossref:freebsd-releng[releng-building, Создание установочных носителей FreeBSD]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:108 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:107 msgid "" "Information related to the specific procedures to build installation medium." msgstr "" @@ -212,37 +203,35 @@ msgstr "" "носителя." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:109 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:108 #, no-wrap msgid "crossref:freebsd-releng[releng-mirrors, Publishing FreeBSD Installation Media to Project Mirrors]" -msgstr "" -"crossref:freebsd-releng[releng-mirrors, Публикация установочных носителей " -"FreeBSD на зеркалах проекта]" +msgstr "crossref:freebsd-releng[releng-mirrors, Публикация установочных носителей FreeBSD на зеркалах проекта]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:111 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:110 msgid "Procedures to publish installation medium." msgstr "Процедуры публикации установочного носителя." #. type: Labeled list -#: documentation/content/en/articles/freebsd-releng/_index.adoc:112 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:111 #, no-wrap msgid "crossref:freebsd-releng[releng-wrapup, Wrapping up the Release Cycle]" msgstr "crossref:freebsd-releng[releng-wrapup, Завершение цикла выпуска]" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:114 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:113 msgid "Wrapping up the release cycle." msgstr "Завершение цикла выпуска." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:116 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:115 #, no-wrap msgid "General Information and Preparation" msgstr "Общая информация и подготовка" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:121 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:120 msgid "" "Approximately two months before the start of the release cycle, the {teamRe} " "decides on a schedule for the release. The schedule includes the various " @@ -254,244 +243,244 @@ msgstr "" "как даты заморозки, даты ветвления и даты сборки. Например:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:126 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:125 #, no-wrap msgid "Milestone" msgstr "Веха" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:128 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:127 #, no-wrap msgid "Anticipated Date" msgstr "Предполагаемая дата" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:129 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:128 #, no-wrap msgid "{branchHead} slush:" msgstr "мягкая заморозка {branchHead}:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:131 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:130 #, no-wrap msgid "May 27, 2016" msgstr "May 27, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:132 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:131 #, no-wrap msgid "{branchHead} freeze:" msgstr "заморозка {branchHead}:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:134 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:133 #, no-wrap msgid "June 10, 2016" msgstr "June 10, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:135 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:134 #, no-wrap msgid "{branchHead} KBI freeze:" msgstr "заморозка {branchHead} KBI:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:137 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:140 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:136 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:139 #, no-wrap msgid "June 24, 2016" msgstr "June 24, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:138 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:137 #, no-wrap msgid "`doc/` tree slush [1]:" msgstr "мягкая заморозка дерева `doc/` [1]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:141 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:140 #, no-wrap msgid "Ports quarterly branch [2]:" msgstr "Ежеквартальная ветка Ports [2]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:143 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:142 #, no-wrap msgid "July 1, 2016" msgstr "July 1, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:144 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:143 #, no-wrap msgid "{branchStablex} branch:" msgstr "Ветка {branchStablex}:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:146 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:149 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:152 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:145 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:148 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:151 #, no-wrap msgid "July 8, 2016" msgstr "July 8, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:147 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:146 #, no-wrap msgid "`doc/` tree tag [3]:" msgstr "`doc/` tree tag [3]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:150 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:149 #, no-wrap msgid "BETA1 build starts:" msgstr "Начало сборки BETA1:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:153 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:152 #, no-wrap msgid "{branchHead} thaw:" msgstr "Разморозка {branchHead}:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:155 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:154 #, no-wrap msgid "July 9, 2016" msgstr "July 9, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:156 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:155 #, no-wrap msgid "BETA2 build starts:" msgstr "Сборка BETA2 начинается:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:158 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:157 #, no-wrap msgid "July 15, 2016" msgstr "July 15, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:159 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:158 #, no-wrap msgid "BETA3 build starts [*]:" msgstr "Сборка BETA3 начинается [*]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:161 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:160 #, no-wrap msgid "July 22, 2016" msgstr "July 22, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:162 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:161 #, no-wrap msgid "{branchRelengx} branch:" msgstr "Ветка `{branchRelengx}`:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:164 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:167 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:163 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:166 #, no-wrap msgid "July 29, 2016" msgstr "July 29, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:165 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:164 #, no-wrap msgid "RC1 build starts:" msgstr "Сборка RC1 начинается:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:168 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:167 #, no-wrap msgid "{branchStablex} thaw:" msgstr "Разморозка {branchStablex}:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:170 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:169 #, no-wrap msgid "July 30, 2016" msgstr "July 30, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:171 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:170 #, no-wrap msgid "RC2 build starts:" msgstr "Сборка RC2 начинается:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:173 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:172 #, no-wrap msgid "August 5, 2016" msgstr "August 5, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:174 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:173 #, no-wrap msgid "Final Ports package builds [4]:" msgstr "Окончательные сборки пакетов Ports [4]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:176 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:175 #, no-wrap msgid "August 6, 2016" msgstr "August 6, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:177 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:176 #, no-wrap msgid "Ports release tag:" msgstr "Метка релиза портов:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:179 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:182 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:178 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:181 #, no-wrap msgid "August 12, 2016" msgstr "12 августа 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:180 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:179 #, no-wrap msgid "RC3 build starts [*]:" msgstr "Сборка RC3 начинается [*]:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:183 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:182 #, no-wrap msgid "RELEASE build starts:" msgstr "Сборка RELEASE начинается:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:185 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:184 #, no-wrap msgid "August 19, 2016" msgstr "August 19, 2016" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:186 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:185 #, no-wrap msgid "RELEASE announcement:" msgstr "Объявление о ВЫПУСКЕ:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:187 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:186 #, no-wrap msgid "September 2, 2016" msgstr "September 2, 2016" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:192 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:191 msgid "Items marked with \"[*]\" are \"as needed\"." msgstr "Отметка \"[*]\" у элементов означает \"по мере необходимости\"." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:195 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:194 msgid "The `doc/` tree slush is coordinated by the {teamDoceng}." msgstr "Мягкая заморозка дерева `doc/` координируется командой {teamDoceng}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:196 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:195 msgid "" "The Ports quarterly branch used is determined by when the final `RC` build " "is planned. A new quarterly branch is created on the first day of the " @@ -505,12 +494,12 @@ msgstr "" "этапы цикла выпуска. Квартальная ветка создаётся командой {teamPortmgr}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:197 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:196 msgid "The `doc/` tree is tagged by the {teamDoceng}." msgstr "Для дерева исходного кода `doc/` tag делается командой {teamDoceng}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:198 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:197 msgid "" "The final Ports package build is done by the {teamPortmgr} after the final " "(or what is expected to be final) `RC` build." @@ -519,7 +508,7 @@ msgstr "" "финальной (или ожидаемой финальной) сборки `RC`." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:202 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:201 msgid "" "If the release is being created from an existing {branchStable} branch, the " "KBI freeze date can be excluded, since the KBI is already considered frozen " @@ -530,7 +519,7 @@ msgstr "" "ветках {branchStable}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:207 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:206 msgid "" "When writing the release cycle schedule, a number of things need to be taken " "into consideration, in particular milestones where the target date depends " @@ -549,7 +538,7 @@ msgstr "" "сборки `RELEASE`." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:209 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:208 msgid "" "After general agreement on the schedule, the {teamRe} emails the schedule to " "the FreeBSD Developers." @@ -558,12 +547,12 @@ msgstr "" "разработчикам FreeBSD по электронной почте." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:212 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:211 msgid "" "It is somewhat typical that many developers will inform the {teamRe} about " "various works-in-progress. In some cases, an extension for the in-progress " -"work will be requested, and in other cases, a request for \"blanket " -"approval\" to a particular subset of the tree will be made." +"work will be requested, and in other cases, a request for \"blanket approval" +"\" to a particular subset of the tree will be made." msgstr "" "Вполне типично, что многие разработчики сообщают команде {teamRe} о " "различных работах в процессе выполнения. В некоторых случаях может быть " @@ -571,7 +560,7 @@ msgstr "" "сделан запрос на \"общее одобрение\" для определённого подмножества дерева." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:216 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:215 msgid "" "When such requests are made, it is important to make sure timelines (even if " "estimated) are discussed. For blanket approvals, the length of time for the " @@ -580,13 +569,13 @@ msgid "" "of the `RC` builds." msgstr "" "При таких запросах важно убедиться, что обсуждаются сроки (даже если они " -"приблизительные). Для общих одобрений следует четко указать " +"приблизительные). Для общих одобрений следует чётко указать " "продолжительность действия такого одобрения. Например, разработчик FreeBSD " "может запросить общее одобрение с начала периода мягкой заморозки кода до " "начала сборок `RC`." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:221 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:220 msgid "" "To keep track of blanket approvals, the {teamRe} uses an internal repository " "to keep a running log of such requests, which defines the area upon which a " @@ -605,7 +594,7 @@ msgstr "" "выпуском документации." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:226 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:225 msgid "" "The {teamRe} also uses this repository to track pending approval requests " "that are received just prior to starting various builds during the release " @@ -618,7 +607,7 @@ msgstr "" "указывает срок отсечки с помощью электронного письма разработчикам FreeBSD." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:229 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:228 msgid "" "Depending on the underlying set of code in question, and the overall impact " "the set of code has on FreeBSD as a whole, such requests may be approved or " @@ -629,7 +618,7 @@ msgstr "" "командой {teamRe}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:233 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:232 msgid "" "The same applies to work-in-progress extensions. For example, in-progress " "work for a new device driver that is otherwise isolated from the rest of the " @@ -643,7 +632,7 @@ msgstr "" "изменения отсутствуют в другой ветке." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:235 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:234 msgid "" "The schedule is also added to the Project website, in the `doc/` repository, " "in [.filename]#~/website/content/en/releases/{branchRevision}R/schedule." @@ -654,7 +643,7 @@ msgstr "" "Этот файл постоянно обновляется по мере прохождения цикла выпуска." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:239 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:238 msgid "" "In most cases, the [.filename]#schedule.adoc# can be copied from a prior " "release and updated accordingly." @@ -663,7 +652,7 @@ msgstr "" "предыдущего релиза и обновить соответствующим образом." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:242 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:241 msgid "" "In addition to adding [.filename]#schedule.adoc# to the website, [." "filename]#~/shared/releases.adoc# is also updated to add the link to the " @@ -676,7 +665,7 @@ msgstr "" "расписание на главной странице веб-сайта проекта." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:244 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:243 msgid "" "The schedule is also linked from [.filename]#~/website/content/en/releng/" "_index.adoc#." @@ -685,7 +674,7 @@ msgstr "" "en/releng/_index.adoc#." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:246 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:245 msgid "" "Approximately one month prior to the scheduled \"code slush\", the {teamRe} " "sends a reminder email to the FreeBSD Developers." @@ -694,13 +683,13 @@ msgstr "" "{teamRe} отправляет напоминание разработчикам FreeBSD." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:248 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:247 #, no-wrap msgid "Release Engineering Terminology" msgstr "Терминология выпуска релизов" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:251 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:250 msgid "" "This section describes some of the terminology used throughout the rest of " "this document." @@ -709,13 +698,13 @@ msgstr "" "данного документа." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:253 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:252 #, no-wrap msgid "The Code Slush" msgstr "Мягкая заморозка кода" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:256 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:255 msgid "" "Although the code slush is not a hard freeze on the tree, the {teamRe} " "requests that bugs in the existing code base take priority over new features." @@ -725,18 +714,18 @@ msgstr "" "базе перед добавлением новых функций." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:258 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:257 msgid "The code slush does not enforce commit approvals to the branch." msgstr "Мягкая заморозка кода не требует подтверждений коммитов в ветку." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:260 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:259 #, no-wrap msgid "The Code Freeze" msgstr "Заморозка кода" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:263 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:262 msgid "" "The code freeze marks the point in time where all commits to the branch " "require explicit approval from the {teamRe}." @@ -745,7 +734,7 @@ msgstr "" "требуют явного одобрения от {teamRe}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:266 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:265 msgid "" "The FreeBSD Git repository contains several hooks to perform sanity checks " "before any commit is actually committed to the tree. One of these hooks " @@ -758,7 +747,7 @@ msgstr "" "определённой ветке." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:268 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:267 msgid "" "To enforce commit approvals by the {teamRe}, the Release Engineering Team " "must approve any changes to the branch, in which case the commit log must " @@ -771,24 +760,24 @@ msgstr "" "это идентификатор утверждающего." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:272 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:271 msgid "" "During the code freeze, FreeBSD committers are urged to follow the link:" "https://wiki.freebsd.org/Releng/ChangeRequestGuidelines[Change Request " "Guidelines]." msgstr "" -"Во время заморозки кода участники проекта FreeBSD должны следовать " -"link:https://wiki.freebsd.org/Releng/ChangeRequestGuidelines[Рекомендациям " -"по запросам изменений]." +"Во время заморозки кода участники проекта FreeBSD должны следовать link:" +"https://wiki.freebsd.org/Releng/ChangeRequestGuidelines[Рекомендациям по " +"запросам изменений]." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:275 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:274 #, no-wrap msgid "The KBI/KPI Freeze" msgstr "Замораживание KBI/KPI" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:279 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:278 msgid "" "KBI/KPI stability implies that the caller of a function across two different " "releases of software that implement the function results in the same end " @@ -803,7 +792,7 @@ msgstr "" "стабильность KBI/KPI на ветке нарушается." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:284 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:283 msgid "" "This section describes the changes to the website that should occur as the " "release cycle progresses." @@ -812,7 +801,7 @@ msgstr "" "мере развития цикла выпуска." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:288 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:287 msgid "" "The files specified throughout this section are relative to the `{branchHead}" "` branch of the `doc` repository." @@ -821,13 +810,13 @@ msgstr "" "репозитория `doc`." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:291 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:290 #, no-wrap msgid "Website Changes Before the Release Cycle Begins" msgstr "Изменения на веб-сайте перед началом цикла выпуска" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:294 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:293 msgid "" "When the release cycle schedule is available, these files need to be updated " "to enable different functionalities on the FreeBSD Project website:" @@ -836,58 +825,58 @@ msgstr "" "обновить, чтобы включить различные функции на веб-сайте проекта FreeBSD:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:299 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:318 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:389 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:444 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:492 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:548 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:638 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:298 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:317 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:388 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:443 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:491 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:547 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:637 #, no-wrap msgid "File to Edit" msgstr "Файл для редактирования" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:301 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:320 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:391 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:446 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:494 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:550 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:640 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:768 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:300 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:319 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:390 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:445 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:493 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:549 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:639 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:767 #, no-wrap msgid "What to Change" msgstr "Что изменить" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:302 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:305 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:321 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:301 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:304 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:320 #, no-wrap msgid "[.filename]#~/shared/releases.adoc#" msgstr "[.filename]#~/shared/releases.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:304 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:303 #, no-wrap msgid "Change `beta-upcoming` from `IGNORE` to `INCLUDE`" msgstr "Изменить `beta-upcoming` с `IGNORE` на `INCLUDE`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:307 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:306 #, no-wrap msgid "Change `beta-testing` from `IGNORE` to `INCLUDE`" msgstr "Изменить `beta-testing` с `IGNORE` на `INCLUDE`" #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:310 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:309 #, no-wrap msgid "Website Changes During `BETA` or `RC`" msgstr "Изменения на веб-сайте в период `BETA` или `RC`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:313 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:312 msgid "" "When transitioning from `PRERELEASE` to `BETA`, these files need to be " "updated to enable the \"Help Test\" block on the download page. All files " @@ -898,46 +887,46 @@ msgstr "" "Все файлы указаны относительно [.filename]#head/# в репозитории `doc`:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:323 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:322 #, no-wrap msgid "Update `betarel-vers` to `BETA__1__`" msgstr "Обновите `betarel-vers` до `BETA__1__`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:324 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:323 #, no-wrap msgid "[.filename]#~/website/data/en/news/news.toml#" msgstr "[.filename]#~/website/data/en/news/news.toml#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:326 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:325 #, no-wrap msgid "Add an entry announcing the `BETA`" msgstr "Добавьте запись, объявляющую о `BETA`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:327 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:790 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:326 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:789 #, no-wrap msgid "[.filename]#~/website/static/security/advisory-template.txt#" msgstr "[.filename]#~/website/static/security/advisory-template.txt#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:329 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:331 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:328 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:330 #, no-wrap msgid "Add the new `BETA`, `RC`, or final `RELEASE` to the template" msgstr "Добавьте новую `BETA`, `RC` или финальную `RELEASE` в шаблон" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:330 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:793 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:329 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:792 #, no-wrap msgid "[.filename]#~/website/static/security/errata-template.txt#" msgstr "[.filename]#~/website/static/security/errata-template.txt#" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:334 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:333 msgid "" "Once the {branchRelengx} branch is created, the various release-related " "documents need to be added to the `doc/` repository." @@ -946,7 +935,7 @@ msgstr "" "документы, связанные с выпуском, в репозиторий `doc/`." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:338 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:337 msgid "" "The relevant release-related documents exist in the [.filename]#doc# " "repository for FreeBSD 12.x and later." @@ -955,36 +944,36 @@ msgstr "" "filename]#doc# для FreeBSD 12.x и более поздних версий." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:341 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:340 #, no-wrap msgid "Ports Changes During `BETA`, `RC`, and the Final `RELEASE`" msgstr "Изменения в портах во время `BETA`, `RC` и финального `RELEASE`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:345 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:344 msgid "" "For each build during the release cycle, the `MANIFEST` files containing the " "`SHA256` of the various distribution sets, such as `base.txz`, `kernel.txz`, " "and so on, are added to the package:misc/freebsd-release-manifests[] port. " -"This allows utilities other than , such as package:ports-mgmt/poudriere[], " -"to safely use these distribution sets by providing a mechanism through which " -"the checksums can be verified." +"This allows utilities other than man:bsdinstall[8], such as package:ports-" +"mgmt/poudriere[], to safely use these distribution sets by providing a " +"mechanism through which the checksums can be verified." msgstr "" "Для каждой сборки в течение цикла выпуска файлы `MANIFEST`, содержащие " -"`SHA256` для различных наборов дистрибутива, таких как `base.txz`, `kernel." +"`SHA256` для различных дистрибутивных наборов, таких как `base.txz`, `kernel." "txz` и других, добавляются в порт package:misc/freebsd-release-manifests[]. " -"Это позволяет другим утилитам, кроме , таким как package:ports-mgmt/" -"poudriere[], безопасно использовать эти наборы дистрибутива, предоставляя " -"механизм для проверки контрольных сумм." +"Это позволяет другим утилитам, помимо man:bsdinstall[8], таким как package" +":ports-mgmt/poudriere[], безопасно использовать эти дистрибутивные наборы, " +"предоставляя механизм для проверки контрольных сумм." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:347 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:346 #, no-wrap msgid "Release from {branchHead}" msgstr "Выпуск релиза от {branchHead}" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:350 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:349 msgid "" "This section describes the general procedures of the FreeBSD release cycle " "from the {branchHead} branch." @@ -993,24 +982,24 @@ msgstr "" "{branchHead}." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:352 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:351 #, no-wrap msgid "FreeBSD \"`ALPHA`\" Builds" msgstr "FreeBSD \"`ALPHA`\" сборки" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:356 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:355 msgid "" "Starting with the FreeBSD 10.0-RELEASE cycle, the notion of \"`ALPHA`\" " "builds was introduced. Unlike the `BETA` and `RC` builds, `ALPHA` builds " "are not included in the FreeBSD Release schedule." msgstr "" -"Начиная с цикла выпуска FreeBSD 10.0-RELEASE, было введено понятие сборок \"" -"`ALPHA`\". В отличие от сборок `BETA` и `RC`, сборки `ALPHA` не включены в " +"Начиная с цикла выпуска FreeBSD 10.0-RELEASE, было введено понятие сборок " +"\"`ALPHA`\". В отличие от сборок `BETA` и `RC`, сборки `ALPHA` не включены в " "график выпуска FreeBSD." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:358 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:357 msgid "" "The idea behind `ALPHA` builds is to provide regular FreeBSD-provided builds " "before the creation of the {branchStable} branch." @@ -1019,13 +1008,13 @@ msgstr "" "до создания ветки {branchStable}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:360 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:359 msgid "FreeBSD `ALPHA` snapshots should be built approximately once a week." msgstr "" "Снимки состояния `ALPHA` FreeBSD должны собираться примерно раз в неделю." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:363 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:362 msgid "" "For the first `ALPHA` build, the `BRANCH` value in [.filename]#sys/conf/" "newvers.sh# needs to be changed from `CURRENT` to `ALPHA1`. For subsequent " @@ -1036,7 +1025,7 @@ msgstr "" "`ALPHA` увеличивайте каждое значение `ALPHA__N__` на единицу." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:365 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:364 msgid "" "See crossref:freebsd-releng[releng-building, Building FreeBSD Installation " "Media] for information on building the `ALPHA` images." @@ -1045,13 +1034,13 @@ msgstr "" "FreeBSD] для получения информации о сборке образов `ALPHA`." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:367 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:366 #, no-wrap msgid "Creating the {branchStablex} Branch" msgstr "Создание ветки {branchStablex}" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:372 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:371 msgid "" "When creating the {branchStable} branch, several changes are required in " "both the new {branchStable} branch and the {branchHead} branch. The files " @@ -1064,44 +1053,44 @@ msgstr "" "Git:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:376 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:375 msgid "Make sure that you are in the {branchHead} branch" msgstr "Убедитесь, что вы находитесь в ветке {branchHead}" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:381 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:380 #, no-wrap msgid "% git checkout -b {branchStablex}\n" msgstr "% git checkout -b {branchStablex}\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:384 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:383 msgid "" "Once the {branchStablex} branch has been created, make the following edits:" msgstr "После создания ветки {branchStablex} внесите следующие изменения:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:392 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:447 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:644 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:391 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:446 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:643 #, no-wrap msgid "[.filename]#UPDATING#" msgstr "[.filename]#UPDATING#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:394 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:393 #, no-wrap msgid "Update the FreeBSD version, and remove the notice about `WITNESS`" msgstr "Обновите версию FreeBSD и удалите уведомление о `WITNESS`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:395 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:394 #, no-wrap msgid "[.filename]#contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h#" msgstr "[.filename]#contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:404 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:403 #, no-wrap msgid "" "[source,shell,subs=\"attributes\"]\n" @@ -1119,266 +1108,258 @@ msgstr "" "...." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:405 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:465 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:501 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:404 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:464 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:500 #, no-wrap msgid "[.filename]#lib/clang/llvm.build.mk#" msgstr "[.filename]#lib/clang/llvm.build.mk#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:407 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:406 #, no-wrap msgid "Uncomment `-DNDEBUG`" msgstr "Раскомментируйте `-DNDEBUG`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:408 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:407 #, no-wrap msgid "[.filename]#sys/\\*/conf/GENERIC*#" msgstr "[.filename]#sys/\\*/conf/GENERIC*#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:410 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:413 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:409 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:412 #, no-wrap msgid "Remove debugging support" msgstr "Удалите поддержку отладки" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:411 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:410 #, no-wrap msgid "[.filename]#sys/*/conf/MINIMAL#" msgstr "[.filename]#sys/*/conf/MINIMAL#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:414 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:413 #, no-wrap msgid "[.filename]#release/release.conf.sample#" msgstr "[.filename]#release/release.conf.sample#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:416 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:415 #, no-wrap msgid "Update `SRCBRANCH`" msgstr "Обновите `SRCBRANCH`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:417 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:416 #, no-wrap msgid "[.filename]#sys/*/conf/GENERIC-NODEBUG#" msgstr "[.filename]#sys/*/conf/GENERIC-NODEBUG#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:419 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:418 #, no-wrap msgid "Remove these kernel configurations" msgstr "Удалите следующие параметры конфигурации ядра" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:420 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:419 #, no-wrap msgid "[.filename]#sys/arm/conf/std.arm*#" msgstr "[.filename]#sys/arm/conf/std.arm*#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:422 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:421 #, no-wrap msgid "Remove debugging options" msgstr "Удалите отладочные опции" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:423 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:450 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:495 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:551 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:566 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:641 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:422 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:449 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:494 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:550 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:565 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:640 #, no-wrap msgid "[.filename]#sys/conf/newvers.sh#" msgstr "[.filename]#sys/conf/newvers.sh#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:425 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:424 #, no-wrap msgid "Update the `BRANCH` value to reflect `BETA1`" msgstr "Обновите значение `BRANCH`, чтобы оно соответствовало `BETA1`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:426 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:429 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:425 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:428 #, no-wrap msgid "[.filename]#share/mk/src.opts.mk#" msgstr "[.filename]#share/mk/src.opts.mk#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:428 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:427 #, no-wrap msgid "Move `REPRODUCIBLE_BUILD` from `\\__DEFAULT_NO_OPTIONS` to `__DEFAULT_YES_OPTIONS`" -msgstr "" -"Переместите `REPRODUCIBLE_BUILD` из `\\__DEFAULT_NO_OPTIONS` в " -"`__DEFAULT_YES_OPTIONS`" +msgstr "Переместите `REPRODUCIBLE_BUILD` из `\\__DEFAULT_NO_OPTIONS` в `__DEFAULT_YES_OPTIONS`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:431 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:430 #, no-wrap msgid "Move `LLVM_ASSERTIONS` from `\\__DEFAULT_YES_OPTIONS` to `__DEFAULT_NO_OPTIONS`" -msgstr "" -"Переместите `LLVM_ASSERTIONS` из `\\__DEFAULT_YES_OPTIONS` в " -"`__DEFAULT_NO_OPTIONS`" +msgstr "Переместите `LLVM_ASSERTIONS` из `\\__DEFAULT_YES_OPTIONS` в `__DEFAULT_NO_OPTIONS`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:432 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:431 #, no-wrap msgid "[.filename]#libexec/rc/rc.conf#" msgstr "[.filename]#libexec/rc/rc.conf#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:434 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:433 #, no-wrap msgid "Set `dumpdev` from `AUTO` to `NO` (it is configurable via for those that want it enabled by default)" -msgstr "" -"Установите `dumpdev` с `AUTO` на `NO` (это настраивается для тех, кто хочет " -"включить его по умолчанию)" +msgstr "Установите `dumpdev` с `AUTO` на `NO` (это настраивается для тех, кто хочет включить его по умолчанию)" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:435 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:434 #, no-wrap msgid "[.filename]#release/Makefile#" msgstr "[.filename]#release/Makefile#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:436 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:435 #, no-wrap msgid "Remove the `debug.witness.trace` entries" msgstr "Удалите записи `debug.witness.trace`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:439 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:438 msgid "" "Then in the {branchHead} branch, which will now become a new major version:" msgstr "" "Затем в ветке {branchHead}, которая теперь станет новой основной версией:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:449 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:448 #, no-wrap msgid "Update the FreeBSD version" msgstr "Обновите версию FreeBSD" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:452 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:451 #, no-wrap msgid "Update the `BRANCH` value to reflect `CURRENT`, and increment `REVISION`" -msgstr "" -"Обновите значение `BRANCH`, чтобы оно соответствовало `CURRENT`, и увеличьте " -"`REVISION`" +msgstr "Обновите значение `BRANCH`, чтобы оно соответствовало `CURRENT`, и увеличьте `REVISION`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:453 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:498 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:452 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:497 #, no-wrap msgid "[.filename]#Makefile.inc1#" msgstr "[.filename]#Makefile.inc1#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:455 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:454 #, no-wrap msgid "Update `TARGET_TRIPLE` and `MACHINE_TRIPLE`" msgstr "Обновите `TARGET_TRIPLE` и `MACHINE_TRIPLE`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:456 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:554 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:569 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:455 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:553 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:568 #, no-wrap msgid "[.filename]#sys/sys/param.h#" msgstr "[.filename]#sys/sys/param.h#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:458 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:556 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:570 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:457 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:555 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:569 #, no-wrap msgid "Update `__FreeBSD_version`" msgstr "Обновите `__FreeBSD_version`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:459 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:458 #, no-wrap msgid "[.filename]#gnu/usr.bin/cc/cc_tools/freebsd-native.h#" msgstr "[.filename]#gnu/usr.bin/cc/cc_tools/freebsd-native.h#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:461 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:460 #, no-wrap msgid "Update `FBSD_MAJOR` and `FBSD_CC_VER`" msgstr "Обновите `FBSD_MAJOR` и `FBSD_CC_VER`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:462 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:461 #, no-wrap msgid "[.filename]#contrib/gcc/config.gcc#" msgstr "[.filename]#contrib/gcc/config.gcc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:464 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:463 #, no-wrap msgid "Append the `freebsdversion.h` section" msgstr "Добавьте раздел `freebsdversion.h`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:467 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:466 #, no-wrap msgid "Update the value of `OS_VERSION`" msgstr "Обновите значение `OS_VERSION`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:468 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:467 #, no-wrap msgid "[.filename]#lib/clang/freebsd_cc_version.h#" msgstr "[.filename]#lib/clang/freebsd_cc_version.h#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:470 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:469 #, no-wrap msgid "Update `FREEBSD_CC_VERSION`" msgstr "Обновите `FREEBSD_CC_VERSION`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:471 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:470 #, no-wrap msgid "[.filename]#lib/clang/include/lld/Common/Version.inc#" msgstr "[.filename]#lib/clang/include/lld/Common/Version.inc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:473 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:472 #, no-wrap msgid "Update `LLD_REVISION_STRING`" msgstr "Обновите `LLD_REVISION_STRING`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:474 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:504 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:473 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:503 #, no-wrap msgid "[.filename]#Makefile.libcompat#" msgstr "[.filename]#Makefile.libcompat#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:475 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:505 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:474 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:504 #, no-wrap msgid "Update `LIB32CPUFLAGS`" msgstr "Обновите `LIB32CPUFLAGS`" #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:478 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:477 #, no-wrap msgid "Release from {branchStable}" msgstr "Выпуск релиза от {branchStable}" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:481 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:480 msgid "" "This section describes the general procedures of the FreeBSD release cycle " "from an extablished {branchStable} branch." @@ -1387,13 +1368,13 @@ msgstr "" "ветки {branchStable}." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:483 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:482 #, no-wrap msgid "FreeBSD `stable` Branch Code Slush" msgstr "Мягкая заморозка кода ветки `stable` FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:487 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:486 msgid "" "In preparation for the code freeze on a `stable` branch, several files need " "to be updated to reflect the release cycle is officially in progress. These " @@ -1404,31 +1385,31 @@ msgstr "" "находятся в корневом каталоге ветки stable:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:497 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:496 #, no-wrap msgid "Update the `BRANCH` value to reflect `PRERELEASE`" msgstr "Обновите значение `BRANCH`, чтобы отразить `PRERELEASE`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:500 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:499 #, no-wrap msgid "Update `TARGET_TRIPLE`" msgstr "Обновите `TARGET_TRIPLE`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:503 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:502 #, no-wrap msgid "Update `OS_VERSION`" msgstr "Обновите `OS_VERSION`" #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:508 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:507 #, no-wrap msgid "FreeBSD `BETA` Builds" msgstr "Сборки FreeBSD `BETA`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:513 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:512 msgid "" "Following the code slush, the next phase of the release cycle is the code " "freeze. This is the point at which all commits to the stable branch require " @@ -1441,7 +1422,7 @@ msgstr "" "репозиторием." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:518 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:517 msgid "" "There are two general exceptions to requiring commit approval during the " "release cycle. The first is any change that needs to be committed by the " @@ -1455,7 +1436,7 @@ msgstr "" "время цикла выпуска." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:522 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:521 msgid "" "Once the code freeze is in effect, the next build from the branch is labeled " "`BETA1`. This is done by updating the `BRANCH` value in [.filename]#sys/" @@ -1466,24 +1447,24 @@ msgstr "" "filename]#sys/conf/newvers.sh# с `PRERELEASE` на `BETA1`." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:525 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:524 msgid "" "Once this is done, the first set of `BETA` builds are started. Subsequent " "`BETA` builds do not require updates to any files other than [.filename]#sys/" "conf/newvers.sh#, incrementing the `BETA` build number." msgstr "" "После этого начинается первая сборка `BETA`. Последующие сборки `BETA` не " -"требуют обновления каких-либо файлов, кроме [.filename]#sys/conf/newvers.sh#" -", с увеличением номера сборки `BETA`." +"требуют обновления каких-либо файлов, кроме [.filename]#sys/conf/newvers." +"sh#, с увеличением номера сборки `BETA`." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:527 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:526 #, no-wrap msgid "Creating the {branchRelengx} Branch" msgstr "Создание ветки {branchRelengx}" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:533 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:532 msgid "" "When the first `RC` (Release Candidate) build is ready to begin, the " "{branchReleng} branch is created. This is a multi-step process that must be " @@ -1499,65 +1480,61 @@ msgstr "" "корню репозитория. Порядок коммитов и что нужно изменить:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:537 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:536 msgid "Make sure that you are in the {branchStablex} branch" msgstr "Убедитесь, что вы находитесь в ветке {branchStablex}" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:542 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:541 #, no-wrap msgid "% git checkout -b {branchRelengx}\n" msgstr "% git checkout -b {branchRelengx}\n" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:553 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:552 #, no-wrap msgid "Change `BETA__X__` to `RC1`" msgstr "Измените `BETA__X__` на `RC1`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:557 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:556 #, no-wrap msgid "[.filename]#sys/conf/kern.opts.mk#" msgstr "[.filename]#sys/conf/kern.opts.mk#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:559 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:558 #, no-wrap msgid "Move `REPRODUCIBLE_BUILD` from `__DEFAULT_NO_OPTIONS` to `__DEFAULT_YES_OPTIONS`" -msgstr "" -"Переместите `REPRODUCIBLE_BUILD` из `__DEFAULT_NO_OPTIONS` в " -"`__DEFAULT_YES_OPTIONS`" +msgstr "Переместите `REPRODUCIBLE_BUILD` из `__DEFAULT_NO_OPTIONS` в `__DEFAULT_YES_OPTIONS`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:560 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:559 #, no-wrap msgid "[.filename]#etc/pkg/FreeBSD.conf#" msgstr "[.filename]#etc/pkg/FreeBSD.conf#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:562 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:565 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:561 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:564 #, no-wrap msgid "Replace `latest` with `quarterly` as the default package repository location" -msgstr "" -"Замените `latest` на `quarterly` в качестве расположения репозитория пакетов " -"по умолчанию" +msgstr "Замените `latest` на `quarterly` в качестве расположения репозитория пакетов по умолчанию" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:563 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:562 #, no-wrap msgid "[.filename]#release/pkg_repos/release-dvd.conf#" msgstr "[.filename]#release/pkg_repos/release-dvd.conf#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:568 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:567 #, no-wrap msgid "Update `BETA__X__` with `PRERELEASE`" msgstr "Обновите `BETA__X__` на `PRERELEASE`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:573 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:572 msgid "" "Then, {git-admin-email} adds new approvers for the releng branch as did for " "the stable branch." @@ -1566,7 +1543,7 @@ msgstr "" "это было сделано для ветки stable." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:578 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:577 #, no-wrap msgid "" "% git add .\n" @@ -1576,7 +1553,7 @@ msgstr "" "% git commit\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:581 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:580 msgid "" "Now that two new `__FreeBSD_version` values exist, also update [.filename]#~/" "documentation/content/en/books/porters-handbook/versions/chapter.adoc# in " @@ -1587,7 +1564,7 @@ msgstr "" "versions/chapter.adoc# в репозитории проекта документации." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:583 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:582 msgid "" "After the first `RC` build has completed and tested, the {branchStable} " "branch can be \"thawed\" by {git-admin-email}." @@ -1596,7 +1573,7 @@ msgstr "" "можно «разморозить» с помощью {git-admin-email}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:585 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:584 msgid "" "Following the availability of the first `RC`, {teamBugmeister} should be " "emailed to add the new FreeBSD `-RELEASE` to the `versions` available in the " @@ -1607,13 +1584,13 @@ msgstr "" "`versions`, доступный в выпадающем меню трекера ошибок." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:587 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:586 #, no-wrap msgid "Building FreeBSD Installation Media" msgstr "Создание установочных носителей FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:590 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:589 msgid "" "This section describes the general procedures producing FreeBSD development " "snapshots and releases." @@ -1622,24 +1599,26 @@ msgstr "" "FreeBSD." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:592 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:591 #, no-wrap msgid "Release Build Scripts" msgstr "Скрипты сборки релизов" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:595 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:594 msgid "" "Prior to FreeBSD 9.0-RELEASE, [.filename]#src/release/Makefile# was updated " -"to support , and the [.filename]#src/release/generate-release.sh# script was " -"introduced as a wrapper to automate invoking the targets." +"to support man:bsdinstall[8], and the [.filename]#src/release/generate-" +"release.sh# script was introduced as a wrapper to automate invoking the man:" +"release[7] targets." msgstr "" "До выхода FreeBSD 9.0-RELEASE файл [.filename]#src/release/Makefile# был " -"обновлен для поддержки , а скрипт [.filename]#src/release/generate-release." -"sh# был добавлен в качестве обёртки для автоматизации вызова целей." +"обновлен для поддержки man:bsdinstall[8], а скрипт [.filename]#src/release/" +"generate-release.sh# был добавлен в качестве обёртки для автоматизации " +"вызова целей man:release[7]." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:598 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:597 msgid "" "Prior to FreeBSD 9.2-RELEASE, [.filename]#src/release/release.sh# was " "introduced, which heavily based on [.filename]#src/release/generate-release." @@ -1648,42 +1627,43 @@ msgid "" "support for cross building each architecture for a release by specifying a " "separate configuration file for each invocation." msgstr "" -"До выхода FreeBSD 9.2-RELEASE был представлен [.filename]#src/release/release" -".sh#, который, основываясь на [.filename]#src/release/generate-release.sh#, " -"включал поддержку указания конфигурационных файлов для переопределения " -"различных опций и переменных окружения. Поддержка конфигурационных файлов " -"обеспечила возможность кросс-сборки каждого архитектурного варианта для " -"релиза путем указания отдельного конфигурационного файла для каждого вызова." +"До выхода FreeBSD 9.2-RELEASE был представлен [.filename]#src/release/" +"release.sh#, который, основываясь на [.filename]#src/release/generate-" +"release.sh#, включал поддержку указания конфигурационных файлов для " +"переопределения различных опций и переменных окружения. Поддержка " +"конфигурационных файлов обеспечила возможность кросс-сборки каждого " +"архитектурного варианта для релиза путем указания отдельного " +"конфигурационного файла для каждого вызова." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:600 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:599 msgid "" "As a brief example of using [.filename]#src/release/release.sh# to build a " "single release in [.filename]#/scratch#:" msgstr "" -"В качестве краткого примера использования [.filename]#src/release/release.sh#" -" для сборки одного релиза в [.filename]#/scratch#:" +"В качестве краткого примера использования [.filename]#src/release/release." +"sh# для сборки одного релиза в [.filename]#/scratch#:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:604 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:603 #, no-wrap msgid "# /bin/sh /usr/src/release/release.sh\n" msgstr "# /bin/sh /usr/src/release/release.sh\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:607 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:606 msgid "" "As a brief example of using [.filename]#src/release/release.sh# to build a " "single, cross-built release using a different target directory, create a " "custom [.filename]#release.conf# containing:" msgstr "" -"В качестве краткого примера использования [.filename]#src/release/release.sh#" -" для сборки единого кросс-собранного выпуска с использованием другого " +"В качестве краткого примера использования [.filename]#src/release/release." +"sh# для сборки единого кросс-собранного выпуска с использованием другого " "целевого каталога, создайте пользовательский [.filename]#release.conf#, " "содержащий:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:615 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:614 #, no-wrap msgid "" "# release.sh configuration for powerpc/powerpc64\n" @@ -1699,33 +1679,33 @@ msgstr "" "KERNEL=\"GENERIC64\"\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:618 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:617 msgid "Then invoke [.filename]#src/release/release.sh# as:" msgstr "Затем выполните [.filename]#src/release/release.sh# следующим образом:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:622 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:621 #, no-wrap msgid "# /bin/sh /usr/src/release/release.sh -c $HOME/release.conf\n" msgstr "# /bin/sh /usr/src/release/release.sh -c $HOME/release.conf\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:625 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:624 msgid "" -"See and [.filename]#src/release/release.conf.sample# for more details and " -"example usage." +"See man:release[7] and [.filename]#src/release/release.conf.sample# for more " +"details and example usage." msgstr "" -"См. [.filename]#src/release/release.conf.sample# для получения " -"дополнительных сведений и примеров использования." +"См. man:release[7] и [.filename]#src/release/release.conf.sample# для " +"получения дополнительных сведений и примеров использования." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:627 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:626 #, no-wrap msgid "Building FreeBSD Releases" msgstr "Сборка релизов FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:631 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:630 msgid "" "During the release cycle, a copy of [.filename]#CHECKSUM.SHA512# and [." "filename]#CHECKSUM.SHA256# for each architecture are stored in the {teamRe} " @@ -1742,37 +1722,36 @@ msgstr "" "пакет package:misc/freebsd-release-manifests[] в Коллекции портов." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:633 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:632 msgid "In preparation for the release build, several files need to be updated:" msgstr "В подготовке к сборке выпуска необходимо обновить несколько файлов:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:643 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:642 #, no-wrap msgid "Update the `BRANCH` value to `RELEASE`" msgstr "Обновите значение `BRANCH` на `RELEASE`" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:646 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:645 #, no-wrap msgid "Add the anticipated announcement date" msgstr "Добавьте предполагаемую дату объявления" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:647 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:646 #, no-wrap msgid "[.filename]#lib/csu/common/crtbrand.S#" msgstr "[.filename]#lib/csu/common/crtbrand.S#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:648 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:647 #, no-wrap msgid "Replace `__FreeBSD_version` with the value in [.filename]#sys/sys/param.h#" -msgstr "" -"Замените `__FreeBSD_version` на значение из [.filename]#sys/sys/param.h#" +msgstr "Замените `__FreeBSD_version` на значение из [.filename]#sys/sys/param.h#" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:653 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:652 msgid "" "After building the final `RELEASE`, the {branchRelengx} branch is tagged as " "{tagReleasex} using the revision from which the `RELEASE` was built. " @@ -1785,24 +1764,24 @@ msgstr "" "помощью `git tag`. Из корня репозитория:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:657 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:656 msgid "Make sure that you are in the {branchRelengx} branch" msgstr "Убедитесь, что вы находитесь в ветке {branchRelengx}" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:662 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:661 #, no-wrap msgid "% git tag {tagReleasex}\n" msgstr "% git tag {tagReleasex}\n" #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:665 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:664 #, no-wrap msgid "Publishing FreeBSD Installation Media to Project Mirrors" msgstr "Публикация установочных носителей FreeBSD на зеркалах проекта" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:668 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:667 msgid "" "This section describes the procedure to publish FreeBSD development " "snapshots and releases to the Project mirrors." @@ -1811,48 +1790,48 @@ msgstr "" "выпусков на зеркала Проекта." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:670 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:669 #, no-wrap msgid "Staging FreeBSD Installation Media Images" msgstr "Подготовка образов установочных носителей FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:673 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:672 msgid "Staging FreeBSD snapshots and releases is a two part process:" msgstr "" "Этап подготовки (staging) снимков и выпусков FreeBSD — это двухэтапный " "процесс:" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:675 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:674 msgid "Creating the directory structure to match the hierarchy on `ftp-master`" msgstr "Создание структуры каталогов, соответствующей иерархии на `ftp-master`" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:678 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:677 msgid "" "If `EVERYTHINGISFINE` is defined in the build configuration files, [." "filename]#main.conf# in the case of the build scripts referenced above, this " -"happens automatically in the after the build is complete, creating the " -"directory structure in [.filename]#${DESTDIR}/R/ftp-stage# with a path " -"structure matching what is expected on `ftp-master`. This is equivalent to " -"running the following in the directly:" +"happens automatically in the man:chroot[8] after the build is complete, " +"creating the directory structure in [.filename]#${DESTDIR}/R/ftp-stage# with " +"a path structure matching what is expected on `ftp-master`. This is " +"equivalent to running the following in the man:chroot[8] directly:" msgstr "" "Если `EVERYTHINGISFINE` определено в конфигурационных файлах сборки, [." "filename]#main.conf# в случае скриптов сборки, упомянутых выше, это " -"происходит автоматически после завершения сборки, создавая структуру " -"каталогов в [.filename]#${DESTDIR}/R/ftp-stage# с путями, соответствующими " -"ожидаемым на `ftp-master`. Это эквивалентно выполнению следующего в каталоге:" +"происходит автоматически в man:chroot[8] после завершения сборки, создавая " +"структуру каталогов в [.filename]#${DESTDIR}/R/ftp-stage# с путями, " +"соответствующими ожидаемым на `ftp-master`. Это эквивалентно выполнению " +"следующего в man:chroot[8]:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:682 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:681 #, no-wrap msgid "# make -C /usr/src/release -f Makefile.mirrors EVERYTHINGISFINE=1 ftp-stage\n" -msgstr "" -"# make -C /usr/src/release -f Makefile.mirrors EVERYTHINGISFINE=1 ftp-stage\n" +msgstr "# make -C /usr/src/release -f Makefile.mirrors EVERYTHINGISFINE=1 ftp-stage\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:685 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:684 msgid "" "After each architecture is built, [.filename]#thermite.sh# will rsync the [." "filename]#${DESTDIR}/R/ftp-stage# from the build to [.filename]#/snap/ftp/" @@ -1865,7 +1844,7 @@ msgstr "" "сборки, соответственно." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:686 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:685 msgid "" "Copying the files to a staging directory on `ftp-master` before moving the " "files into [.filename]#pub/# to begin propagation to the Project mirrors" @@ -1875,7 +1854,7 @@ msgstr "" "зеркала Проекта" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:688 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:687 msgid "" "Once all builds have finished, [.filename]#/snap/ftp/snapshots#, or [." "filename]#/snap/ftp/releases# for a release, is polled by `ftp-master` using " @@ -1884,11 +1863,11 @@ msgid "" msgstr "" "После завершения всех сборок каталог [.filename]#/snap/ftp/snapshots# (или [." "filename]#/snap/ftp/releases# для релиза) опрашивается `ftp-master`-ом с " -"использованием rsync для передачи в [.filename]#/archive/tmp/snapshots# или [" -".filename]#/archive/tmp/releases#, соответственно." +"использованием rsync для передачи в [.filename]#/archive/tmp/snapshots# или " +"[.filename]#/archive/tmp/releases#, соответственно." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:692 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:691 msgid "" "On `ftp-master` in the FreeBSD Project infrastructure, this step requires " "`root` level access, as this step must be executed as the `archive` user." @@ -1897,26 +1876,27 @@ msgstr "" "уровня `root`, так как он должен выполняться от имени пользователя `archive`." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:695 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:694 #, no-wrap msgid "Publishing FreeBSD Installation Media" msgstr "Публикация установочных носителей FreeBSD" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:699 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:698 msgid "" "Once the images are staged in [.filename]#/archive/tmp/#, they are ready to " "be made public by putting them in [.filename]#/archive/pub/FreeBSD#. To " -"reduce propagation time, is used to create hard links from [.filename]#/" -"archive/tmp# to [.filename]#/archive/pub/FreeBSD#." +"reduce propagation time, man:pax[1] is used to create hard links from [." +"filename]#/archive/tmp# to [.filename]#/archive/pub/FreeBSD#." msgstr "" "Как только образы размещены в [.filename]#/archive/tmp/#, они готовы к " "публикации путем размещения в [.filename]#/archive/pub/FreeBSD#. Для " -"уменьшения времени распространения используются жёсткие ссылки из [." -"filename]#/archive/tmp# в [.filename]#/archive/pub/FreeBSD#." +"уменьшения времени распространения используется man:pax[1] для создания " +"жёстких ссылкок из [.filename]#/archive/tmp# в [.filename]#/archive/pub/" +"FreeBSD#." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:703 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:702 msgid "" "For this to be effective, both [.filename]#/archive/tmp# and [.filename]#/" "archive/pub# must reside on the same logical filesystem." @@ -1925,19 +1905,20 @@ msgstr "" "pub# должны находиться в одной логической файловой системе." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:706 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:705 msgid "" -"There is a caveat, however, where rsync must be used after to correct the " -"symbolic links in [.filename]#pub/FreeBSD/snapshots/ISO-IMAGES# which will " -"replace with a hard link, increasing the propagation time." +"There is a caveat, however, where rsync must be used after man:pax[1] to " +"correct the symbolic links in [.filename]#pub/FreeBSD/snapshots/ISO-IMAGES# " +"which man:pax[1] will replace with a hard link, increasing the propagation " +"time." msgstr "" -"Однако есть оговорка: после этого необходимо использовать rsync для " -"исправления символических ссылок в [.filename]#pub/FreeBSD/snapshots/ISO-" -"IMAGES#, которые будут заменены на жёсткие ссылки, что увеличит время " -"распространения." +"Однако есть оговорка: после этого необходимо использовать rsync после " +"man:pax[1] для исправления символических ссылок в [.filename]#pub/FreeBSD/" +"snapshots/ISO-IMAGES#, которые man:pax[1] заменит на жёсткие ссылки, что " +"увеличит время распространения." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:710 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:709 msgid "" "As with the staging steps, this requires `root` level access, as this step " "must be executed as the `archive` user." @@ -1946,12 +1927,12 @@ msgstr "" "шаг должен быть выполнен от имени пользователя `archive`." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:713 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:712 msgid "As the `archive` user:" msgstr "Как пользователь `archive`:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:719 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:718 #, no-wrap msgid "" "% cd /archive/tmp/snapshots\n" @@ -1960,33 +1941,32 @@ msgid "" msgstr "" "% cd /archive/tmp/snapshots\n" "% pax -r -w -l . /archive/pub/FreeBSD/snapshots\n" -"% /usr/local/bin/rsync -avH /archive/tmp/snapshots/* /archive/pub/FreeBSD/" -"snapshots/\n" +"% /usr/local/bin/rsync -avH /archive/tmp/snapshots/* /archive/pub/FreeBSD/snapshots/\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:722 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:721 msgid "Replace _snapshots_ with _releases_ as appropriate." msgstr "Замените _снимки_ на _релизы_ там, где это уместно." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:724 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:723 #, no-wrap msgid "Wrapping up the Release Cycle" msgstr "Завершение цикла выпуска" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:727 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:726 msgid "This section describes general post-release tasks." msgstr "Этот раздел описывает общие задачи после выпуска." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:729 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:728 #, no-wrap msgid "Post-Release Errata Notices" msgstr "Уведомления об исправлениях после выпуска" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:733 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:732 msgid "" "As the release cycle approaches conclusion, it is common to have several EN " "(Errata Notice) candidates to address issues that were discovered late in " @@ -2002,12 +1982,12 @@ msgstr "" "могут выпустить EN." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:737 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:736 msgid "The actual process of issuing ENs is handled by the {teamSecteam}." msgstr "Фактический процесс выпуска EN обрабатывается командой {teamSecteam}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:740 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:739 msgid "" "To request an Errata Notice after a release cycle has completed, a developer " "should fill out the https://www.freebsd.org/security/errata-template." @@ -2020,7 +2000,7 @@ msgstr "" "проблемы`, `Последствия` и, если применимо, `Обходное решение`." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:742 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:741 msgid "" "The completed Errata Notice template should be emailed together with either " "a patch against the {branchReleng} branch or a list of revisions from the " @@ -2031,7 +2011,7 @@ msgstr "" "{branchStable}." #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:746 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:745 msgid "" "For Errata Notice requests immediately following the release, the request " "should be emailed to both the {teamRe} and the {teamSecteam}. Once the " @@ -2040,20 +2020,20 @@ msgid "" "{teamSecteam}], Errata Notice requests should be sent to the {teamSecteam}." msgstr "" "Для запросов на уведомления об ошибках (Errata Notice), поступающих сразу " -"после выпуска, запрос следует отправлять по электронной почте как в {teamRe}" -", так и в {teamSecteam}. После того как ветка {branchReleng} передана " -"{teamSecteam}, как описано в crossref:freebsd-releng[releng-wrapup-handoff, " -"Передача {teamSecteam}], запросы на уведомления об ошибках следует " +"после выпуска, запрос следует отправлять по электронной почте как в " +"{teamRe}, так и в {teamSecteam}. После того как ветка {branchReleng} " +"передана {teamSecteam}, как описано в crossref:freebsd-releng[releng-wrapup-" +"handoff, Передача {teamSecteam}], запросы на уведомления об ошибках следует " "направлять в {teamSecteam}." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:748 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:747 #, no-wrap msgid "Handoff to the {teamSecteam}" msgstr "Передача в {teamSecteam}" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:751 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:750 msgid "" "Roughly two weeks following the release, the Release Engineer updates the " "Git repository changing the approver from the Release engineering team to " @@ -2064,13 +2044,13 @@ msgstr "" "офицера безопасности для ветки `{branchRelengx}`." #. type: Title == -#: documentation/content/en/articles/freebsd-releng/_index.adoc:753 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:752 #, no-wrap msgid "Release End-of-Life" msgstr "Конец срока поддержки выпуска" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:756 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:755 msgid "" "This section describes the website-related files to update when a release " "reaches EoL (End-of-Life)." @@ -2079,13 +2059,13 @@ msgstr "" "обновить, когда выпуск достигает EoL (End-of-Life)." #. type: Title === -#: documentation/content/en/articles/freebsd-releng/_index.adoc:758 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:757 #, no-wrap msgid "Website Updates for End-of-Life" msgstr "Обновления веб-сайта для прекращения поддержки" #. type: Plain text -#: documentation/content/en/articles/freebsd-releng/_index.adoc:761 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:760 msgid "" "When a release reaches End-of-Life, references to that release should be " "removed and/or updated on the website:" @@ -2094,97 +2074,93 @@ msgstr "" "быть удалены и/или обновлены на веб-сайте:" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:766 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:765 #, no-wrap msgid "File" msgstr "Файл" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:769 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:768 #, no-wrap msgid "[.filename]#~/website/themes/beastie/layouts/index.html#" msgstr "[.filename]#~/website/themes/beastie/layouts/index.html#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:771 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:789 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:770 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:788 #, no-wrap msgid "Remove `u-relXXX-announce` and `u-relXXX-announce` references." msgstr "Удалите ссылки на `u-relXXX-announce` и `u-relXXX-announce`." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:772 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:771 #, no-wrap msgid "[.filename]#~/website/content/en/releases/_index.adoc#" msgstr "[.filename]#~/website/content/en/releases/_index.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:774 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:773 #, no-wrap msgid "Move the `u-relXXX-*` variables from the supported release list to the Legacy Releases list." -msgstr "" -"Переместите переменные `u-relXXX-*` из списка поддерживаемых выпусков в " -"список Устаревших выпусков." +msgstr "Переместите переменные `u-relXXX-*` из списка поддерживаемых выпусков в список Устаревших выпусков." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:775 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:774 #, no-wrap msgid "[.filename]#~/website/content/en/releng/_index.adoc#" msgstr "[.filename]#~/website/content/en/releng/_index.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:777 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:776 #, no-wrap msgid "Update the appropriate releng branch to reflect the branch is no longer supported." -msgstr "" -"Обновите соответствующую ветку releng, чтобы отразить, что ветка больше не " -"поддерживается." +msgstr "Обновите соответствующую ветку releng, чтобы отразить, что ветка больше не поддерживается." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:778 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:777 #, no-wrap msgid "[.filename]#~/website/content/en/security/_index.adoc#" msgstr "[.filename]#~/website/content/en/security/_index.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:780 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:779 #, no-wrap msgid "Remove the branch from the supported branch list." msgstr "Удалить ветку из списка поддерживаемых веток." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:781 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:780 #, no-wrap msgid "[.filename]#~/website/content/en/security/unsupported.adoc#" msgstr "[.filename]#~/website/content/en/security/unsupported.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:783 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:782 #, no-wrap msgid "Add the branch to the unsupported branch list." msgstr "Добавить ветку в список неподдерживаемых веток." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:784 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:783 #, no-wrap msgid "[.filename]#~/website/content/en/where.adoc#" msgstr "[.filename]#~/website/content/en/where.adoc#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:786 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:785 #, no-wrap msgid "Remove the URLs for the release." msgstr "Удалите URL-адреса для выпуска." #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:787 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:786 #, no-wrap msgid "[.filename]#~/website/themes/beastie/layouts/partials/sidenav.html#" msgstr "[.filename]#~/website/themes/beastie/layouts/partials/sidenav.html#" #. type: Table -#: documentation/content/en/articles/freebsd-releng/_index.adoc:792 -#: documentation/content/en/articles/freebsd-releng/_index.adoc:794 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:791 +#: documentation/content/en/articles/freebsd-releng/_index.adoc:793 #, no-wrap msgid "Remove references to the release and releng branch." msgstr "Удалите ссылки на ветку release и releng." diff --git a/documentation/content/ru/articles/freebsd-update-server/_index.adoc b/documentation/content/ru/articles/freebsd-update-server/_index.adoc index 08bdf9a040..b133a55c36 100644 --- a/documentation/content/ru/articles/freebsd-update-server/_index.adoc +++ b/documentation/content/ru/articles/freebsd-update-server/_index.adoc @@ -77,7 +77,7 @@ toc::[] Минимальное требование для обновлений — сборка на версии FreeBSD, которая не меньше целевой версии для распространения. ==== * Пользовательская учётная запись с как минимум 4 ГБ свободного места. Это позволит создавать обновления для версий 7.1 и 7.2, но точные требования к месту могут меняться от версии к версии. -* Учётная запись man:ssh[1] на удалённой машине для загрузки распределенных обновлений. +* Учётная запись man:ssh[1] на удалённой машине для загрузки распределённых обновлений. * Веб-сервер, например extref:{handbook}network-servers[Apache, network-apache], с более чем половиной пространства, необходимого для сборки. Например, тестовые сборки для версий 7.1 и 7.2 занимают в общей сложности 4 ГБ, а пространство веб-сервера, необходимое для распространения этих обновлений, составляет 2.6 ГБ. * Базовые знания написания скриптов для оболочки POSIX(R) shell, man:sh[1]. diff --git a/documentation/content/ru/articles/freebsd-update-server/_index.po b/documentation/content/ru/articles/freebsd-update-server/_index.po index 248de4bbb2..0e8c3ef83a 100644 --- a/documentation/content/ru/articles/freebsd-update-server/_index.po +++ b/documentation/content/ru/articles/freebsd-update-server/_index.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2026-05-09 23:29+0100\n" -"PO-Revision-Date: 2026-05-11 04:45+0000\n" +"POT-Creation-Date: 2026-08-06 22:55+0100\n" +"PO-Revision-Date: 2026-05-18 04:45+0000\n" "Last-Translator: Vladlen Popolitov <vladlenpopolitov@list.ru>\n" "Language-Team: Russian <https://translate-dev.freebsd.org/projects/" "documentation/articlesfreebsd-update-server_index/ru/>\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 4.17\n" #. type: YAML Front Matter: description @@ -32,7 +32,7 @@ msgid "Build Your Own FreeBSD Update Server" msgstr "Создайте свой собственный сервер обновлений FreeBSD" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:51 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:50 msgid "" "The instructions in this article refer to an older version of FreeBSD and " "may not work properly on recent versions of the OS. With the availability of " @@ -47,12 +47,12 @@ msgstr "" "полностью удалена." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:55 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:54 msgid "Abstract" msgstr "Аннотация" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:59 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:58 msgid "" "This article describes building an internal FreeBSD Update Server. The " "https://github.com/freebsd/freebsd-update-build/[freebsd-update-server] is " @@ -73,18 +73,18 @@ msgstr "" "ускорить обновления для множества машин." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:61 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:60 msgid "'''" msgstr "'''" #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:65 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:64 #, no-wrap msgid "Acknowledgments" msgstr "Благодарности" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:68 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:67 msgid "" "This article was subsequently printed at https://people.freebsd.org/~jgh/" "files/fus/BSD_03_2010_EN.pdf[BSD Magazine]." @@ -93,13 +93,13 @@ msgstr "" "freebsd.org/~jgh/files/fus/BSD_03_2010_EN.pdf[BSD Magazine]." #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:70 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:69 #, no-wrap msgid "Introduction" msgstr "Введение" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:77 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:76 msgid "" "Experienced users or administrators are often responsible for several " "machines or environments. They understand the difficult demands and " @@ -120,13 +120,13 @@ msgstr "" "шаги, необходимые для создания внутреннего сервера обновлений FreeBSD." #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:79 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:78 #, no-wrap msgid "Prerequisites" msgstr "Предварительные требования" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:82 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:81 msgid "" "To build an internal FreeBSD Update Server some requirements should be met." msgstr "" @@ -134,12 +134,12 @@ msgstr "" "некоторые требования." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:84 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:83 msgid "A running FreeBSD system." msgstr "Работающая система FreeBSD." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:88 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:87 msgid "" "At a minimum, updates require building on a FreeBSD release greater than or " "equal to the target release version for distribution." @@ -148,7 +148,7 @@ msgstr "" "меньше целевой версии для распространения." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:90 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:89 msgid "" "A user account with at least 4 GB of available space. This will allow the " "creation of updates for 7.1 and 7.2, but the exact space requirements may " @@ -159,15 +159,15 @@ msgstr "" "месту могут меняться от версии к версии." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:91 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:90 msgid "" "An man:ssh[1] account on a remote machine to upload distributed updates." msgstr "" -"Учётная запись man:ssh[1] на удалённой машине для загрузки распределенных " +"Учётная запись man:ssh[1] на удалённой машине для загрузки распределённых " "обновлений." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:92 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:91 msgid "" "A web server, like extref:{handbook}network-servers[Apache, network-apache], " "with over half of the space required for the build. For instance, test " @@ -181,19 +181,19 @@ msgstr "" "обновлений, составляет 2.6 ГБ." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:93 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:92 msgid "Basic knowledge of shell scripting with POSIX(R) shell, man:sh[1]." msgstr "" "Базовые знания написания скриптов для оболочки POSIX(R) shell, man:sh[1]." #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:95 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:94 #, no-wrap msgid "Configuration: Installation & Setup" msgstr "Конфигурация: установка и настройка" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:98 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:97 msgid "" "Download the https://github.com/freebsd/freebsd-update-build/[freebsd-update-" "server] software by installing package:devel/git[] and package:security/" @@ -204,13 +204,13 @@ msgstr "" "package:security/ca_root_nss[], и выполните:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:102 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:101 #, no-wrap msgid "% git clone https://github.com/freebsd/freebsd-update-build.git freebsd-update-server\n" msgstr "% git clone https://github.com/freebsd/freebsd-update-build.git freebsd-update-server\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:106 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:105 msgid "" "Update [.filename]#scripts/build.conf# appropriately. It is sourced during " "all build operations." @@ -219,7 +219,7 @@ msgstr "" "используется во всех операциях сборки." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:108 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:107 msgid "" "Here is the default [.filename]#build.conf#, which should be modified to " "suit your environment." @@ -228,7 +228,7 @@ msgstr "" "соответствии с вашим окружением." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:114 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:113 #, no-wrap msgid "" "# Main configuration file for FreeBSD Update builds. The\n" @@ -240,7 +240,7 @@ msgstr "" "# the scripts tree.\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:117 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:116 #, no-wrap msgid "" "# Location from which to fetch releases\n" @@ -250,7 +250,7 @@ msgstr "" "export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases <.>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:120 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:119 #, no-wrap msgid "" "# Host platform\n" @@ -260,7 +260,7 @@ msgstr "" "export HOSTPLATFORM=`uname -m`\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:123 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:122 #, no-wrap msgid "" "# Host name to use inside jails\n" @@ -270,7 +270,7 @@ msgstr "" "export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net <.>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:126 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:125 #, no-wrap msgid "" "# Location of SSH key\n" @@ -280,7 +280,7 @@ msgstr "" "export SSHKEY=/root/.ssh/id_dsa <.>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:129 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:128 #, no-wrap msgid "" "# SSH account into which files are uploaded\n" @@ -290,7 +290,7 @@ msgstr "" "MASTERACCT=builder@wadham.daemonology.net <.>\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:132 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:131 #, no-wrap msgid "" "# Directory into which files are uploaded\n" @@ -300,12 +300,12 @@ msgstr "" "MASTERDIR=update-master.freebsd.org <.>\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:135 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:134 msgid "Parameters for consideration would be:" msgstr "Учтите возможные варианты следующих настроек:" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:138 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:137 msgid "" "This is the location where ISO images are downloaded from (by the " "`fetchiso()` subroutine of [.filename]#scripts/build.subr#). The location " @@ -325,7 +325,7 @@ msgstr "" "применив локальные изменения." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:140 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:139 msgid "" "The name of the build host. This information will be displayed on updated " "systems when issuing:" @@ -334,13 +334,13 @@ msgstr "" "системах при выполнении команды:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:144 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:143 #, no-wrap msgid "% uname -v\n" msgstr "% uname -v\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:148 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:147 msgid "" "The SSH key for uploading files to the update server. A key pair can be " "created by typing `ssh-keygen -t dsa`. This parameter is optional; standard " @@ -357,17 +357,17 @@ msgstr "" "на man:ssh-keygen[1]." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:150 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:149 msgid "Account for uploading files to the update server." msgstr "Учётная запись для загрузки файлов на сервер обновлений." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:152 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:151 msgid "Directory on the update server where files are uploaded to." msgstr "Каталог на сервере обновлений, в который загружаются файлы." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:154 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:153 msgid "" "The default [.filename]#build.conf# shipped with the freebsd-update-server " "sources is suitable for building i386 releases of FreeBSD. As an example of " @@ -380,18 +380,18 @@ msgstr "" "приведены шаги с необходимыми изменениями конфигурации для amd64:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:158 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:157 msgid "Create a build environment for amd64:" msgstr "Создайте среду сборки для amd64:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:162 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:161 #, no-wrap msgid "% mkdir -p /usr/local/freebsd-update-server/scripts/7.2-RELEASE/amd64\n" msgstr "% mkdir -p /usr/local/freebsd-update-server/scripts/7.2-RELEASE/amd64\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:165 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:164 msgid "" "Install a [.filename]#build.conf# in the newly created build directory. The " "build configuration options for FreeBSD 7.2-RELEASE on amd64 should be " @@ -402,7 +402,7 @@ msgstr "" "должны быть примерно такими:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:176 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:175 #, no-wrap msgid "" "# SHA256 hash of RELEASE disc1.iso image.\n" @@ -424,7 +424,7 @@ msgstr "" "export KERNELPARTS=\"generic\"\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:179 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:178 #, no-wrap msgid "" "# EOL date\n" @@ -434,7 +434,7 @@ msgstr "" "export EOL=1275289200 <.>\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:182 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:181 msgid "" "The man:sha256[1] hash key for the desired release, is published within the " "respective link:https://www.FreeBSD.org/releases/[release announcement]." @@ -443,7 +443,7 @@ msgstr "" "link:https://www.FreeBSD.org/releases/[анонсе выпуска]." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:183 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:182 msgid "" "To generate the \"End of Life\" number for [.filename]#build.conf#, refer to " "the \"Estimated EOL\" posted on the link:https://www.FreeBSD.org/security/" @@ -456,19 +456,19 @@ msgstr "" "из даты, указанной на веб-сайте, используя утилиту man:date[1], например:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:187 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:186 #, no-wrap msgid "% date -j -f '%Y%m%d-%H%M%S' '20090401-000000' '+%s'\n" msgstr "% date -j -f '%Y%m%d-%H%M%S' '20090401-000000' '+%s'\n" #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:191 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:190 #, no-wrap msgid "Building Update Code" msgstr "Сборка кода обновления" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:196 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:195 msgid "" "The first step is to run [.filename]#scripts/make.sh#. This will build some " "binaries, create directories, and generate an RSA signing key used for " @@ -481,7 +481,7 @@ msgstr "" "ввести парольную фразу для окончательного создания ключа подписи." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:211 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:210 #, no-wrap msgid "" "# sh scripts/make.sh\n" @@ -511,7 +511,7 @@ msgstr "" "e is 65537 (0x10001)\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:214 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:213 #, no-wrap msgid "" "Public key fingerprint:\n" @@ -521,7 +521,7 @@ msgstr "" "27ef53e48dc869eea6c3136091cc6ab8589f967559824779e855d58a2294de9e\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:218 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:217 #, no-wrap msgid "" "Encrypting signing key for root\n" @@ -533,7 +533,7 @@ msgstr "" "Verifying - enter aes-256-cbc encryption password:\n" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:224 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:223 msgid "" "Keep a note of the generated key fingerprint. This value is required in [." "filename]#/etc/freebsd-update.conf# for binary updates." @@ -542,12 +542,12 @@ msgstr "" "filename]#/etc/freebsd-update.conf# для бинарных обновлений." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:227 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:226 msgid "At this point, we are ready to stage a build." msgstr "На этом этапе мы готовы к подготовке сборки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:232 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:231 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server\n" @@ -557,12 +557,12 @@ msgstr "" "# sh scripts/init.sh amd64 7.2-RELEASE\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:235 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:234 msgid "What follows is a sample of an _initial_ build run." msgstr "Ниже приведён пример _первоначальной_ сборки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:255 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:254 #, no-wrap msgid "" "# sh scripts/init.sh amd64 7.2-RELEASE\n" @@ -602,7 +602,7 @@ msgstr "" "Mon Aug 24 17:50:44 PDT 2009 Indexing world0 for FreeBSD/amd64 7.2-RELEASE\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:276 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:275 #, no-wrap msgid "" "Files built but not released:\n" @@ -648,7 +648,7 @@ msgstr "" "...\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:280 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:279 msgid "" "Then the build of the world is performed again, with world patches. A more " "detailed explanation may be found in [.filename]#scripts/build.subr#." @@ -657,7 +657,7 @@ msgstr "" "объяснение можно найти в [.filename]#scripts/build.subr#." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:286 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:285 msgid "" "During this second build cycle, the network time protocol daemon, man:" "ntpd[8], is turned off. Per `{cperciva}`, Security Officer Emeritus of " @@ -677,7 +677,7 @@ msgstr "" "сравнения результатов.\"" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:305 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:304 #, no-wrap msgid "" "Mon Aug 24 17:54:07 PDT 2009 Extracting world+src for FreeBSD/amd64 7.2-RELEASE\n" @@ -713,7 +713,7 @@ msgstr "" "Mon Aug 24 12:16:59 PDT 2009 Constructing metadata index and tag for FreeBSD/amd64 7.2-RELEASE\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:323 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:322 #, no-wrap msgid "" "Files found which include build stamps:\n" @@ -753,12 +753,12 @@ msgstr "" "...\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:326 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:325 msgid "Finally, the build completes." msgstr "Наконец, сборка завершена." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:355 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:354 #, no-wrap msgid "" "Values of build stamps, excluding library archive headers:\n" @@ -816,7 +816,7 @@ msgstr "" "Mon Aug 24 23:46:47 UTC 2009\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:361 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:360 #, no-wrap msgid "" "FreeBSD/amd64 7.2-RELEASE initialization build complete. Please\n" @@ -832,7 +832,7 @@ msgstr "" "to sign the release.\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:366 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:365 msgid "" "Approve the build if everything is correct. More information on determining " "this can be found in the distributed source file named [.filename]#USAGE#. " @@ -846,7 +846,7 @@ msgstr "" "подходящую для загрузки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:371 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:370 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server\n" @@ -856,7 +856,7 @@ msgstr "" "# sh scripts/mountkey.sh\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:381 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:380 #, no-wrap msgid "" "# sh -e scripts/approve.sh amd64 7.2-RELEASE\n" @@ -874,13 +874,13 @@ msgstr "" "Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:384 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:383 msgid "" "After the approval process is complete, the upload procedure may be started." msgstr "После завершения процесса утверждения можно начать процедуру загрузки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:389 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:388 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server\n" @@ -890,7 +890,7 @@ msgstr "" "# sh scripts/upload.sh amd64 7.2-RELEASE\n" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:394 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:393 msgid "" "In the event update code needs to be re-uploaded, this may be done by " "changing to the public distributions directory for the target release and " @@ -901,7 +901,7 @@ msgstr "" "обновив атрибуты файла _uploaded_." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:399 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:398 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server/pub/7.2-RELEASE/amd64\n" @@ -911,7 +911,7 @@ msgstr "" "# touch -t 200801010101.01 uploaded\n" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:406 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:405 msgid "" "The uploaded files will need to be in the document root of the webserver in " "order for updates to be distributed. The exact configuration will vary " @@ -926,7 +926,7 @@ msgstr "" "в Руководстве." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:408 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:407 msgid "" "Update client's `KeyPrint` and `ServerName` in [.filename]#/etc/freebsd-" "update.conf#, and perform updates as instructed in the extref:{handbook}" @@ -938,7 +938,7 @@ msgstr "" "edge[Обновление FreeBSD, updating-upgrading-freebsdupdate] Руководства." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:414 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:413 msgid "" "In order for FreeBSD Update Server to work properly, updates for both the " "_current_ release and the release _one wants to upgrade to_ need to be " @@ -955,7 +955,7 @@ msgstr "" "обновления для обеих версий." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:417 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:416 msgid "" "For reference, the entire run of link:../../source/articles/freebsd-update-" "server/init.txt[init.sh] is attached." @@ -964,13 +964,13 @@ msgstr "" "update-server/init.txt[init.sh] прилагается." #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:419 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:418 #, no-wrap msgid "Building a Patch" msgstr "Построение патча" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:422 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:421 msgid "" "Every time a link:https://www.FreeBSD.org/security/advisories/[security " "advisory] or link:https://www.FreeBSD.org/security/notices/[security notice] " @@ -982,27 +982,27 @@ msgstr "" "обновление с исправлением." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:424 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:423 msgid "For this example, 7.1-RELEASE will be used." msgstr "Для этого примера будет использоваться версия 7.1-RELEASE." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:426 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:425 msgid "A couple of assumptions are made for a different release build:" msgstr "Несколько предположений сделано для другой сборки выпуска:" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:428 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:427 msgid "Setup the correct directory structure for the initial build." msgstr "Настройка правильной структуры каталогов для первоначальной сборки." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:429 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:428 msgid "Perform an initial build for 7.1-RELEASE." msgstr "Выполните первоначальную сборку для 7.1-RELEASE." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:431 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:430 msgid "" "Create the patch directory of the respective release under [.filename]#/usr/" "local/freebsd-update-server/patches/#." @@ -1011,7 +1011,7 @@ msgstr "" "freebsd-update-server/patches/#." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:436 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:435 #, no-wrap msgid "" "% mkdir -p /usr/local/freebsd-update-server/patches/7.1-RELEASE/\n" @@ -1021,7 +1021,7 @@ msgstr "" "% cd /usr/local/freebsd-update-server/patches/7.1-RELEASE\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:441 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:440 msgid "" "As an example, take the patch for man:named[8]. Read the advisory, and grab " "the necessary file from link:https://www.FreeBSD.org/security/advisories/" @@ -1036,7 +1036,7 @@ msgstr "" "security[Руководства FreeBSD, security-advisories]." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:446 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:445 msgid "" "In the https://security.freebsd.org/advisories/FreeBSD-SA-09:12.bind." "asc[security brief], this advisory is called `SA-09:12.bind`. After " @@ -1055,13 +1055,13 @@ msgstr "" "Переименуйте файл:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:450 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:449 #, no-wrap msgid "% cd /usr/local/freebsd-update-server/patches/7.1-RELEASE/; mv bind.patch 7-SA-09:12.bind\n" msgstr "% cd /usr/local/freebsd-update-server/patches/7.1-RELEASE/; mv bind.patch 7-SA-09:12.bind\n" #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:456 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:455 msgid "" "When running a patch level build, it is assumed that previous patches are in " "place. When a patch build is run, it will run all patches contained in the " @@ -1072,7 +1072,7 @@ msgstr "" "содержащиеся в каталоге патчей." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:458 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:457 msgid "" "There can be custom patches added to any build. Use the number zero, or any " "other number." @@ -1081,7 +1081,7 @@ msgstr "" "любое другое число." #. type: delimited block = 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:464 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:463 msgid "" "It is up to the administrator of the FreeBSD Update Server to take " "appropriate measures to verify the authenticity of every patch." @@ -1090,7 +1090,7 @@ msgstr "" "меры для проверки подлинности каждого патча." #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:468 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:467 msgid "" "At this point, a _diff_ is ready to be built. The software checks first to " "see if a [.filename]#scripts/init.sh# has been run on the respective release " @@ -1101,7 +1101,7 @@ msgstr "" "выпуска перед выполнением сборки diff." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:473 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:472 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server\n" @@ -1111,12 +1111,12 @@ msgstr "" "# sh scripts/diff.sh amd64 7.1-RELEASE 7\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:476 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:475 msgid "What follows is a sample of a _differential_ build run." msgstr "Вот пример выполнения _дифференциальной_ сборки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:550 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:549 #, no-wrap msgid "" "# sh -e scripts/diff.sh amd64 7.1-RELEASE 7\n" @@ -1264,12 +1264,12 @@ msgstr "" "...\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:553 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:552 msgid "Updates are printed, and approval is requested." msgstr "Обновления выводятся на экран, и запрашивается подтверждение." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:572 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:571 #, no-wrap msgid "" "New updates:\n" @@ -1307,12 +1307,12 @@ msgstr "" "to sign the build.\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:575 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:574 msgid "Follow the same process as noted before for approving a build:" msgstr "Следуйте той же процедуре, что и ранее, для подтверждения сборки:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:584 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:583 #, no-wrap msgid "" "# sh -e scripts/approve.sh amd64 7.1-RELEASE\n" @@ -1330,7 +1330,7 @@ msgstr "" "Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.1-RELEASE\n" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:590 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:589 #, no-wrap msgid "" "The FreeBSD/amd64 7.1-RELEASE update build has been signed and is\n" @@ -1346,12 +1346,12 @@ msgstr "" "the new builds.\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:593 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:592 msgid "After approving the build, upload the software:" msgstr "После утверждения сборки загрузите программное обеспечение:" #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:598 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:597 #, no-wrap msgid "" "# cd /usr/local/freebsd-update-server\n" @@ -1361,7 +1361,7 @@ msgstr "" "# sh scripts/upload.sh amd64 7.1-RELEASE\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:601 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:600 msgid "" "For reference, the entire run of link:../../source/articles/freebsd-update-" "server/diff.txt[diff.sh] is attached." @@ -1370,13 +1370,13 @@ msgstr "" "server/diff.txt[diff.sh] прилагается." #. type: Title == -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:603 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:602 #, no-wrap msgid "Tips" msgstr "Советы" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:606 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:605 msgid "" "If a custom release is built using the native `make release` extref:{releng}" "[procedure, release-build], freebsd-update-server code will work from your " @@ -1399,7 +1399,7 @@ msgstr "" "после чего можно приступать к сборке вашей пользовательской версии." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:617 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:616 #, no-wrap msgid "" "# Compare ${WORKDIR}/release and ${WORKDIR}/$1, identify which parts\n" @@ -1421,7 +1421,7 @@ msgstr "" "}\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:620 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:619 msgid "" "Adding `-j _NUMBER_` flags to `buildworld` and `obj` targets in the [." "filename]#scripts/build.subr# script may speed up processing depending on " @@ -1435,7 +1435,7 @@ msgstr "" "ненадёжности сборки." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:632 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:631 #, no-wrap msgid "" " # Build the world\n" @@ -1459,7 +1459,7 @@ msgstr "" "\t\t make ${COMPATFLAGS} release.1 release.2 2>&1\n" #. type: Plain text -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:635 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:634 msgid "" "Create an appropriate extref:{handbook}network-servers[DNS, network-dns] SRV " "record for the update server, and put others behind it with variable " @@ -1473,7 +1473,7 @@ msgstr "" "предоставлять избыточный сервис." #. type: delimited block . 4 -#: documentation/content/en/articles/freebsd-update-server/_index.adoc:641 +#: documentation/content/en/articles/freebsd-update-server/_index.adoc:640 #, no-wrap msgid "" "_http._tcp.update.myserver.com.\t\tIN SRV 0 2 80 host1.myserver.com.\n" |