svn commit: r44544 - head/en_US.ISO8859-1/articles/committers-guide
Warren Block
wblock at FreeBSD.org
Sun Apr 13 01:40:20 UTC 2014
Author: wblock
Date: Sun Apr 13 01:40:20 2014
New Revision: 44544
URL: http://svnweb.freebsd.org/changeset/doc/44544
Log:
Whitespace-only fixes, translators please ignore.
Modified:
head/en_US.ISO8859-1/articles/committers-guide/article.xml
Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Apr 13 01:29:40 2014 (r44543)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Apr 13 01:40:20 2014 (r44544)
@@ -307,19 +307,22 @@ You need a Passphrase to protect your se
<sect1 xml:id="kerberos-ldap">
<title>Kerberos and LDAP web password for &os; cluster</title>
- <para>Some of the services in the &os; cluster require a Kerberos password.
- In the &os; cluster, LDAP is proxying to Kerberos, so this also serves as
- the LDAP web password.</para>
- <para>To reset your Kerberos password in the &os; cluster using a random password
- generator:</para>
- <screen>&prompt.user; <userinput>ssh kpasswd.freebsd.org</userinput></screen>
-
- <para>Alternatively, you can set your Kerberos password manually by logging into
- <systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem> and
+ <para>Some of the services in the &os; cluster require a Kerberos
+ password. In the &os; cluster, LDAP is proxying to Kerberos, so
+ this also serves as the LDAP web password.</para>
+
+ <para>To reset your Kerberos password in the &os; cluster using a
+ random password generator:</para>
+
+ <screen>&prompt.user; <userinput>ssh kpasswd.freebsd.org</userinput></screen>
+
+ <para>Alternatively, you can set your Kerberos password manually
+ by logging into <systemitem
+ class="fqdomainname">freefall.FreeBSD.org</systemitem> and
running:</para>
- <screen>&prompt.user; <userinput>kpasswd</userinput></screen>
+ <screen>&prompt.user; <userinput>kpasswd</userinput></screen>
</sect1>
<sect1 xml:id="committer.types">
@@ -554,11 +557,11 @@ You need a Passphrase to protect your se
<para>The above command will check out a
<literal>CURRENT</literal> source tree as
- <filename><replaceable>/usr/src/</replaceable></filename>, which can be any target
- directory on the local filesystem. Omitting the final
- argument of that command causes the working copy, in this
- case, to be named <quote>head</quote>, but that can be
- renamed safely.</para>
+ <filename><replaceable>/usr/src/</replaceable></filename>,
+ which can be any target directory on the local filesystem.
+ Omitting the final argument of that command causes the
+ working copy, in this case, to be named <quote>head</quote>,
+ but that can be renamed safely.</para>
<para><literal>svn+ssh</literal> means the
<acronym>SVN</acronym> protocol tunnelled over
@@ -892,9 +895,10 @@ You need a Passphrase to protect your se
<screen>&prompt.user; <userinput>svn commit</userinput></screen>
<para>To commit all changes in, for example,
- <filename><replaceable>lib/libfetch/</replaceable></filename> and
- <filename><replaceable>usr/bin/fetch/</replaceable></filename> in a single
- operation:</para>
+ <filename><replaceable>lib/libfetch/</replaceable></filename>
+ and
+ <filename><replaceable>usr/bin/fetch/</replaceable></filename>
+ in a single operation:</para>
<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
@@ -1388,8 +1392,9 @@ You need a Passphrase to protect your se
<listitem>
<para>Changes to manual pages should be merged to
- <filename>share/man/man<replaceable>N</replaceable>/</filename>, for the
- appropriate value of <literal>N</literal>.</para>
+ <filename>share/man/man<replaceable>N</replaceable>/</filename>,
+ for the appropriate value of
+ <literal>N</literal>.</para>
</listitem>
<listitem>
@@ -2102,7 +2107,8 @@ U stable/9/share/man/man4/netmap.4
work that is beneficial to the &os; community in some way
but not intended to be merged directly back into HEAD then
the proper location is
- <filename>base/user/<replaceable>your-name</replaceable>/</filename>. <link
+ <filename>base/user/<replaceable>your-name</replaceable>/</filename>.
+ <link
xlink:href="http://svnweb.freebsd.org/base/projects/GUIDELINES.txt">This
page</link> contains further details.</para>
@@ -2336,9 +2342,10 @@ ControlPersist yes</screen>
<listitem>
<para>Log into <systemitem>hub.FreeBSD.org</systemitem> and
- create a <filename>/var/forward/<replaceable>user</replaceable></filename> (where
- <replaceable>user</replaceable> is your username) file
- containing the e-mail address where you want mail
+ create a
+ <filename>/var/forward/<replaceable>user</replaceable></filename>
+ (where <replaceable>user</replaceable> is your username)
+ file containing the e-mail address where you want mail
addressed to
<replaceable>yourusername</replaceable>@FreeBSD.org to be
forwarded. This includes all of the commit messages as
@@ -2491,6 +2498,7 @@ ControlPersist yes</screen>
the release notes for the next release from the branch,
set to <literal>yes</literal>.</entry>
</row>
+
<row>
<entry><literal>Security:</literal></entry>
<entry>If the change is related to a security
@@ -2676,11 +2684,11 @@ Relnotes: yes</programlisting>
areas, to our shame), the same applies. If, however, you are
about to modify something which is clearly being actively
maintained by someone else (and it is only by watching the
- <literal><replaceable>repository</replaceable>-committers</literal> mailing list that you
- can really get a feel for just what is and is not) then consider
- sending the change to them instead, just as you would have
- before becoming a committer. For ports, you should contact the
- listed <varname>MAINTAINER</varname> in the
+ <literal><replaceable>repository</replaceable>-committers</literal>
+ mailing list that you can really get a feel for just what is and
+ is not) then consider sending the change to them instead, just
+ as you would have before becoming a committer. For ports, you
+ should contact the listed <varname>MAINTAINER</varname> in the
<filename>Makefile</filename>. For other parts of the
repository, if you are unsure who the active maintainer might
be, it may help to scan the revision history to see who has
@@ -2773,8 +2781,8 @@ Relnotes: yes</programlisting>
for tracking bugs and change requests. Be sure that if you
commit a fix or suggestion found in a
<application>GNATS</application> PR, you use
- <command>edit-pr <replaceable>pr-number</replaceable></command> on
- <systemitem>freefall</systemitem> to close it. It is also
+ <command>edit-pr <replaceable>pr-number</replaceable></command>
+ on <systemitem>freefall</systemitem> to close it. It is also
considered nice if you take time to close any PRs associated
with your commits, if appropriate. You can also make use of
&man.send-pr.1; yourself for proposing any change which you feel
@@ -3948,11 +3956,11 @@ Relnotes: yes</programlisting>
and then copy the last living revision of the
port:</para>
- <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput>
&prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput></screen>
- <para>Pick a date that is before the removal but after the
- last true commit.</para>
+ <para>Pick a date that is before the removal but after
+ the last true commit.</para>
</step>
<step>
@@ -4006,12 +4014,11 @@ Relnotes: yes</programlisting>
</question>
<answer>
- <para>When you want to add a port that is related to
- any port that is already in the tree in a separate
- directory, you have to do a repository copy.
- Here <wordasword>related</wordasword> means
- it is a different version or a slightly modified
- version. Examples are
+ <para>When you want to add a port that is related to any
+ port that is already in the tree in a separate
+ directory, you have to do a repository copy. Here
+ <wordasword>related</wordasword> means it is a different
+ version or a slightly modified version. Examples are
<filename>print/ghostscript*</filename> (different
versions) and <filename>x11-wm/windowmaker*</filename>
(English-only and internationalized version).</para>
@@ -4019,8 +4026,8 @@ Relnotes: yes</programlisting>
<para>Another example is when a port is moved from one
subdirectory to another, or when you want to change the
name of a directory because the author(s) renamed their
- software even though it is a
- descendant of a port already in a tree.</para>
+ software even though it is a descendant of a port
+ already in a tree.</para>
</answer>
</qandaentry>
More information about the svn-doc-all
mailing list