Consistently use the 'os' macro over hard-coded 'FreeBSD'.

Sponsored by:	The FreeBSD Foundation

4 files changed, 26 insertions, 26 deletions

diff --git a/en_US.ISO8859-1/htdocs/internal/developer.xml b/en_US.ISO8859-1/htdocs/internal/developer.xml
index b5af889258..4e7335f955 100644
--- a/en_US.ISO8859-1/htdocs/internal/developer.xml
+++ b/en_US.ISO8859-1/htdocs/internal/developer.xml
@@ -27,45 +27,45 @@
 	href="../doc/en_US.ISO8859-1/articles/committers-guide/ssh.guide.html">
 	SSH Quick-Start Guide</a>.</p>
 
-    <p>It contains almost everything a new committer to the FreeBSD
+    <p>It contains almost everything a new committer to the &os;
       Project needs to know.  See the Documentation Project Primer and
       the Ports Guide, below, for more info.</p>
 
-    <h2><a href="../doc/en_US.ISO8859-1/books/fdp-primer/">FreeBSD
+    <h2><a href="../doc/en_US.ISO8859-1/books/fdp-primer/">&os;
       Documentation Project Primer for New Contributors</a></h2>
 
     <p>This primer covers everything you will need to know in order to
-      start contributing to the FreeBSD Documentation Project, from
+      start contributing to the &os; Documentation Project, from
       the tools and software you will be using (both mandatory and
       recommended) to the philosophy behind the Documentation
       Project.</p>
 
     <h2><a
 	href="../doc/en_US.ISO8859-1/books/porters-handbook/index.html">
-	FreeBSD Porter's Handbook</a></h2>
+	&os; Porter's Handbook</a></h2>
 
-    <p>A guide for FreeBSD ports committers.  This includes the
+    <p>A guide for &os; ports committers.  This includes the
       canonical <a
 	href="../doc/en_US.ISO8859-1/books/porters-handbook/versions.html">
 	Table of __FreeBSD_version Values</a>.</p>
 
     <h2><a
 	href="&base;/doc/en_US.ISO8859-1/books/fdp-primer/the-website-build.html">
-	How to build the FreeBSD Web Pages</a>.</h2>
+	How to build the &os; Web Pages</a>.</h2>
 
-    <p>This document describes how to build and update the FreeBSD Web
+    <p>This document describes how to build and update the &os; Web
       pages from the SVN repository by hand.</p>
 
-    <h2>FreeBSD Projects</h2>
+    <h2>&os; Projects</h2>
     <ul>
-      <li><a href="../docproj/docproj.html">FreeBSD Documentation
+      <li><a href="../docproj/docproj.html">&os; Documentation
 	  Project</a></li>
-      <li><a href="../releng/index.html">FreeBSD
+      <li><a href="../releng/index.html">&os;
 	  Release Engineering</a></li>
-      <li><a href="../platforms/index.html">FreeBSD Hardware Platforms
+      <li><a href="../platforms/index.html">&os; Hardware Platforms
 	  Projects</a></li>
       <li><a
-	  href="../projects/index.html">FreeBSD Development
+	  href="../projects/index.html">&os; Development
 	  Projects</a></li>
     </ul>
 
@@ -74,15 +74,15 @@
       <li><a href="&base;/developers/cvs.html">Source Code
 	  Repositories</a></li>
       <li><a href="../support.html">Bug Reports</a></li>
-      <li><a href="../security/index.html">FreeBSD Security
+      <li><a href="../security/index.html">&os; Security
 	  Information</a></li>
       <li><a
 	    href="../copyright/copyright.html">Copyright</a></li>
-      <li><a href="http://wiki.FreeBSD.org">FreeBSD Wiki</a></li>
+      <li><a href="http://wiki.FreeBSD.org">&os; Wiki</a></li>
       <li><a href="http://perforce.FreeBSD.org">Perforce Repository
 	  for works in progress</a></li>
     </ul>
 
-    <p><a href="internal.html">FreeBSD Internal Home</a></p>
+    <p><a href="internal.html">&os; Internal Home</a></p>
   </body>
 </html>
diff --git a/en_US.ISO8859-1/htdocs/internal/homepage.xml b/en_US.ISO8859-1/htdocs/internal/homepage.xml
index 4eebc92506..978b3f1bea 100644
--- a/en_US.ISO8859-1/htdocs/internal/homepage.xml
+++ b/en_US.ISO8859-1/htdocs/internal/homepage.xml
@@ -18,6 +18,6 @@
       &homepage;
     </ol>
 
-    <p><a href="internal.html">FreeBSD Internal Home</a></p>
+    <p><a href="internal.html">&os; Internal Home</a></p>
   </body>
 </html>
diff --git a/en_US.ISO8859-1/htdocs/internal/internal.xml b/en_US.ISO8859-1/htdocs/internal/internal.xml
index 5331fec86b..3a9189c188 100644
--- a/en_US.ISO8859-1/htdocs/internal/internal.xml
+++ b/en_US.ISO8859-1/htdocs/internal/internal.xml
@@ -14,7 +14,7 @@
   <body class="navinclude.docs">
 
     <p>This page contains pointers to pages documenting aspects of the
-      FreeBSD project itself, as viewed separately from the
+      &os; project itself, as viewed separately from the
       codebase.</p>
 
     <h2>Projects</h2>
@@ -22,22 +22,22 @@
     <p>There are various projects which lie <a
 	href="../projects/projects.html">outside the mainstream
 	development path</a>.  A number of groups are working on the
-      'cutting edge' to expand FreeBSD's range of capabilities in new
+      'cutting edge' to expand &os;'s range of capabilities in new
       directions.</p>
 
     <p>Here is an overview of the <a
 	href="../doc/en_US.ISO8859-1/articles/freebsd-releng/article.html">
-	FreeBSD Release Engineering Process</a>.</p>
+	&os; Release Engineering Process</a>.</p>
 
     <p>And here you will find the <a
 	href="../releng/index.html">schedules for upcoming official
-	releases of FreeBSD.</a></p>
+	releases of &os;.</a></p>
 
     <h2>Policies</h2>
 
     <p>To avoid chaos with a project this large spread out all over
       the globe, there have to be some <a
-	  href="policies.html">Policies for FreeBSD
+	  href="policies.html">Policies for &os;
 	Committers</a>.</p>
 
     <h2>People</h2>
@@ -57,14 +57,14 @@
     <h2>Resources</h2>
 
     <p>Here is a list of some <a href="developer.html">technical
-	resources for FreeBSD committers</a>.</p>
+	resources for &os; committers</a>.</p>
 
     <p>For those with accounts on <a href="machines.html">the main
 	FreeBSD.org network</a>, here are the machine resources that
       are available and the sorts of work they are intended for.</p>
 
-    <p>You can learn more <a href="about.html">about the FreeBSD WWW
+    <p>You can learn more <a href="about.html">about the &os; WWW
 	server</a>, including the machine, the software, mirroring the
-      FreeBSD web pages.</p>
+      &os; web pages.</p>
   </body>
 </html>
diff --git a/en_US.ISO8859-1/htdocs/internal/releng.xml b/en_US.ISO8859-1/htdocs/internal/releng.xml
index f4599c20fd..6cffcb60ee 100644
--- a/en_US.ISO8859-1/htdocs/internal/releng.xml
+++ b/en_US.ISO8859-1/htdocs/internal/releng.xml
@@ -17,8 +17,8 @@
 
     <p>This document has moved.</p>
 
-    <p>The FreeBSD Release Engineering document has been expanded and
-      is now available as part of the FreeBSD Documentation set.  You
+    <p>The &os; Release Engineering document has been expanded and
+      is now available as part of the &os; Documentation set.  You
       will find it <a
 	href="&base;/doc/en_US.ISO8859-1/articles/freebsd-releng/article.html">here</a>.</p>
   </body>