[v2] btrfs-progs: small fixes/cleanup in Documentation
diff mbox series

Message ID 20191018161433.148176-1-merlin.buege@tuhh.de
State New
Headers show
Series
  • [v2] btrfs-progs: small fixes/cleanup in Documentation
Related show

Commit Message

Merlin Büge Oct. 18, 2019, 4:14 p.m. UTC
The removed paragraph in btrfs-man5.asciidoc says the same as the
previous one.

Signed-off-by: Merlin Büge <merlin.buege@tuhh.de>
---
v2:
 - added SOB line
 - one more typo fix in Documentation/btrfs-man5.asciidoc

 Documentation/btrfs-man5.asciidoc |  8 +-------
 Documentation/mkfs.btrfs.asciidoc | 10 +++++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

Comments

Merlin Büge Oct. 18, 2019, 4:23 p.m. UTC | #1
On Fri, 18 Oct 2019 18:14:33 +0200
Merlin Büge <merlin.buege@tuhh.de> wrote:
...
> diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc
> index 6a1a04b7..ee6010fe 100644
> --- a/Documentation/btrfs-man5.asciidoc
> +++ b/Documentation/btrfs-man5.asciidoc
...
> @@ -659,7 +653,7 @@ swapfile extents or may fail:
...
> -* device replace - dtto
> +* device replace - ditto

I think I may have got that last one wrong, sorry.
I've never seen it spelled 'dtto', but I now see further references e.g.
here:
https://github.com/kdave/btrfs-progs/blob/master/Makefile

So, feel free to pick v1/v2 which you find the most appropriate!

Thanks.
David Sterba Oct. 21, 2019, 12:30 p.m. UTC | #2
On Fri, Oct 18, 2019 at 06:23:31PM +0200, Merlin Büge wrote:
> 
> 
> On Fri, 18 Oct 2019 18:14:33 +0200
> Merlin Büge <merlin.buege@tuhh.de> wrote:
> ...
> > diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc
> > index 6a1a04b7..ee6010fe 100644
> > --- a/Documentation/btrfs-man5.asciidoc
> > +++ b/Documentation/btrfs-man5.asciidoc
> ...
> > @@ -659,7 +653,7 @@ swapfile extents or may fail:
> ...
> > -* device replace - dtto
> > +* device replace - ditto
> 
> I think I may have got that last one wrong, sorry.
> I've never seen it spelled 'dtto', but I now see further references e.g.
> here:
> https://github.com/kdave/btrfs-progs/blob/master/Makefile
> 
> So, feel free to pick v1/v2 which you find the most appropriate!

I've merged the patch as-is, thank. The 'ditto' spelling is probably
more widely used in english texts. 'dtto' is in sources and thus not
visible to wide audience so we can live with that.
Merlin Büge Oct. 21, 2019, 12:59 p.m. UTC | #3
On Mon, 21 Oct 2019 14:30:50 +0200
David Sterba <dsterba@suse.cz> wrote:
...
> I've merged the patch as-is, thank. The 'ditto' spelling is probably
> more widely used in english texts. 'dtto' is in sources and thus not
> visible to wide audience so we can live with that.

Thank you!

Patch
diff mbox series

diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc
index 6a1a04b7..ee6010fe 100644
--- a/Documentation/btrfs-man5.asciidoc
+++ b/Documentation/btrfs-man5.asciidoc
@@ -224,12 +224,6 @@  during a period of low system activity will prevent latent interference with
 the performance of other operations. Also, a device may ignore the TRIM command
 if the range is too small, so running a batch discard has a greater probability
 of actually discarding the blocks.
-+
-If discarding is not necessary to be done at the block freeing time, there's
-`fstrim`(8) tool that lets the filesystem discard all free blocks in a batch,
-possibly not much interfering with other operations. Also, the device may
-ignore the TRIM command if the range is too small, so running the batch discard
-can actually discard the blocks.
 
 *enospc_debug*::
 *noenospc_debug*::
@@ -659,7 +653,7 @@  swapfile extents or may fail:
 * resize shrink - works as long as the extents are outside of the shrunk range
 * device add - a new device does not interfere with existing swapfile and this operation will work, though no new swapfile can be activated afterwards
 * device delete - if the device has been added as above, it can be also deleted
-* device replace - dtto
+* device replace - ditto
  
 When there are no active swapfiles and a whole-filesystem exclusive operation
 is running (ie. balance, device delete, shrink), the swapfiles cannot be
diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc
index 2a1c3592..ef3eb13f 100644
--- a/Documentation/mkfs.btrfs.asciidoc
+++ b/Documentation/mkfs.btrfs.asciidoc
@@ -27,17 +27,17 @@  mkfs.btrfs uses the entire device space for the filesystem.
 
 *-d|--data <profile>*::
 Specify the profile for the data block groups.  Valid values are 'raid0',
-'raid1', 'raid5', 'raid6', 'raid10' or 'single' or dup (case does not matter).
+'raid1', 'raid5', 'raid6', 'raid10' or 'single' or 'dup' (case does not matter).
 +
-See 'DUP PROFILES ON A SINGLE DEVICE' for more.
+See 'DUP PROFILES ON A SINGLE DEVICE' for more details.
 
 *-m|--metadata <profile>*::
 Specify the profile for the metadata block groups.
 Valid values are 'raid0', 'raid1', 'raid5', 'raid6', 'raid10', 'single' or
-'dup', (case does not matter).
+'dup' (case does not matter).
 +
-A single device filesystem will default to 'DUP', unless a SSD is detected. Then
-it will default to 'single'. The detection is based on the value of
+A single device filesystem will default to 'DUP', unless an SSD is detected, in which
+case it will default to 'single'. The detection is based on the value of
 `/sys/block/DEV/queue/rotational`, where 'DEV' is the short name of the device.
 +
 Note that the rotational status can be arbitrarily set by the underlying block