From 07c5d64e4ab078f3dbc271dd59d60a13004babfe Mon Sep 17 00:00:00 2001 From: Daniel Gerzo Date: Tue, 22 Aug 2006 08:57:05 +0000 Subject: [PATCH] - Fix the appearance of the link to the Developer's Handbook. - Remove extra "very" and use very insted. Approved by: trhodes (mentor), keramida (mentor) --- .../articles/committers-guide/article.sgml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 03de8bf63a..8a3572ec7b 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -729,11 +729,11 @@ alias scvs cvs -d user@ncvs.FreeBSD.org:/home/ncvs

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