git: fa6e3fed47 - main - doc: Update source files (en .po), for translations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Apr 2023 23:59:10 UTC
The branch main has been updated by dbaio:
URL: https://cgit.FreeBSD.org/doc/commit/?id=fa6e3fed4716fa93292ea84f4151c9d550ca191a
commit fa6e3fed4716fa93292ea84f4151c9d550ca191a
Author: Danilo G. Baio <dbaio@FreeBSD.org>
AuthorDate: 2023-04-20 23:58:36 +0000
Commit: Danilo G. Baio <dbaio@FreeBSD.org>
CommitDate: 2023-04-20 23:58:36 +0000
doc: Update source files (en .po), for translations
---
.../content/en/articles/committers-guide/_index.po | 5846 +++++-----
.../content/en/articles/contributing/_index.po | 413 +-
.../content/en/articles/contributors/_index.po | 453 +-
.../content/en/articles/freebsd-src-lsp/_index.po | 186 +-
.../content/en/articles/linux-users/_index.po | 223 +-
.../content/en/articles/pgpkeys/_index.po | 814 +-
.../content/en/books/design-44bsd/_index.po | 596 +-
documentation/content/en/books/dev-model/_index.po | 818 +-
.../en/books/developers-handbook/ipv6/_index.po | 14 +-
.../en/books/developers-handbook/sockets/_index.po | 275 +-
.../en/books/developers-handbook/tools/_index.po | 4 +-
documentation/content/en/books/faq/_index.po | 1980 ++--
.../en/books/fdp-primer/editor-config/_index.po | 4 +-
.../content/en/books/fdp-primer/examples/_index.po | 4 +-
.../content/en/books/fdp-primer/overview/_index.po | 151 +-
.../en/books/fdp-primer/writing-style/_index.po | 10 +-
.../books/handbook/advanced-networking/_index.po | 295 +-
.../content/en/books/handbook/audit/_index.po | 336 +-
.../content/en/books/handbook/basics/_index.po | 1263 +--
.../en/books/handbook/bibliography/_index.po | 64 +-
.../content/en/books/handbook/boot/_index.po | 272 +-
.../content/en/books/handbook/bsdinstall/_index.po | 1081 +-
.../content/en/books/handbook/config/_index.po | 960 +-
.../en/books/handbook/cutting-edge/_index.po | 667 +-
.../content/en/books/handbook/desktop/_index.po | 2192 ++--
.../content/en/books/handbook/disks/_index.po | 1338 +--
.../content/en/books/handbook/dtrace/_index.po | 98 +-
.../content/en/books/handbook/eresources/_index.po | 3316 +-----
.../en/books/handbook/filesystems/_index.po | 44 +-
.../content/en/books/handbook/firewalls/_index.po | 1432 +--
.../content/en/books/handbook/geom/_index.po | 598 +-
.../content/en/books/handbook/introduction.po | 4 +-
.../en/books/handbook/introduction/_index.po | 176 +-
.../content/en/books/handbook/jails/_index.po | 664 +-
.../en/books/handbook/kernelconfig/_index.po | 176 +-
.../content/en/books/handbook/l10n/_index.po | 464 +-
.../content/en/books/handbook/linuxemu/_index.po | 172 +-
.../content/en/books/handbook/mac/_index.po | 600 +-
.../content/en/books/handbook/mail/_index.po | 632 +-
.../content/en/books/handbook/mirrors/_index.po | 522 +-
.../content/en/books/handbook/multimedia/_index.po | 2451 ++--
.../en/books/handbook/network-servers/_index.po | 1644 +--
.../content/en/books/handbook/ports/_index.po | 725 +-
.../en/books/handbook/ppp-and-slip/_index.po | 526 +-
.../content/en/books/handbook/printing/_index.po | 454 +-
.../content/en/books/handbook/security/_index.po | 1309 ++-
.../en/books/handbook/serialcomms/_index.po | 876 +-
.../en/books/handbook/usb-device-mode/_index.po | 146 +-
.../en/books/handbook/virtualization/_index.po | 735 +-
.../content/en/books/handbook/wine/_index.po | 30 +-
.../content/en/books/handbook/x11/_index.po | 2989 ++---
.../content/en/books/handbook/zfs/_index.po | 1176 +-
.../en/books/porters-handbook/flavors/_index.po | 132 +-
.../books/porters-handbook/porting-dads/_index.po | 102 +-
.../books/porters-handbook/quick-porting/_index.po | 47 +-
.../en/books/porters-handbook/security/_index.po | 46 +-
.../en/books/porters-handbook/special/_index.po | 4003 ++++---
.../en/books/porters-handbook/uses/_index.po | 2478 +++--
.../en/books/porters-handbook/versions/_index.po | 11079 ++++++++++---------
59 files changed, 27777 insertions(+), 32328 deletions(-)
diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po
index da585d7800..b0c44503ce 100644
--- a/documentation/content/en/articles/committers-guide/_index.po
+++ b/documentation/content/en/articles/committers-guide/_index.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: FreeBSD Documentation VERSION\n"
-"POT-Creation-Date: 2023-01-21 20:00-0300\n"
+"POT-Creation-Date: 2023-04-20 20:56-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -810,29 +810,29 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:341
+#: documentation/content/en/articles/committers-guide/_index.adoc:342
#, no-wrap
msgid "Daily use"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:344
+#: documentation/content/en/articles/committers-guide/_index.adoc:345
msgid "Clone the repository:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:348
+#: documentation/content/en/articles/committers-guide/_index.adoc:349
#, no-wrap
msgid "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/${repo}.git\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:351
+#: documentation/content/en/articles/committers-guide/_index.adoc:352
msgid "Then you should have the official mirrors as your remote:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:357
+#: documentation/content/en/articles/committers-guide/_index.adoc:358
#, no-wrap
msgid ""
"% git remote -v\n"
@@ -841,12 +841,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:360
+#: documentation/content/en/articles/committers-guide/_index.adoc:361
msgid "Configure the FreeBSD committer data:"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:363
+#: documentation/content/en/articles/committers-guide/_index.adoc:364
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 "
@@ -855,7 +855,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:370
+#: documentation/content/en/articles/committers-guide/_index.adoc:371
#, no-wrap
msgid ""
"% gen-gitconfig.sh\n"
@@ -865,25 +865,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:373
+#: documentation/content/en/articles/committers-guide/_index.adoc:374
msgid "Set the push URL:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:377
+#: documentation/content/en/articles/committers-guide/_index.adoc:378
#, no-wrap
msgid "% git remote set-url --push freebsd git@gitrepo.freebsd.org:${repo}.git\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:380
+#: documentation/content/en/articles/committers-guide/_index.adoc:381
msgid ""
"Then you should have separated fetch and push URLs as the most efficient "
"setup:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:386
+#: documentation/content/en/articles/committers-guide/_index.adoc:387
#, no-wrap
msgid ""
"% git remote -v\n"
@@ -892,19 +892,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:389
+#: documentation/content/en/articles/committers-guide/_index.adoc:390
msgid ""
"Again, note that `gitrepo.freebsd.org` has been canonicalized to `repo."
"freebsd.org`."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:391
+#: documentation/content/en/articles/committers-guide/_index.adoc:392
msgid "Install commit message template hook:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:396
+#: documentation/content/en/articles/committers-guide/_index.adoc:397
#, no-wrap
msgid ""
"% fetch https://cgit.freebsd.org/src/plain/tools/tools/git/hooks/prepare-commit-msg -o .git/hooks\n"
@@ -912,27 +912,27 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:399
+#: documentation/content/en/articles/committers-guide/_index.adoc:400
#, no-wrap
msgid "\"admin\" branch"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:402
+#: documentation/content/en/articles/committers-guide/_index.adoc:403
msgid ""
"The `access` and `mentors` files are stored in an orphan branch, `internal/"
"admin`, in each repository."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:404
+#: documentation/content/en/articles/committers-guide/_index.adoc:405
msgid ""
"Following example is how to check out the `internal/admin` branch to a local "
"branch named `admin`:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:410
+#: documentation/content/en/articles/committers-guide/_index.adoc:411
#, no-wrap
msgid ""
"% git config --add remote.freebsd.fetch '+refs/internal/*:refs/internal/*'\n"
@@ -941,56 +941,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:412
+#: documentation/content/en/articles/committers-guide/_index.adoc:413
msgid "Alternatively, you can add a worktree for the `admin` branch:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:416
+#: documentation/content/en/articles/committers-guide/_index.adoc:417
#, no-wrap
msgid "git worktree add -b admin ../${repo}-admin internal/admin\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:420
+#: documentation/content/en/articles/committers-guide/_index.adoc:421
msgid ""
"For browsing `internal/admin` branch on web: `https://cgit.freebsd.org/"
"${repo}/log/?h=internal/admin`"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:422
+#: documentation/content/en/articles/committers-guide/_index.adoc:423
msgid "For pushing, either specify the full refspec:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:426
+#: documentation/content/en/articles/committers-guide/_index.adoc:427
#, no-wrap
msgid "git push freebsd HEAD:refs/internal/admin\n"
msgstr ""
-#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:429
-msgid ""
-"Or set `push.default` to `freebsd` which will make `git push` to push the "
-"current branch back to its upstream by default, which is more suitable for "
-"our workflow:"
-msgstr ""
-
-#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:433
-#, no-wrap
-msgid "git config push.default freebsd\n"
-msgstr ""
-
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:435
+#: documentation/content/en/articles/committers-guide/_index.adoc:429
#, no-wrap
msgid "Keeping Current With The FreeBSD src Tree"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:442
+#: documentation/content/en/articles/committers-guide/_index.adoc:436
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 "
@@ -999,13 +985,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:443
+#: documentation/content/en/articles/committers-guide/_index.adoc:437
#, no-wrap
msgid "Branch names"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:450
+#: documentation/content/en/articles/committers-guide/_index.adoc:444
msgid ""
"The branch names in the new Git repository are similar to the old names. "
"For the stable branches, they are stable/X where X is the major release "
@@ -1017,20 +1003,20 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:451
+#: documentation/content/en/articles/committers-guide/_index.adoc:445
#, no-wrap
msgid "Repositories"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:454
+#: documentation/content/en/articles/committers-guide/_index.adoc:448
msgid ""
"Please see the <<admin,Administrative Details>> for the latest information "
"on where to get FreeBSD sources. $URL below can be obtained from that page."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:457
+#: documentation/content/en/articles/committers-guide/_index.adoc:451
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 "
@@ -1039,13 +1025,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:458
+#: documentation/content/en/articles/committers-guide/_index.adoc:452
#, no-wrap
msgid "Deep Clone"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:462
+#: documentation/content/en/articles/committers-guide/_index.adoc:456
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 "
@@ -1054,13 +1040,13 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:465
+#: documentation/content/en/articles/committers-guide/_index.adoc:459
#, no-wrap
msgid "% git clone -o freebsd $URL -b branch [dir]\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:470
+#: documentation/content/en/articles/committers-guide/_index.adoc:464
msgid ""
"is how you make a deep clone. 'branch' should be one of the branches listed "
"in the previous section. It is optional if it is the main branch. 'dir' is "
@@ -1069,7 +1055,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:475
+#: documentation/content/en/articles/committers-guide/_index.adoc:469
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 "
@@ -1081,13 +1067,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:476
+#: documentation/content/en/articles/committers-guide/_index.adoc:470
#, no-wrap
msgid "Shallow Clone"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:482
+#: documentation/content/en/articles/committers-guide/_index.adoc:476
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 "
@@ -1097,13 +1083,13 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:486
+#: documentation/content/en/articles/committers-guide/_index.adoc:480
#, no-wrap
msgid "% git clone -o freebsd -b branch --depth 1 $URL [dir]\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:491
+#: documentation/content/en/articles/committers-guide/_index.adoc:485
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 "
@@ -1111,7 +1097,7 @@ msgid ""
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:496
+#: documentation/content/en/articles/committers-guide/_index.adoc:490
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 "
@@ -1119,19 +1105,19 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:498
+#: documentation/content/en/articles/committers-guide/_index.adoc:492
#, no-wrap
msgid "Building"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:502
+#: documentation/content/en/articles/committers-guide/_index.adoc:496
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:509
+#: documentation/content/en/articles/committers-guide/_index.adoc:503
#, no-wrap
msgid ""
"% cd src\n"
@@ -1142,12 +1128,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:511
+#: documentation/content/en/articles/committers-guide/_index.adoc:505
msgid "so that won't be covered in depth here."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:514
+#: documentation/content/en/articles/committers-guide/_index.adoc:508
msgid ""
"If you want to build a custom kernel, extref:{handbook}[the kernel config "
"section, kernelconfig] of the FreeBSD Handbook recommends creating a file "
@@ -1156,26 +1142,26 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:515
+#: documentation/content/en/articles/committers-guide/_index.adoc:509
#, no-wrap
msgid "Updating"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:519
+#: documentation/content/en/articles/committers-guide/_index.adoc:513
msgid ""
"To update both types of trees uses the same commands. This pulls in all the "
"revisions since your last update."
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:522
+#: documentation/content/en/articles/committers-guide/_index.adoc:516
#, no-wrap
msgid "% git pull --ff-only\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:527
+#: documentation/content/en/articles/committers-guide/_index.adoc:521
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 "
@@ -1185,7 +1171,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:530
+#: documentation/content/en/articles/committers-guide/_index.adoc:524
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 "
@@ -1193,20 +1179,20 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:531
+#: documentation/content/en/articles/committers-guide/_index.adoc:525
#, no-wrap
msgid "Selecting a Specific Version"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:535
+#: documentation/content/en/articles/committers-guide/_index.adoc:529
msgid ""
"In Git, the 'git checkout' checks out both branches and specific versions. "
"Git's versions are the long hashes rather than a sequential number."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:537
+#: documentation/content/en/articles/committers-guide/_index.adoc:531
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 "
@@ -1214,26 +1200,26 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:540
+#: documentation/content/en/articles/committers-guide/_index.adoc:534
#, no-wrap
msgid "% git checkout 08b8197a74\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:543
+#: documentation/content/en/articles/committers-guide/_index.adoc:537
msgid ""
"and you have that checked out. You will be greeted with a message similar "
"to the following:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:546
+#: documentation/content/en/articles/committers-guide/_index.adoc:540
#, no-wrap
msgid "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:550
+#: documentation/content/en/articles/committers-guide/_index.adoc:544
#, no-wrap
msgid ""
"You are in a 'detached HEAD' state. You can look around, make experimental\n"
@@ -1242,29 +1228,28 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:553
-#: documentation/content/en/articles/committers-guide/_index.adoc:2067
+#: documentation/content/en/articles/committers-guide/_index.adoc:547
#, no-wrap
msgid ""
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -b with the checkout command again. Example:\n"
msgstr ""
-#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:555
-#: documentation/content/en/articles/committers-guide/_index.adoc:2069
+#. type: Plain text
+#: documentation/content/en/articles/committers-guide/_index.adoc:549
+#: documentation/content/en/articles/committers-guide/_index.adoc:1697
#, no-wrap
msgid " git checkout -b <new-branch-name>\n"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:557
+#: documentation/content/en/articles/committers-guide/_index.adoc:551
#, no-wrap
msgid "HEAD is now at 08b8197a742a hook gpiokeys.4 to the build\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:561
+#: documentation/content/en/articles/committers-guide/_index.adoc:555
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 "
@@ -1273,13 +1258,13 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:562
+#: documentation/content/en/articles/committers-guide/_index.adoc:556
#, no-wrap
msgid "Bisecting"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:566
+#: documentation/content/en/articles/committers-guide/_index.adoc:560
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 "
@@ -1287,7 +1272,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:571
+#: documentation/content/en/articles/committers-guide/_index.adoc:565
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 "
@@ -1299,7 +1284,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:578
+#: documentation/content/en/articles/committers-guide/_index.adoc:572
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 "
@@ -1312,14 +1297,14 @@ msgid ""
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:582
+#: documentation/content/en/articles/committers-guide/_index.adoc:576
msgid ""
"If you want to know the last version you checked out, you should use 'git "
"reflog':"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:587
+#: documentation/content/en/articles/committers-guide/_index.adoc:581
#, no-wrap
msgid ""
"5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\n"
@@ -1328,7 +1313,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:591
+#: documentation/content/en/articles/committers-guide/_index.adoc:585
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 "
@@ -1338,7 +1323,7 @@ msgid ""
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:595
+#: documentation/content/en/articles/committers-guide/_index.adoc:589
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 "
@@ -1346,7 +1331,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:602
+#: documentation/content/en/articles/committers-guide/_index.adoc:596
#, no-wrap
msgid ""
"% git bisect start --first-parent\n"
@@ -1357,7 +1342,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:611
+#: documentation/content/en/articles/committers-guide/_index.adoc:605
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, "
@@ -1370,13 +1355,13 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:613
+#: documentation/content/en/articles/committers-guide/_index.adoc:607
#, no-wrap
msgid "Signing the commits, tags, and pushes, with GnuPG"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:618
+#: documentation/content/en/articles/committers-guide/_index.adoc:612
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 "
@@ -1385,7 +1370,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:620
+#: documentation/content/en/articles/committers-guide/_index.adoc:614
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 - "
@@ -1393,7 +1378,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:622
+#: documentation/content/en/articles/committers-guide/_index.adoc:616
msgid ""
"The rationale behind signing pushes can be found in the https://github.com/"
"git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that "
@@ -1401,14 +1386,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:625
+#: documentation/content/en/articles/committers-guide/_index.adoc:619
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:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:632
+#: documentation/content/en/articles/committers-guide/_index.adoc:626
#, no-wrap
msgid ""
"% git config --add user.signingKey LONG-KEY-ID\n"
@@ -1419,14 +1404,14 @@ 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:640
+#: documentation/content/en/articles/committers-guide/_index.adoc:634
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`."
msgstr ""
#. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:646
+#: documentation/content/en/articles/committers-guide/_index.adoc:640
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 "
@@ -1434,20 +1419,20 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:648
+#: documentation/content/en/articles/committers-guide/_index.adoc:642
#, no-wrap
msgid "Verifying signatures"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:651
+#: documentation/content/en/articles/committers-guide/_index.adoc:645
msgid ""
"Commit signatures can be verified by running either `git verify-commit "
"<commit hash>`, or `git log --show-signature`."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:653
+#: documentation/content/en/articles/committers-guide/_index.adoc:647
msgid ""
"Tag signatures can be verified with `git verity-tag <tag name>`, or `git tag "
"-v <tag name>`."
@@ -1459,20 +1444,20 @@ 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:662
+#: documentation/content/en/articles/committers-guide/_index.adoc:656
#, no-wrap
msgid "Ports Considerations"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:665
+#: documentation/content/en/articles/committers-guide/_index.adoc:659
msgid ""
"The ports tree operates the same way. The branch names are different and "
"the repositories are in different locations."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:668
+#: documentation/content/en/articles/committers-guide/_index.adoc:662
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."
@@ -1481,7 +1466,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:672
+#: documentation/content/en/articles/committers-guide/_index.adoc:666
msgid ""
"There is also a mirror on GitHub, see extref:{handbook}/mirrors[External "
"mirrors, mirrors] for an overview. The 'current' branch is 'main' . The "
@@ -1489,13 +1474,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:674
+#: documentation/content/en/articles/committers-guide/_index.adoc:668
#, no-wrap
msgid "Commit message formats"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:678
+#: documentation/content/en/articles/committers-guide/_index.adoc:672
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[."
@@ -1504,32 +1489,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:680
+#: documentation/content/en/articles/committers-guide/_index.adoc:674
msgid ""
"The main point being that a commit message should be formatted in the "
"following way:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:683
+#: documentation/content/en/articles/committers-guide/_index.adoc:677
#, no-wrap
msgid "category/port: Summary.\n"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:685
+#: documentation/content/en/articles/committers-guide/_index.adoc:679
#, no-wrap
msgid "Description of why the changes where made.\n"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:687
+#: documentation/content/en/articles/committers-guide/_index.adoc:681
#, no-wrap
msgid "PR:\t 12345\n"
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:693
+#: documentation/content/en/articles/committers-guide/_index.adoc:687
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 "
@@ -1537,39 +1522,39 @@ msgid ""
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:695
+#: documentation/content/en/articles/committers-guide/_index.adoc:689
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:697
+#: documentation/content/en/articles/committers-guide/_index.adoc:691
msgid ""
"The rest of the commit message should be wrapped at the 72 characters "
"boundary."
msgstr ""
#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:699
+#: documentation/content/en/articles/committers-guide/_index.adoc:693
msgid ""
"Another blank line should be added if there are any metadata fields, so that "
"they are easily distinguishable from the commit message."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:701
+#: documentation/content/en/articles/committers-guide/_index.adoc:695
#, no-wrap
msgid "Managing Local Changes"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:704
+#: documentation/content/en/articles/committers-guide/_index.adoc:698
msgid ""
"This section addresses tracking local changes. If you have no local "
"changes, you can stop reading now (it is the last section and OK to skip)."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:710
+#: documentation/content/en/articles/committers-guide/_index.adoc:704
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 "
@@ -1580,13 +1565,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:711
+#: documentation/content/en/articles/committers-guide/_index.adoc:705
#, no-wrap
msgid "Keeping local changes"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:718
+#: documentation/content/en/articles/committers-guide/_index.adoc:712
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 "
@@ -1598,7 +1583,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:722
+#: documentation/content/en/articles/committers-guide/_index.adoc:716
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 "
@@ -1607,13 +1592,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:723
+#: documentation/content/en/articles/committers-guide/_index.adoc:717
#, no-wrap
msgid "Keeping a local branch"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:730
+#: documentation/content/en/articles/committers-guide/_index.adoc:724
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 "
@@ -1624,7 +1609,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:734
+#: documentation/content/en/articles/committers-guide/_index.adoc:728
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 "
@@ -1633,12 +1618,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:736
+#: documentation/content/en/articles/committers-guide/_index.adoc:730
msgid "====== Create a branch"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:741
+#: documentation/content/en/articles/committers-guide/_index.adoc:735
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 "
@@ -1648,7 +1633,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:763
+#: documentation/content/en/articles/committers-guide/_index.adoc:757
#, no-wrap
msgid ""
"% cd src\n"
@@ -1674,7 +1659,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:770
+#: documentation/content/en/articles/committers-guide/_index.adoc:764
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 "
@@ -1686,12 +1671,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:772
+#: documentation/content/en/articles/committers-guide/_index.adoc:766
msgid "====== Time to update"
*** 174170 LINES SKIPPED ***