os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Fix the appearance of the link to the Developer's Handbook.

Browse source 
- Remove extra "very" and use <emphasis>very</emphasis> insted.

Approved by:	trhodes (mentor), keramida (mentor)
This commit is contained in:
Daniel Gerzo 2006-08-22 08:57:05 +00:00
parent 448ca37564
commit 07c5d64e4a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=28512
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -729,11 +729,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.247 2006-08-22 08:57:05 danger Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.247 2006-08-22 08:57:05 danger Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.246 2006-08-20 11:45:55 joel Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.247 2006-08-22 08:57:05 danger Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1925,7 +1925,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<filename>Makefile</filename> for any package or subtree <filename>Makefile</filename> for any package or subtree
which is being actively maintained by one or more people; which is being actively maintained by one or more people;
see <ulink see <ulink
url="&url.books.developers-handbook;/policies.html"></ulink> url="&url.books.developers-handbook;/policies.html">
http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html</ulink>
for documentation on this. Where sections of code have for documentation on this. Where sections of code have
several maintainers, commits to affected areas by one several maintainers, commits to affected areas by one
maintainer need to be reviewed by at least one other maintainer need to be reviewed by at least one other
@ -1961,7 +1962,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
brought back. If it turns out not to be, then the users brought back. If it turns out not to be, then the users
did not have to live with the bogus change in the tree did not have to live with the bogus change in the tree
while everyone was busily debating its merits. People while everyone was busily debating its merits. People
very very rarely call for back-outs in the repository <emphasis>very</emphasis> rarely call for back-outs in the repository
since discussion generally exposes bad or controversial since discussion generally exposes bad or controversial
changes before the commit even happens, but on such rare changes before the commit even happens, but on such rare
occasions the back-out should be done without argument so occasions the back-out should be done without argument so