From 72d0d0a0e3d24b4a610d0dea7acb4f14e35d1c83 Mon Sep 17 00:00:00 2001 From: Jun Kuriyama Date: Wed, 4 Apr 2001 00:52:50 +0000 Subject: [PATCH] Fix breakage in previous commit. Usage of in must be + (no characters allowed between each ). --- .../articles/committers-guide/article.sgml | 14 ++++++++------ .../articles/committers-guide/article.sgml | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 1e3948819b..81b8a43e84 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.52 2001/04/03 16:04:54 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.53 2001/04/03 16:12:05 obrien Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ line, leaving the original + $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ line intact). @@ -1056,8 +1056,10 @@ docs:Documentation Bug:nik: - &a.gallatin;, &a.mjacob;, - &a.dfr;, and &a.obrien; + &a.gallatin; + &a.mjacob; + &a.dfr; + &a.obrien; These are the primary developers and overseers of the diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index 1e3948819b..81b8a43e84 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.52 2001/04/03 16:04:54 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.53 2001/04/03 16:12:05 obrien Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.53 2001-04-03 16:12:05 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ line, leaving the original + $Id: article.sgml,v 1.54 2001-04-04 00:52:50 kuriyama Exp $ line intact). @@ -1056,8 +1056,10 @@ docs:Documentation Bug:nik: - &a.gallatin;, &a.mjacob;, - &a.dfr;, and &a.obrien; + &a.gallatin; + &a.mjacob; + &a.dfr; + &a.obrien; These are the primary developers and overseers of the