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

Replace Obersturmbahnfuhrer with "Meister" -- someone who has earned an

Browse source 
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 <schweikh@schweikhardt.net>
This commit is contained in:
David E. O'Brien 2001-05-12 02:07:27 +00:00
parent f91206245e
commit a0dc93d3a5
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9415
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.63 2001/05/07 15:46:10 schweikh Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.64 2001/05/11 04:38:52 bmah Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1047,7 +1047,7 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.bde;</term> <term>&a.bde;</term>
<listitem> <listitem>
<para>Bruce is the Obersturmbahnfuhrer of the Style Police. <para>Bruce is the Style Police-Meister.
When you do a commit that could have been done better, When you do a commit that could have been done better,
Bruce will be there to tell you. Be thankful that someone Bruce will be there to tell you. Be thankful that someone
is. Bruce is also very knowledgeable on the various is. Bruce is also very knowledgeable on the various
@ -1097,8 +1097,8 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.obrien;</term> <term>&a.obrien;</term>
<listitem> <listitem>
<para>David is the unofficial Obersturmbahnfuhrer of <para>David is the unofficial <filename>src/contrib</filename>-Meister.
<filename>src/contrib</filename>. If you have something If you have something
significant you'd like to do there, you should probably significant you'd like to do there, you should probably
coordinate it with David first. Please consult him before coordinate it with David first. Please consult him before
importing into <filename>src/contrib</filename> if you have importing into <filename>src/contrib</filename> if you have

14
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.63 2001/05/07 15:46:10 schweikh Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.64 2001/05/11 04:38:52 bmah Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.64 2001-05-11 04:38:52 bmah Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.65 2001-05-12 02:07:27 obrien Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1047,7 +1047,7 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.bde;</term> <term>&a.bde;</term>
<listitem> <listitem>
<para>Bruce is the Obersturmbahnfuhrer of the Style Police. <para>Bruce is the Style Police-Meister.
When you do a commit that could have been done better, When you do a commit that could have been done better,
Bruce will be there to tell you. Be thankful that someone Bruce will be there to tell you. Be thankful that someone
is. Bruce is also very knowledgeable on the various is. Bruce is also very knowledgeable on the various
@ -1097,8 +1097,8 @@ docs:Documentation Bug:nik:</programlisting>
<term>&a.obrien;</term> <term>&a.obrien;</term>
<listitem> <listitem>
<para>David is the unofficial Obersturmbahnfuhrer of <para>David is the unofficial <filename>src/contrib</filename>-Meister.
<filename>src/contrib</filename>. If you have something If you have something
significant you'd like to do there, you should probably significant you'd like to do there, you should probably
coordinate it with David first. Please consult him before coordinate it with David first. Please consult him before
importing into <filename>src/contrib</filename> if you have importing into <filename>src/contrib</filename> if you have