From 3f5b720b0c9d8761c4e0462c14062642281dee95 Mon Sep 17 00:00:00 2001 From: Warren Block Date: Fri, 16 Dec 2016 23:45:09 +0000 Subject: [PATCH] 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 --- .../htdocs/advocacy/whyusefreebsd.xml | 32 +++++++++---------- .../htdocs/community/mailinglists.xml | 2 +- en_US.ISO8859-1/htdocs/docproj/current.xml | 2 +- en_US.ISO8859-1/htdocs/docproj/docproj.xml | 2 +- en_US.ISO8859-1/htdocs/mailto.xml | 2 +- en_US.ISO8859-1/htdocs/projects/newbies.xml | 6 ++-- en_US.ISO8859-1/htdocs/search/sitemap.xml | 4 +-- en_US.ISO8859-1/htdocs/where.xml | 14 +++++--- share/xml/header.ent | 2 +- 9 files changed, 35 insertions(+), 31 deletions(-) diff --git a/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml b/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml index e5ee76daa1..182ca748e4 100644 --- a/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml +++ b/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml @@ -22,7 +22,7 @@

The Community

&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.

@@ -48,7 +48,7 @@ is an expected feature for any operating system.

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.

@@ -109,11 +109,11 @@

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.

-

The pkg tool makes working with binary packages +

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.

@@ -126,7 +126,7 @@ -

And, of course, all of the standard features that you'd - expect from a modern &unix; system including IPSec, SSH, and so +

And, of course, all of the standard features that are + expected from a modern &unix; system including IPSec, SSH, and so on.

ZFS

@@ -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.

-

If you're using jails, then ZFS lets you clone an existing - jail in under a second, irrespective of how big the jail +

ZFS lets you clone an existing + jail in under a second, no matter how big the jail itself is.

GEOM

@@ -178,7 +178,7 @@

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.

+ it is equally easy to install the server tools that you want.

-

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 +

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.

-

If you're deploying &os; in a corporate environment, then - it's very easy to customise both the base system and the set +

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.

diff --git a/en_US.ISO8859-1/htdocs/community/mailinglists.xml b/en_US.ISO8859-1/htdocs/community/mailinglists.xml index 3164c5ac36..e825557688 100644 --- a/en_US.ISO8859-1/htdocs/community/mailinglists.xml +++ b/en_US.ISO8859-1/htdocs/community/mailinglists.xml @@ -99,7 +99,7 @@ href="mailto:freebsd@lists.enderunix.org">freebsd@lists.enderunix.org. -

If you create other FreeBSD mailing lists, If you create other FreeBSD mailing lists, please let us know about them.

diff --git a/en_US.ISO8859-1/htdocs/docproj/current.xml b/en_US.ISO8859-1/htdocs/docproj/current.xml index 2ad7412fd4..00287f4ab1 100644 --- a/en_US.ISO8859-1/htdocs/docproj/current.xml +++ b/en_US.ISO8859-1/htdocs/docproj/current.xml @@ -147,7 +147,7 @@ <doc@FreeBSD.org>, Wolfram Schneider <wosch@FreeBSD.org>

-

Synopsis:Modify the CGI script ports.cgi +

Synopsis: Modify the CGI script ports.cgi and the script portindex to use the Perl FreeBSD::Ports modules. These modules also need thorough testing.

diff --git a/en_US.ISO8859-1/htdocs/docproj/docproj.xml b/en_US.ISO8859-1/htdocs/docproj/docproj.xml index 56e90516b0..c5f6555e46 100644 --- a/en_US.ISO8859-1/htdocs/docproj/docproj.xml +++ b/en_US.ISO8859-1/htdocs/docproj/docproj.xml @@ -25,7 +25,7 @@ quirks.

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.

The FreeBSD Documentation Project exists to help fill this gap. There diff --git a/en_US.ISO8859-1/htdocs/mailto.xml b/en_US.ISO8859-1/htdocs/mailto.xml index ba42586593..f2996f32e7 100644 --- a/en_US.ISO8859-1/htdocs/mailto.xml +++ b/en_US.ISO8859-1/htdocs/mailto.xml @@ -28,7 +28,7 @@

Questions or suggestions about our documentation (Handbook, FAQ, Books & Articles) should be addressed to the + href="&base;/docs.html">Books & Articles, and so forth) should be addressed to the FreeBSD Documentation Project mailing list, freebsd-doc@FreeBSD.org.

diff --git a/en_US.ISO8859-1/htdocs/projects/newbies.xml b/en_US.ISO8859-1/htdocs/projects/newbies.xml index 61732e461f..b8860ea339 100644 --- a/en_US.ISO8859-1/htdocs/projects/newbies.xml +++ b/en_US.ISO8859-1/htdocs/projects/newbies.xml @@ -19,7 +19,7 @@

The latest &os; releases are available here. Before you begin, - carefully read the installation instructions.

@@ -57,7 +57,7 @@ offer another support channel. Many users have written various tutorials and lots of new users receive help there.

-

  • Search the +

  • You can search the Handbook and FAQ, the whole web site, or the &os; mailing list archives.

    • @@ -85,7 +85,7 @@ user.

  • pfSense 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 diff --git a/en_US.ISO8859-1/htdocs/search/sitemap.xml b/en_US.ISO8859-1/htdocs/search/sitemap.xml index 3235fb692b..b35e7099da 100644 --- a/en_US.ISO8859-1/htdocs/search/sitemap.xml +++ b/en_US.ISO8859-1/htdocs/search/sitemap.xml @@ -375,7 +375,7 @@ - CVS Repository + Source Code Repository &base;/developers/cvs.html @@ -1314,7 +1314,7 @@ - CVS Repository + Source Code Repository &base;/developers/cvs.html diff --git a/en_US.ISO8859-1/htdocs/where.xml b/en_US.ISO8859-1/htdocs/where.xml index 2b3d07a120..dc0d615a8a 100644 --- a/en_US.ISO8859-1/htdocs/where.xml +++ b/en_US.ISO8859-1/htdocs/where.xml @@ -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.

    @@ -503,8 +503,8 @@ impressive desktop tools aimed at ease of use for the casual computer user.

    • -

  • pfSense is a free, - open source customized distribution of &os; tailored for +

  • pfSense is a + &os; based customized distribution tailored for use as a firewall and router.

    • @@ -517,9 +517,13 @@

    The &os; Ports Collection is a diverse collection of utility and application software that has been ported to &os;.

    +

    See + Installing Applications: Packages and Ports + in the Handbook.

    +