aboutsummaryrefslogtreecommitdiff
path: root/documentation/content
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/content')
-rw-r--r--documentation/content/en/articles/committers-guide/_index.adoc6
-rw-r--r--documentation/content/hu/books/handbook/desktop/_index.adoc4
-rw-r--r--documentation/content/zh-cn/books/handbook/desktop/_index.adoc4
3 files changed, 10 insertions, 4 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 07cece334d..7c26bd1f27 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2199,6 +2199,12 @@ It is very important to have a current PGP/GnuPG key in the repository. The key
[.filename]#src/share/misc/committers-<repository>.dot# - Add an entry to the current committers section, where _repository_ is `doc`, `ports`, or `src`, depending on the commit privileges granted.
+
Add an entry for each additional mentor/mentee relationship in the bottom section.
+. Update git mailmap file
++
+[.filename]#src/.mailmap#, [.filename]#doc/.mailmap#, and [.filename]#ports/.mailmap# - Add an entry for commits you created prior to becoming a FreeBSD committer.
++
+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 old names, mispelled names, etc in the default `git log` output.
. Generate a Kerberos Password
+
See crossref:committers-guide[kerberos-ldap, Kerberos and LDAP web Password for FreeBSD Cluster] to generate or set a Kerberos account for use with other FreeBSD services like the link:https://bugs.freebsd.org/bugzilla/[bug-tracking database] (you get a bug-tracking account as part of that step).
diff --git a/documentation/content/hu/books/handbook/desktop/_index.adoc b/documentation/content/hu/books/handbook/desktop/_index.adoc
index d4ff125186..c5b49ec903 100644
--- a/documentation/content/hu/books/handbook/desktop/_index.adoc
+++ b/documentation/content/hu/books/handbook/desktop/_index.adoc
@@ -223,14 +223,14 @@ Ha Flash(TM) animációkat szeretnénk lejátszani, akkor ehhez a [.filename]#/u
[source,shell]
....
-# mount -t linprocfs linproc /usr/compat/linux/proc
+# mount -t linprocfs linprocfs /usr/compat/linux/proc
....
Az [.filename]#/etc/fstab# állományban az alábbi sor hozzáadásával azonban ennek csatlakoztatása akár automatikussá is tehetõ a rendszerindítás során:
[.programlisting]
....
-linproc /usr/compat/linux/proc linprocfs rw 0 0
+linprocfs /usr/compat/linux/proc linprocfs rw 0 0
....
Ezután indítsuk el a böngészõt, majd gépeljük be az `about:plugins` szöveget a címsorba és nyomjuk le az kbd:[Enter] billentyût. Ekkor a jelenleg elérhetõ pluginok listájának kell megjelennie.
diff --git a/documentation/content/zh-cn/books/handbook/desktop/_index.adoc b/documentation/content/zh-cn/books/handbook/desktop/_index.adoc
index 931f8e2928..91fa8c7f20 100644
--- a/documentation/content/zh-cn/books/handbook/desktop/_index.adoc
+++ b/documentation/content/zh-cn/books/handbook/desktop/_index.adoc
@@ -222,14 +222,14 @@ Adobe(R) Flash(TM) 插件并没有直接提供其 FreeBSD 版本。 不过,
[source,shell]
....
-# mount -t linprocfs linproc /usr/compat/linux/proc
+# mount -t linprocfs linprocfs /usr/compat/linux/proc
....
这也可以在机器启动时自动挂载, 把以下这行加入 [.filename]#/etc/fstab#:
[.programlisting]
....
-linproc /usr/compat/linux/proc linprocfs rw 0 0
+linprocfs /usr/compat/linux/proc linprocfs rw 0 0
....
然后就可以打开浏览器, 并在地址栏中输入 `about:plugins` 然后按下 kbd:[Enter]。 这将显示目前可用的插件列表。