Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Dec 2016 23:45:09 +0000 (UTC)
From:      Warren Block <wblock@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r49745 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/htdocs/advocacy en_US.ISO8859-1/htdocs/community en_US.ISO8859-1/htdocs/docproj en_US.ISO8859-1/htdocs/projects en_US.ISO8859-1/...
Message-ID:  <201612162345.uBGNj93g056112@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wblock
Date: Fri Dec 16 23:45:09 2016
New Revision: 49745
URL: https://svnweb.freebsd.org/changeset/doc/49745

Log:
  Reword some awkward sentences on the website. Includes some contraction
  expansions and minor edits in addition to linimon's patch.
  
  PR:		213519
  Submitted by:	linimon

Modified:
  head/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml
  head/en_US.ISO8859-1/htdocs/community/mailinglists.xml
  head/en_US.ISO8859-1/htdocs/docproj/current.xml
  head/en_US.ISO8859-1/htdocs/docproj/docproj.xml
  head/en_US.ISO8859-1/htdocs/mailto.xml
  head/en_US.ISO8859-1/htdocs/projects/newbies.xml
  head/en_US.ISO8859-1/htdocs/search/sitemap.xml
  head/en_US.ISO8859-1/htdocs/where.xml
  head/share/xml/header.ent

Modified: head/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -22,7 +22,7 @@
     <h2>The Community</h2>
 
       <p>&os; is a community-driven operating system despite it being
-	sponsored corporately.  &os; has active mailing lists,
+	to a partial degree sponsored corporately.  &os; has active mailing lists,
 	forums, and IRC channels where experienced users and
 	developers are always willing to help the less
 	experienced.</p>
@@ -48,7 +48,7 @@
 	is an expected feature for any operating system.</p>
 
       <p>Stability in &os; means much more than that.  It means that
-	upgrading the system doesn't require upgrading the user.
+	upgrading the system does not require upgrading the user.
 	Configuration interfaces do change over time, but only when
 	there is a good reason.  If you learned how to use &os; in
 	2000, most of your knowledge would still be relevant.</p>
@@ -109,11 +109,11 @@
       <p>Unlike some other systems, &os; maintains a clean division
 	between the base system and third-party ports and packages.
 	All third-party software goes in /usr/local, so if you want to
-	repurpose a machine then it's trivial to simply delete all
+	repurpose a machine, it is trivial to simply delete all
 	installed packages and then start installing the ones that you
 	want.</p>
 
-      <p>The pkg tool makes working with binary packages
+      <p>The pkg(8) tool makes working with binary packages
 	even easier, although source installs are still supported for
 	people who want the level of configurability that this
 	implies.</p>
@@ -126,7 +126,7 @@
 
       <ul>
 	<li>Jails, allowing you to run applications or entire systems
-	  in a sandbox that can't access the rest of the system.  With
+	  in a sandbox that cannot access the rest of the system.  With
 	  tools like ezjail and ZFS you can instantly create a new
 	  jail with a clone of an existing system, using a tiny amount
 	  of disk space, and run untrusted code inside it.</li>
@@ -143,8 +143,8 @@
 	<li>Security event auditing, using the BSM standard.</li>
       </ul>
 
-      <p>And, of course, all of the standard features that you'd
-	expect from a modern &unix; system including IPSec, SSH, and so
+      <p>And, of course, all of the standard features that are
+	expected from a modern &unix; system including IPSec, SSH, and so
 	on.</p>
 
     <h2>ZFS</h2>
@@ -153,11 +153,11 @@
 	compression, and no need to decide partition sizes on install.
 	Using ZFS for a few days makes going back to a more
 	traditional volume manager painful.  If you want to test
-	something with ZFS, then it's trivial to just create a
+	something with ZFS, it is trivial to just create a
 	snapshot and roll back if it didn't work.</p>
 
-      <p>If you're using jails, then ZFS lets you clone an existing
-	jail in under a second, irrespective of how big the jail
+      <p>ZFS lets you clone an existing
+	jail in under a second, no matter how big the jail
 	itself is.</p>
 
     <h2>GEOM</h2>
@@ -178,7 +178,7 @@
 
       <p>Now, &os; has low-latency sound mixing with per-application
 	volume controls and full support for the OSS 4 APIs out of the
-	box.  There's no need to configure a userspace sound daemon.
+	box.  There is no need to configure a userspace sound daemon.
 	The same audio APIs that were used a decade ago still work on
 	&os;,  including some compatibility modes to allow
 	applications that try to manipulate the global volume to only
@@ -192,16 +192,16 @@
 	This base system can then be extended easily.  If you want to
 	run KDE or GNOME, then just install the metapackage for the
 	version that you prefer.  If you want a headless server, then
-	it's equally easy to install the server tools that you want.</p>
+	it is equally easy to install the server tools that you want.</p>
 
-      <p>It's easy to run the &os; installer via a serial port and to
-	configure the entire system from the terminal.  It's also easy
+      <p>It is easy to run the &os; installer via a serial port and to
+	configure the entire system from the terminal.  It is also easy
 	to install and use an existing desktop environment.  The
 	decisions about the kind of system you want to use are left to
 	you.</p>
 
-      <p>If you're deploying &os; in a corporate environment, then
-	it's very easy to customise both the base system and the set
+      <p>If you are deploying &os; in a corporate environment, then
+	it is very easy to customise both the base system and the set
 	of installed packages for your specific requirements.  The
 	build system provides numerous tuneable variables allowing you
 	to build exactly the base system that meets your needs.</p>

Modified: head/en_US.ISO8859-1/htdocs/community/mailinglists.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/community/mailinglists.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/community/mailinglists.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -99,7 +99,7 @@
 	  href="mailto:freebsd@lists.enderunix.org">freebsd@lists.enderunix.org</a>.</li>
     </ul>
 
-    <p>If you create other FreeBSD mailing lists, <a
+    <p>If you create other FreeBSD mailing lists, please <a
 	href="&base;/mailto.html">let us know about them</a>.</p>
 
 

Modified: head/en_US.ISO8859-1/htdocs/docproj/current.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docproj/current.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/docproj/current.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -147,7 +147,7 @@
      &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;,
      Wolfram Schneider &lt;<a href="mailto:wosch@FreeBSD.org">wosch@FreeBSD.org</a>&gt;</p>
 
-    <p><b>Synopsis:</b>Modify the CGI script ports.cgi
+    <p><b>Synopsis:</b> Modify the CGI script ports.cgi
      and the script portindex to use the Perl <a
      href="http://people.FreeBSD.org/~tom/portpm/">FreeBSD::Ports</a>;
      modules.  These modules also need thorough testing.</p>

Modified: head/en_US.ISO8859-1/htdocs/docproj/docproj.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docproj/docproj.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/docproj/docproj.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -25,7 +25,7 @@
       quirks.</p>
 
     <p>In addition, FreeBSD will be the first exposure to a Unix-like
-      operating system for many of its users, so the availability of high
+      operating system for some of its users, so the availability of high
       quality, accurate documentation is paramount.</p>
 
     <p>The FreeBSD Documentation Project exists to help fill this gap. There

Modified: head/en_US.ISO8859-1/htdocs/mailto.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/mailto.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/mailto.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -28,7 +28,7 @@
 
     <p>Questions or suggestions about our documentation (<a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</a>, <a href="&base;/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a>, <a
-	href="&base;/docs.html">Books &amp; Articles</a>) should be addressed to the
+	href="&base;/docs.html">Books &amp; Articles</a>, and so forth) should be addressed to the
         FreeBSD Documentation Project mailing list, <a
 	href="mailto:freebsd-doc@FreeBSD.org">freebsd-doc@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/projects/newbies.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -19,7 +19,7 @@
 
     <p>The latest &os; releases are available <a
 	href="&enbase;/where.html">here</a>.  Before you begin,
-      carefully read the <a
+	please carefully read the <a
 	href="&url.books;/handbook/bsdinstall.html">installation
 	instructions</a>.</p>
 
@@ -57,7 +57,7 @@
 	offer another support channel.  Many users have written various
 	tutorials and lots of new users receive help there.</p></li>
 
-      <li><p><a href="&base;/search/search.html">Search</a> the
+      <li><p>You can <a href="&base;/search/search.html">search</a> the
 	Handbook and FAQ, the whole web site, or the &os; mailing list
 	archives.</p></li>
 
@@ -85,7 +85,7 @@
 	user.</p></li>
 
       <li><p><a href="http://www.pfsense.org">pfSense</a>; is a &os;
-	free network security solution, based on &os;.  pfSense
+	based network security solution.  pfSense
 	software, with the help of the package system, is able to
 	provide the same functionality or more of common commercial
 	firewalls, without any of the artificial limitations.  It has

Modified: head/en_US.ISO8859-1/htdocs/search/sitemap.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/search/sitemap.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/search/sitemap.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -375,7 +375,7 @@
   </term>
 
   <term>
-    <text>CVS Repository</text>
+    <text>Source Code Repository</text>
     <destination>&base;/developers/cvs.html</destination>
   </term>
 
@@ -1314,7 +1314,7 @@
     </item>
 
     <item>
-      <text>CVS Repository</text>
+      <text>Source Code Repository</text>
       <destination>&base;/developers/cvs.html</destination>
     </item>
 

Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/en_US.ISO8859-1/htdocs/where.xml	Fri Dec 16 23:45:09 2016	(r49745)
@@ -44,7 +44,7 @@
       formats including CD (disc1), DVD (dvd1), and Network Install
       (bootonly) sized ISO
       Disc Images, as well as regular and mini USB memory stick
-      images.  Later versions of &os; are also offered as prebuilt
+      images.  Recent versions of &os; are also offered as prebuilt
       expandable Virtual Machine images, and as SD Card images for embedded
       platforms.</p>
 
@@ -503,8 +503,8 @@
 	impressive desktop tools aimed at ease of use for the casual computer
 	user.</p></li>
 
-      <li><p><a href="http://www.pfsense.org">pfSense</a>; is a free,
-	open source customized distribution of &os; tailored for
+      <li><p><a href="http://www.pfsense.org">pfSense</a>; is a
+	&os; based customized distribution tailored for
 	use as a firewall and router.</p></li>
     </ul>
 
@@ -517,9 +517,13 @@
     <p>The &os; Ports Collection is a diverse collection of utility
       and application software that has been ported to &os;.</p>
 
+    <p>See <a href="&base;/doc/en_US.ISO8859-1/books/handbook/ports.html">
+      <strong>Installing Applications: Packages and Ports</strong></a>
+      in the Handbook.</p>
+
     <ul class="txtdownloadlist">
-      <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">&os;
-	  Ports Collection</a></li>
+      <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">Download the &os;
+	  Ports Collection framework</a></li>
 
       <li><a href="&base;/ports/index.html">Web interface to the Ports
 	  Collection</a></li>

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Fri Dec 16 23:28:17 2016	(r49744)
+++ head/share/xml/header.ent	Fri Dec 16 23:45:09 2016	(r49745)
@@ -155,7 +155,7 @@
       <li><a href="https://www.freebsdfoundation.org/">Foundation</a>;
 	<ul>
 	  <li><a href="https://www.freebsdfoundation.org/donate/">Monetary Donations</a></li>
-	  <li><a href="&base;/donations/">Hardware Donations</a></li>
+	  <li><a href="&base;/donations/index.html#systems">Hardware Donations</a></li>
 	</ul>
       </li>
     </ul>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612162345.uBGNj93g056112>