git: 226b58b79d - main - doc: Update source files (en .po), for translations
"Danilo G. Baio" <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=226b58b79dbc99f588ae5240aabe06e6ac6a1dea commit 226b58b79dbc99f588ae5240aabe06e6ac6a1dea Author: Danilo G. Baio <[email protected]> AuthorDate: 2023-05-21 17:51:54 +0000 Commit: Danilo G. Baio <[email protected]> CommitDate: 2023-05-21 17:51:54 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 2399 ++++---- .../content/en/articles/contributing/_index.po | 4 +- .../content/en/articles/contributors/_index.po | 9 +- documentation/content/en/articles/cups/_index.po | 18 +- .../content/en/articles/explaining-bsd/_index.po | 34 +- .../en/articles/filtering-bridges/_index.po | 79 +- .../content/en/articles/freebsd-releng/_index.po | 63 +- documentation/content/en/articles/hubs/_index.po | 4 +- .../content/en/articles/ipsec-must/_index.po | 18 +- .../content/en/articles/license-guide/_index.po | 215 +- .../content/en/articles/linux-emulation/_index.po | 77 +- .../content/en/articles/pgpkeys/_index.po | 24 +- .../content/en/articles/rc-scripting/_index.po | 59 +- .../content/en/articles/remote-install/_index.po | 29 +- documentation/content/en/articles/vinum/_index.po | 57 +- .../content/en/articles/vm-design/_index.po | 85 +- .../content/en/books/arch-handbook/mac/_index.po | 5701 +++++++++---------- .../en/books/fdp-primer/working-copy/_index.po | 5 +- .../en/books/fdp-primer/writing-style/_index.po | 396 +- .../content/en/books/handbook/config/_index.po | 647 ++- .../en/books/handbook/cutting-edge/_index.po | 4 +- .../content/en/books/handbook/desktop/_index.po | 710 ++- .../en/books/handbook/filesystems/_index.po | 6 +- .../content/en/books/handbook/glossary.po | 6 +- .../en/books/handbook/kernelconfig/_index.po | 386 +- .../content/en/books/handbook/linuxemu/_index.po | 673 ++- .../content/en/books/handbook/mirrors/_index.po | 502 +- .../content/en/books/handbook/multimedia/_index.po | 4 +- .../en/books/handbook/network-servers/_index.po | 4 +- .../content/en/books/handbook/ports/_index.po | 99 +- .../en/books/handbook/virtualization/_index.po | 447 +- .../content/en/books/handbook/x11/_index.po | 4 +- .../content/en/books/handbook/zfs/_index.po | 49 +- .../en/books/porters-handbook/makefiles/_index.po | 22 +- .../books/porters-handbook/porting-dads/_index.po | 72 +- .../en/books/porters-handbook/testing/_index.po | 513 +- .../en/books/porters-handbook/versions/_index.po | 5951 ++++++++++---------- 37 files changed, 9658 insertions(+), 9717 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index b0c44503ce..e1d331ec20 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-04-20 20:56-0300\n" +"POT-Creation-Date: 2023-05-21 14:43-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -987,36 +987,80 @@ msgstr "" #. type: Title ===== #: documentation/content/en/articles/committers-guide/_index.adoc:437 #, no-wrap -msgid "Branch names" +msgid "Branch Names" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:444 +#: documentation/content/en/articles/committers-guide/_index.adoc:439 +msgid "FreeBSD-CURRENT uses the `main` branch." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:441 +msgid "`main` is the default branch." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:443 +msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:445 +msgid "" +"For FreeBSD-RELEASE, release engineering branch names include `releng/12.4` " +"and `releng/13.2`." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:447 +msgid "https://www.freebsd.org/releng/[] shows:" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:449 +msgid "`main` and `stable/⋯` branches open" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:450 +msgid "`releng/⋯` branches, each of which is frozen when a release is tagged." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:452 +msgid "Examples:" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:454 +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" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:455 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 " -"(like 11 or 12). The main branch in the new repository is 'main'. The main " -"branch in the old GitHub mirror was 'master', but is now 'main'. Both " -"reflect the defaults of Git at the time they were created. The 'main' " -"branch is the default branch if you omit the '-b branch' or '--branch " -"branch' options below." +"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." msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:445 +#: documentation/content/en/articles/committers-guide/_index.adoc:456 #, no-wrap msgid "Repositories" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:448 +#: documentation/content/en/articles/committers-guide/_index.adoc:459 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:451 +#: documentation/content/en/articles/committers-guide/_index.adoc:462 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 " @@ -1025,13 +1069,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:452 +#: documentation/content/en/articles/committers-guide/_index.adoc:463 #, no-wrap msgid "Deep Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:456 +#: documentation/content/en/articles/committers-guide/_index.adoc:467 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 " @@ -1040,22 +1084,23 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:459 +#: documentation/content/en/articles/committers-guide/_index.adoc:470 #, no-wrap -msgid "% git clone -o freebsd $URL -b branch [dir]\n" +msgid "% git clone -o freebsd $URL -b branch [<directory>]\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:464 +#: documentation/content/en/articles/committers-guide/_index.adoc:475 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 " -"an optional directory to place it in (the default will be the name of the " -"repo you are cloning (src, doc, etc))." +"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 " +"used. If no `<directory>` is given: the name of the new directory will " +"match the name of the repo ([.filename]#doc#, [.filename]#ports# or [." +"filename]#src#)." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:469 +#: documentation/content/en/articles/committers-guide/_index.adoc:480 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 " @@ -1067,13 +1112,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:470 +#: documentation/content/en/articles/committers-guide/_index.adoc:481 #, no-wrap msgid "Shallow Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:476 +#: documentation/content/en/articles/committers-guide/_index.adoc:487 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 " @@ -1083,21 +1128,21 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:480 +#: documentation/content/en/articles/committers-guide/_index.adoc:491 #, 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:485 +#: documentation/content/en/articles/committers-guide/_index.adoc:496 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 " -"your mind later, you can do 'git fetch --unshallow' to get the old history." +"your mind later, you can do `git fetch --unshallow` to get the old history." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:490 +#: documentation/content/en/articles/committers-guide/_index.adoc:501 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 " @@ -1105,19 +1150,19 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:492 +#: documentation/content/en/articles/committers-guide/_index.adoc:503 #, no-wrap msgid "Building" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:496 +#: documentation/content/en/articles/committers-guide/_index.adoc:507 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:503 +#: documentation/content/en/articles/committers-guide/_index.adoc:514 #, no-wrap msgid "" "% cd src\n" @@ -1128,12 +1173,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:505 +#: documentation/content/en/articles/committers-guide/_index.adoc:516 msgid "so that won't be covered in depth here." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:508 +#: documentation/content/en/articles/committers-guide/_index.adoc:519 msgid "" "If you want to build a custom kernel, extref:{handbook}[the kernel config " "section, kernelconfig] of the FreeBSD Handbook recommends creating a file " @@ -1142,57 +1187,57 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:509 +#: documentation/content/en/articles/committers-guide/_index.adoc:520 #, no-wrap msgid "Updating" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:513 +#: documentation/content/en/articles/committers-guide/_index.adoc:524 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:516 +#: documentation/content/en/articles/committers-guide/_index.adoc:527 #, no-wrap msgid "% git pull --ff-only\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:521 +#: documentation/content/en/articles/committers-guide/_index.adoc:532 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 " -"always doing a 'fast forward' merge/pull, you'll ensure that you have an " -"exact copy of the FreeBSD tree. This will be important if you want to " -"maintain local patches." +"always doing a fast forward merge/pull, you'll ensure that you have an exact " +"copy of the FreeBSD tree. This will be important if you want to maintain " +"local patches." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:524 +#: documentation/content/en/articles/committers-guide/_index.adoc:535 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 " +"See below for how to manage local changes. The simplest is to use `--" +"autostash` on the `git pull` command, but more sophisticated options are " "available." msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:525 +#: documentation/content/en/articles/committers-guide/_index.adoc:536 #, no-wrap msgid "Selecting a Specific Version" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:529 +#: documentation/content/en/articles/committers-guide/_index.adoc:540 msgid "" -"In Git, the 'git checkout' checks out both branches and specific versions. " +"In Git, `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:531 +#: documentation/content/en/articles/committers-guide/_index.adoc:542 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 " @@ -1200,26 +1245,26 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:534 +#: documentation/content/en/articles/committers-guide/_index.adoc:545 #, no-wrap msgid "% git checkout 08b8197a74\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:537 +#: documentation/content/en/articles/committers-guide/_index.adoc:548 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:540 +#: documentation/content/en/articles/committers-guide/_index.adoc:551 #, no-wrap msgid "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:544 +#: documentation/content/en/articles/committers-guide/_index.adoc:555 #, no-wrap msgid "" "You are in a 'detached HEAD' state. You can look around, make experimental\n" @@ -1228,7 +1273,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:547 +#: documentation/content/en/articles/committers-guide/_index.adoc:558 #, no-wrap msgid "" "If you want to create a new branch to retain commits you create, you may\n" @@ -1236,20 +1281,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:549 -#: documentation/content/en/articles/committers-guide/_index.adoc:1697 +#: documentation/content/en/articles/committers-guide/_index.adoc:560 +#: documentation/content/en/articles/committers-guide/_index.adoc:1668 #, no-wrap msgid " git checkout -b <new-branch-name>\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:551 +#: documentation/content/en/articles/committers-guide/_index.adoc:562 #, 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:555 +#: documentation/content/en/articles/committers-guide/_index.adoc:566 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 " @@ -1258,13 +1303,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:556 +#: documentation/content/en/articles/committers-guide/_index.adoc:567 #, no-wrap msgid "Bisecting" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:560 +#: documentation/content/en/articles/committers-guide/_index.adoc:571 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 " @@ -1272,9 +1317,9 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:565 +#: documentation/content/en/articles/committers-guide/_index.adoc:576 msgid "" -"Git makes bisecting changes easy with a powerful 'git bisect' command. " +"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 " "https://www.metaltoad.com/blog/beginners-guide-git-bisect-process-" "elimination or https://git-scm.com/docs/git-bisect for more details. The " @@ -1284,11 +1329,11 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:572 +#: documentation/content/en/articles/committers-guide/_index.adoc:583 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 " -"it the working version and 'git bisect bad XXXXX' will tell it the bad " +"you need to tell a range to go through. `git bisect good XXXXXX` will tell " +"it the working version and `git bisect bad XXXXX` will tell it the bad " "version. The bad version will almost always be HEAD (a special tag for what " "you have checked out). The good version will be the last one you checked " "out. The `--first-parent` argument is necessary so that subsequent `git " @@ -1297,14 +1342,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:576 +#: documentation/content/en/articles/committers-guide/_index.adoc:587 msgid "" -"If you want to know the last version you checked out, you should use 'git " -"reflog':" +"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:581 +#: documentation/content/en/articles/committers-guide/_index.adoc:592 #, no-wrap msgid "" "5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\n" @@ -1313,9 +1358,9 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:585 +#: documentation/content/en/articles/committers-guide/_index.adoc:596 msgid "" -"shows me moving the working tree to the main branch (a816...) and then " +"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 " "5rf0bd68) and good would be a8163e165. As you can see from the output, " "HEAD@{1} also often works, but isn't foolproof if you have done other things " @@ -1323,7 +1368,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:589 +#: documentation/content/en/articles/committers-guide/_index.adoc:600 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 " @@ -1331,7 +1376,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:596 +#: documentation/content/en/articles/committers-guide/_index.adoc:607 #, no-wrap msgid "" "% git bisect start --first-parent\n" @@ -1342,26 +1387,26 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:605 +#: documentation/content/en/articles/committers-guide/_index.adoc:616 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, " -"type 'git bisect skip'. You will get a similar message to the above after " +"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, " +"type `git bisect skip`. You will get a similar message to the above after " "each step. When you are done, report the bad version to the developer (or " -"fix the bug yourself and send a patch). 'git bisect reset' will end the " -"process and return you back to where you started (usually tip of main). " +"fix the bug yourself and send a patch). `git bisect reset` will end the " +"process and return you back to where you started (usually tip of `main`). " "Again, the git-bisect manual (linked above) is a good resource for when " "things go wrong or for unusual cases." msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:607 +#: documentation/content/en/articles/committers-guide/_index.adoc:618 #, no-wrap msgid "Signing the commits, tags, and pushes, with GnuPG" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:612 +#: documentation/content/en/articles/committers-guide/_index.adoc:623 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 " @@ -1370,7 +1415,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:614 +#: documentation/content/en/articles/committers-guide/_index.adoc:625 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 - " @@ -1378,7 +1423,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:616 +#: documentation/content/en/articles/committers-guide/_index.adoc:627 msgid "" "The rationale behind signing pushes can be found in the https://github.com/" "git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that " @@ -1386,14 +1431,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:619 +#: documentation/content/en/articles/committers-guide/_index.adoc:630 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:626 +#: documentation/content/en/articles/committers-guide/_index.adoc:637 #, no-wrap msgid "" "% git config --add user.signingKey LONG-KEY-ID\n" @@ -1404,14 +1449,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:634 +#: documentation/content/en/articles/committers-guide/_index.adoc:645 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:640 +#: documentation/content/en/articles/committers-guide/_index.adoc:651 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 " @@ -1419,20 +1464,20 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:642 +#: documentation/content/en/articles/committers-guide/_index.adoc:653 #, no-wrap msgid "Verifying signatures" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:645 +#: documentation/content/en/articles/committers-guide/_index.adoc:656 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:647 +#: documentation/content/en/articles/committers-guide/_index.adoc:658 msgid "" "Tag signatures can be verified with `git verity-tag <tag name>`, or `git tag " "-v <tag name>`." @@ -1444,20 +1489,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:656 +#: documentation/content/en/articles/committers-guide/_index.adoc:667 #, no-wrap msgid "Ports Considerations" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:659 +#: documentation/content/en/articles/committers-guide/_index.adoc:670 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:662 +#: documentation/content/en/articles/committers-guide/_index.adoc:673 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." @@ -1466,21 +1511,21 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:666 +#: documentation/content/en/articles/committers-guide/_index.adoc:677 msgid "" "There is also a mirror on GitHub, see extref:{handbook}/mirrors[External " -"mirrors, mirrors] for an overview. The 'current' branch is 'main' . The " -"quarterly branches are named 'yyyyQn' for year 'yyyy' and quarter 'n'." +"mirrors, mirrors] for an overview. The _latest_ branch is `main`. The " +"_quarterly_ branches are named `yyyyQn` for year 'yyyy' and quarter 'n'." msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:668 +#: documentation/content/en/articles/committers-guide/_index.adoc:679 #, no-wrap msgid "Commit message formats" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:672 +#: documentation/content/en/articles/committers-guide/_index.adoc:683 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[." @@ -1489,32 +1534,32 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:674 +#: documentation/content/en/articles/committers-guide/_index.adoc:685 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:677 +#: documentation/content/en/articles/committers-guide/_index.adoc:688 #, no-wrap msgid "category/port: Summary.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:679 +#: documentation/content/en/articles/committers-guide/_index.adoc:690 #, no-wrap msgid "Description of why the changes where made.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:681 +#: documentation/content/en/articles/committers-guide/_index.adoc:692 #, no-wrap msgid "PR:\t 12345\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:687 +#: documentation/content/en/articles/committers-guide/_index.adoc:698 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 " @@ -1522,39 +1567,39 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:689 +#: documentation/content/en/articles/committers-guide/_index.adoc:700 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:691 +#: documentation/content/en/articles/committers-guide/_index.adoc:702 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:693 +#: documentation/content/en/articles/committers-guide/_index.adoc:704 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:695 +#: documentation/content/en/articles/committers-guide/_index.adoc:706 #, no-wrap msgid "Managing Local Changes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:698 +#: documentation/content/en/articles/committers-guide/_index.adoc:709 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:704 +#: documentation/content/en/articles/committers-guide/_index.adoc:715 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 " @@ -1565,40 +1610,40 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:705 +#: documentation/content/en/articles/committers-guide/_index.adoc:716 #, no-wrap msgid "Keeping local changes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:712 +#: documentation/content/en/articles/committers-guide/_index.adoc:723 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 " +"`git stash`. In its simplest form, you use `git stash` to record the " "changes (which pushes them onto the stash stack). Most people use this to " "save changes before updating the tree as described above. They then use " -"'git stash apply' to re-apply them to the tree. The stash is a stack of " -"changes that can be examined with 'git stash list'. The git-stash man page " +"`git stash apply` to re-apply them to the tree. The stash is a stack of " +"changes that can be examined with `git stash list`. The git-stash man page " "(https://git-scm.com/docs/git-stash) has all the details." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:716 +#: documentation/content/en/articles/committers-guide/_index.adoc:727 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 " -"branch and rebasing. Stashing is also integrated with the 'git pull' " -"command: just add '--autostash' to the command line." +"branch and rebasing. Stashing is also integrated with the `git pull` " +"command: just add `--autostash` to the command line." msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:717 +#: documentation/content/en/articles/committers-guide/_index.adoc:728 #, no-wrap msgid "Keeping a local branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:724 +#: documentation/content/en/articles/committers-guide/_index.adoc:735 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 " @@ -1609,21 +1654,21 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:728 +#: documentation/content/en/articles/committers-guide/_index.adoc:739 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 " +"these issues. The `git rebase` command replays all the commits of a branch " "at a newer location on the parent branch. We will cover the most common " "scenarios that arise using it." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:730 +#: documentation/content/en/articles/committers-guide/_index.adoc:741 msgid "====== Create a branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:735 +#: documentation/content/en/articles/committers-guide/_index.adoc:746 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 " @@ -1633,7 +1678,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:757 +#: documentation/content/en/articles/committers-guide/_index.adoc:768 #, no-wrap msgid "" "% cd src\n" @@ -1659,24 +1704,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:764 +#: documentation/content/en/articles/committers-guide/_index.adoc:775 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 " "and install it like you normally would, following the directions in the " "handbook. Git differs from other version control systems in that you have " "to tell it explicitly which files to commit. I have opted to do it on the " -"commit command line, but you can also do it with 'git add' which many of the " +"commit command line, but you can also do it with `git add` which many of the " "more in depth tutorials cover." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:766 +#: documentation/content/en/articles/committers-guide/_index.adoc:777 msgid "====== Time to update" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:771 +#: documentation/content/en/articles/committers-guide/_index.adoc:782 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 " @@ -1686,7 +1731,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:777 +#: documentation/content/en/articles/committers-guide/_index.adoc:788 #, no-wrap msgid "" "% git checkout main\n" @@ -1695,7 +1740,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:782 +#: documentation/content/en/articles/committers-guide/_index.adoc:793 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 " @@ -1704,14 +1749,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:784 +#: documentation/content/en/articles/committers-guide/_index.adoc:795 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." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:791 +#: documentation/content/en/articles/committers-guide/_index.adoc:802 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 " @@ -1720,7 +1765,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:794 +#: documentation/content/en/articles/committers-guide/_index.adoc:805 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 " @@ -1728,7 +1773,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:804 +#: documentation/content/en/articles/committers-guide/_index.adoc:815 #, no-wrap msgid "" "Auto-merging bin/ls/ls.c\n" @@ -1742,7 +1787,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:807 +#: documentation/content/en/articles/committers-guide/_index.adoc:818 msgid "" "which looks scary. 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 " @@ -1750,7 +1795,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:816 +#: documentation/content/en/articles/committers-guide/_index.adoc:827 #, no-wrap msgid "" " <<<<<<< HEAD\n" @@ -1764,7 +1809,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:820 +#: documentation/content/en/articles/committers-guide/_index.adoc:831 #, no-wrap msgid "" "The new code is first, and your code is second.\n" @@ -1773,12 +1818,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:824 +#: documentation/content/en/articles/committers-guide/_index.adoc:835 msgid "#undef COLORLS_NEW #ifdef COLORLS_NEW #include <terminfo.h>" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:828 +#: documentation/content/en/articles/committers-guide/_index.adoc:839 #, no-wrap msgid "" "save the file.\n" @@ -1787,12 +1832,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:831 +#: documentation/content/en/articles/committers-guide/_index.adoc:842 msgid "% git add ls.c % git rebase --continue" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:836 +#: documentation/content/en/articles/committers-guide/_index.adoc:847 #, no-wrap msgid "" "which tells Git that ls.c has been fixed and to continue the rebase operation.\n" @@ -1801,17 +1846,17 @@ msgid "" msgstr "" *** 52173 LINES SKIPPED ***