From owner-svn-doc-projects@FreeBSD.ORG Sat May 17 03:35:45 2014 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9CE1C02; Sat, 17 May 2014 03:35:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C72F12764; Sat, 17 May 2014 03:35:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H3Zj0c050422; Sat, 17 May 2014 03:35:45 GMT (envelope-from bcr@svn.freebsd.org) Received: (from bcr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H3Zjrs050421; Sat, 17 May 2014 03:35:45 GMT (envelope-from bcr@svn.freebsd.org) Message-Id: <201405170335.s4H3Zjrs050421@svn.freebsd.org> From: Benedict Reuschling Date: Sat, 17 May 2014 03:35:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r44850 - projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 03:35:45 -0000 Author: bcr Date: Sat May 17 03:35:45 2014 New Revision: 44850 URL: http://svnweb.freebsd.org/changeset/doc/44850 Log: Fixes to grammar and language for the section on snapshots and clones that I added a while back. Submitted by: bjk Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 02:50:17 2014 (r44849) +++ projects/zfsupdate-201307/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Sat May 17 03:35:45 2014 (r44850) @@ -1325,28 +1325,28 @@ tank custom:costcenter - snapshots only on whole datasets, not on individual files or directories. When a snapshot is created from a dataset, everything contained in it, including the filesystem - properties, files, directories, permissions, etc. are + properties, files, directories, permissions, etc., is duplicated. - Snapshots provide a variety of uses that other filesystems - with snapshot functionality do not have. A typical example - for snapshots is to have a quick way of backing up the current - state of the filesystem when a risky action like a software - installation or a system upgrade is performed. When the - action fails, the snapshot can be rolled back and the system - has the same state as when the snapshot was created. If the - upgrade was successful, the snapshot can be deleted to free up - space. Without snapshots and a failed upgrade a restore from - backup is often required, which is tedious, time consuming and - may require a downtime in which the system cannot be used as - normal. Snapshots can be rolled back quickly and can be done - when the system is running in normal operation, with little or - no downtime. The time savings are enormous considering - multi-terabyte storage systems and the time required to copy - the data from backup. Snapshots are not a replacement for a - complete backup of a pool, but can be used as a quick and easy - way to store a copy of the dataset at a specific point in - time. + ZFS Snapshots provide a variety of uses that other + filesystems with snapshot functionality do not have. A + typical example for snapshots is to have a quick way of + backing up the current state of the filesystem when a risky + action like a software installation or a system upgrade is + performed. When the action fails, the snapshot can be rolled + back and the system has the same state as when the snapshot + was created. If the upgrade was successful, the snapshot can + be deleted to free up space. Without snapshots, when a failed + upgrade occurs, a restore from backup is often required, which + is tedious, time consuming and may require a downtime in which + the system cannot be used as normal. Snapshots can be rolled + back quickly and can be taken when the system is running in + normal operation, with little or no downtime. The time + savings are enormous considering multi-terabyte storage + systems and the time required to copy the data from backup. + Snapshots are not a replacement for a complete backup of a + pool, but can be used as a quick and easy way to store a copy + of the dataset at a specific point in time. Creating Snapshots @@ -1372,9 +1372,9 @@ bigpool/work/joe@backup 0 - 8 MOUNTPOINT column. Additionally, there is no mention of available disk space in the AVAIL column as snapshots cannot be - written after they are created. It becomes more clear when - comparing the snapshot with the original dataset from which - it was created: + written to after they are created. It becomes more clear + when comparing the snapshot with the original dataset from + which it was created: &prompt.root; zfs list -rt all bigpool/work/joe NAME USED AVAIL REFER MOUNTPOINT @@ -1489,13 +1489,13 @@ M /usr/home/bcr/ Once at least one snapshot is available, it can be rolled back to at any time. Most of the time this is the case when the current state of the dataset is no longer - required and an older version is preferred. Scenarios like - local development tests have gone wrong, botched system - updates hamper the systems overall functionality or the + required and an older version is preferred. Scenarios such + as local development tests have gone wrong, botched system + updates hampering the system's overall functionality, or the requirement to restore accidentally deleted files or - directories are all too common occurances. Luckily, rolling - back a snapshot is just as easy as typing zfs - rollback + directories are all too common occurrences. Luckily, + rolling back a snapshot is just as easy as typing + zfs rollback snapshotname. Depending on how many changes are involved, the operation will finish in a certain amout of time. During that time, @@ -1592,8 +1592,8 @@ santaletter.txt that controls whether these hidden directories show up in a directory listing. Setting the property to visible will let them show up in the - output of ls and any other that deal with - directory contents. + output of ls and any others that deal + with directory contents. &prompt.root; zfs get snapdir bigpool/work/joe NAME PROPERTY VALUE SOURCE @@ -1730,7 +1730,7 @@ NAME PROPERTY VALUE camino/home/joenew origin - - After making some changes like copying - loader.conf to the promoted clone for + loader.conf to the promoted clone, for example, the old directory becomes obsolete in this case. Instead, the promoted clone should replace it. This can be achieved by two consecutive commands: zfs