From a0dc93d3a58c98c4022ee7c9da2b92022351adbc Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 12 May 2001 02:07:27 +0000 Subject: [PATCH] Replace Obersturmbahnfuhrer with "Meister" -- someone who has earned an official degree in craftmanship (which is required to allow teaching the profession to others). There are overtones with "Obersturmbahnfuhrer" that we should avoid. Requested by: Jens Schweikhardt --- .../articles/committers-guide/article.sgml | 14 +++++++------- .../articles/committers-guide/article.sgml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 532c53a785..d427d1e95c 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.63 2001/05/07 15:46:10 schweikh Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.64 2001/05/11 04:38:52 bmah Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien 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.64 2001-05-11 04:38:52 bmah Exp $ line, leaving the original - $Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $ line intact). + the second $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $ line, leaving the original + $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $ line intact). @@ -1047,7 +1047,7 @@ docs:Documentation Bug:nik: &a.bde; - Bruce is the Obersturmbahnfuhrer of the Style Police. + Bruce is the Style Police-Meister. When you do a commit that could have been done better, Bruce will be there to tell you. Be thankful that someone is. Bruce is also very knowledgeable on the various @@ -1097,8 +1097,8 @@ docs:Documentation Bug:nik: &a.obrien; - David is the unofficial Obersturmbahnfuhrer of - src/contrib. If you have something + David is the unofficial src/contrib-Meister. + If you have something significant you'd like to do there, you should probably coordinate it with David first. Please consult him before importing into src/contrib if you have 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 532c53a785..d427d1e95c 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.63 2001/05/07 15:46:10 schweikh Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.64 2001/05/11 04:38:52 bmah Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien 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.64 2001-05-11 04:38:52 bmah Exp $ line, leaving the original - $Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $ line intact). + the second $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $ line, leaving the original + $Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $ line intact). @@ -1047,7 +1047,7 @@ docs:Documentation Bug:nik: &a.bde; - Bruce is the Obersturmbahnfuhrer of the Style Police. + Bruce is the Style Police-Meister. When you do a commit that could have been done better, Bruce will be there to tell you. Be thankful that someone is. Bruce is also very knowledgeable on the various @@ -1097,8 +1097,8 @@ docs:Documentation Bug:nik: &a.obrien; - David is the unofficial Obersturmbahnfuhrer of - src/contrib. If you have something + David is the unofficial src/contrib-Meister. + If you have something significant you'd like to do there, you should probably coordinate it with David first. Please consult him before importing into src/contrib if you have