diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-02-19 15:51:31 +0000 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-02-19 15:52:49 +0000 |
| commit | b70cb0d0a21394d5d6b00b51f064115c2724cea8 (patch) | |
| tree | f001381d2ee826e6665e003e7c6dccb084a54316 /Documentation | |
| parent | f1b0adb46b2c193e940f8c22b35036d2ee76c673 (diff) | |
New upstream releasedebian/4.15.1-1archive/debian/4.15.1-1
Diffstat (limited to 'Documentation')
32 files changed, 39 insertions, 16 deletions
diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index bdc3dc3f..64947afb 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -46,8 +46,21 @@ man3dir = $(mandir)/man3 man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 +ifeq (@ASCIIDOC_TOOL@,asciidoc) ASCIIDOC = @ASCIIDOC@ -ASCIIDOC_EXTRA = +ASCIIDOC_ARGS = -abtrfs_version=$(BTRFS_VERSION) -f asciidoc.conf +ASCIIDOC_HTML = html +ASCIIDOC_DOCBOOK = docbook +ASCIIDOC_DEPS = asciidoc.conf +endif +ifeq (@ASCIIDOC_TOOL@,asciidoctor) +ASCIIDOC = @ASCIIDOCTOR@ +ASCIIDOC_ARGS = -abtrfs_version=$(BTRFS_VERSION) +ASCIIDOC_HTML = xhtml5 +ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DEPS = +endif + MANPAGE_XSL = manpage-normal.xsl XMLTO = @XMLTO@ XMLTO_EXTRA = @@ -98,7 +111,7 @@ uninstall: $(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir) clean: - $(QUIET_RM)$(RM) -f *.xml *.xml+ *.5 *.5.gz *.8 *.8.gz *.html + $(QUIET_RM)$(RM) -f *.xml *.xml+ *.3 *.3.gz *.5 *.5.gz *.8 *.8.gz *.html %.3.gz : %.3 $(QUIET_GZIP)$(GZIPCMD) -n -c $< > $@ @@ -121,16 +134,12 @@ clean: $(QUIET_XMLTO)$(RM) -f $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.asciidoc asciidoc.conf +%.xml : %.asciidoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) -f $@+ $@ && \ - $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \ - $(ASCIIDOC_EXTRA) -abtrfs_version=$(BTRFS_VERSION) \ - -o $@+ $< && \ + $(ASCIIDOC) $(ASCIIDOC_ARGS) -b $(ASCIIDOC_DOCBOOK) -d manpage -o $@+ $< && \ $(MV) $@+ $@ -%.html : %.asciidoc asciidoc.conf +%.html : %.asciidoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) -f $@+ $@ && \ - $(ASCIIDOC) -b html -d article -f asciidoc.conf \ - $(ASCIIDOC_EXTRA) -abtrfs_version=$(BTRFS_VERSION) \ - -o $@+ $< && \ + $(ASCIIDOC) $(ASCIIDOC_ARGS) -b $(ASCIIDOC_HTML) -d article -o $@+ $< && \ $(MV) $@+ $@ diff --git a/Documentation/btrfs-balance.8.gz b/Documentation/btrfs-balance.8.gz Binary files differindex e2344c16..4e7ff56e 100644 --- a/Documentation/btrfs-balance.8.gz +++ b/Documentation/btrfs-balance.8.gz diff --git a/Documentation/btrfs-check.8.gz b/Documentation/btrfs-check.8.gz Binary files differindex 475ea594..fde8c5fb 100644 --- a/Documentation/btrfs-check.8.gz +++ b/Documentation/btrfs-check.8.gz diff --git a/Documentation/btrfs-convert.8.gz b/Documentation/btrfs-convert.8.gz Binary files differindex f361a835..2a283976 100644 --- a/Documentation/btrfs-convert.8.gz +++ b/Documentation/btrfs-convert.8.gz diff --git a/Documentation/btrfs-device.8.gz b/Documentation/btrfs-device.8.gz Binary files differindex 785a0046..d2f09280 100644 --- a/Documentation/btrfs-device.8.gz +++ b/Documentation/btrfs-device.8.gz diff --git a/Documentation/btrfs-filesystem.8.gz b/Documentation/btrfs-filesystem.8.gz Binary files differindex 727f2421..2955df08 100644 --- a/Documentation/btrfs-filesystem.8.gz +++ b/Documentation/btrfs-filesystem.8.gz diff --git a/Documentation/btrfs-filesystem.asciidoc b/Documentation/btrfs-filesystem.asciidoc index 961405ba..13c2d7cc 100644 --- a/Documentation/btrfs-filesystem.asciidoc +++ b/Documentation/btrfs-filesystem.asciidoc @@ -361,7 +361,7 @@ specify the devid though. *$ btrfs filesystem resize 1:max /path* Let's assume that devid 1 exists and the filesystem does not occupy the whole -block device, eg. it has been enlarged and we wan the grow the filesystem. By +block device, eg. it has been enlarged and we want to grow the filesystem. By simply using 'max' as size we will achieve that. NOTE: There are two ways to minimize the filesystem on a given device. The diff --git a/Documentation/btrfs-find-root.8.gz b/Documentation/btrfs-find-root.8.gz Binary files differindex c90e2244..11c03171 100644 --- a/Documentation/btrfs-find-root.8.gz +++ b/Documentation/btrfs-find-root.8.gz diff --git a/Documentation/btrfs-image.8.gz b/Documentation/btrfs-image.8.gz Binary files differindex e5591ab1..be540124 100644 --- a/Documentation/btrfs-image.8.gz +++ b/Documentation/btrfs-image.8.gz diff --git a/Documentation/btrfs-inspect-internal.8.gz b/Documentation/btrfs-inspect-internal.8.gz Binary files differindex b8147ecf..318ac56d 100644 --- a/Documentation/btrfs-inspect-internal.8.gz +++ b/Documentation/btrfs-inspect-internal.8.gz diff --git a/Documentation/btrfs-ioctl.asciidoc b/Documentation/btrfs-ioctl.asciidoc index 11bf62b1..09c76fef 100644 --- a/Documentation/btrfs-ioctl.asciidoc +++ b/Documentation/btrfs-ioctl.asciidoc @@ -1,5 +1,5 @@ btrfs-ioctl(3) -================ +============== NAME ---- diff --git a/Documentation/btrfs-man5.asciidoc b/Documentation/btrfs-man5.asciidoc index 1f444d73..367736ce 100644 --- a/Documentation/btrfs-man5.asciidoc +++ b/Documentation/btrfs-man5.asciidoc @@ -1,5 +1,5 @@ btrfs-man5(5) -============== +============= NAME ---- diff --git a/Documentation/btrfs-map-logical.8.gz b/Documentation/btrfs-map-logical.8.gz Binary files differindex a1ae0432..2f9a9c12 100644 --- a/Documentation/btrfs-map-logical.8.gz +++ b/Documentation/btrfs-map-logical.8.gz diff --git a/Documentation/btrfs-property.8.gz b/Documentation/btrfs-property.8.gz Binary files differindex d8ecdf79..b05b0a6d 100644 --- a/Documentation/btrfs-property.8.gz +++ b/Documentation/btrfs-property.8.gz diff --git a/Documentation/btrfs-qgroup.8.gz b/Documentation/btrfs-qgroup.8.gz Binary files differindex a493240d..f76382ef 100644 --- a/Documentation/btrfs-qgroup.8.gz +++ b/Documentation/btrfs-qgroup.8.gz diff --git a/Documentation/btrfs-quota.8.gz b/Documentation/btrfs-quota.8.gz Binary files differindex 5a94e29f..45c9b665 100644 --- a/Documentation/btrfs-quota.8.gz +++ b/Documentation/btrfs-quota.8.gz diff --git a/Documentation/btrfs-receive.8.gz b/Documentation/btrfs-receive.8.gz Binary files differindex c842f36e..f0d644e8 100644 --- a/Documentation/btrfs-receive.8.gz +++ b/Documentation/btrfs-receive.8.gz diff --git a/Documentation/btrfs-replace.8.gz b/Documentation/btrfs-replace.8.gz Binary files differindex c5d3d449..fe411c4f 100644 --- a/Documentation/btrfs-replace.8.gz +++ b/Documentation/btrfs-replace.8.gz diff --git a/Documentation/btrfs-replace.asciidoc b/Documentation/btrfs-replace.asciidoc index 35ecb1f8..bc73b0b7 100644 --- a/Documentation/btrfs-replace.asciidoc +++ b/Documentation/btrfs-replace.asciidoc @@ -1,5 +1,5 @@ btrfs-replace(8) -=============== +================ NAME ---- diff --git a/Documentation/btrfs-rescue.8.gz b/Documentation/btrfs-rescue.8.gz Binary files differindex 11ea6215..061456ac 100644 --- a/Documentation/btrfs-rescue.8.gz +++ b/Documentation/btrfs-rescue.8.gz diff --git a/Documentation/btrfs-rescue.asciidoc b/Documentation/btrfs-rescue.asciidoc index 743a23a6..f94a0ff2 100644 --- a/Documentation/btrfs-rescue.asciidoc +++ b/Documentation/btrfs-rescue.asciidoc @@ -1,5 +1,5 @@ btrfs-rescue(8) -============== +=============== NAME ---- diff --git a/Documentation/btrfs-restore.8.gz b/Documentation/btrfs-restore.8.gz Binary files differindex c4c2b201..75181ba5 100644 --- a/Documentation/btrfs-restore.8.gz +++ b/Documentation/btrfs-restore.8.gz diff --git a/Documentation/btrfs-scrub.8.gz b/Documentation/btrfs-scrub.8.gz Binary files differindex 56b3a58f..331c1a9b 100644 --- a/Documentation/btrfs-scrub.8.gz +++ b/Documentation/btrfs-scrub.8.gz diff --git a/Documentation/btrfs-select-super.8.gz b/Documentation/btrfs-select-super.8.gz Binary files differindex e19b070f..d1bd2502 100644 --- a/Documentation/btrfs-select-super.8.gz +++ b/Documentation/btrfs-select-super.8.gz diff --git a/Documentation/btrfs-send.8.gz b/Documentation/btrfs-send.8.gz Binary files differindex e7afb09a..808a4bb2 100644 --- a/Documentation/btrfs-send.8.gz +++ b/Documentation/btrfs-send.8.gz diff --git a/Documentation/btrfs-subvolume.8.gz b/Documentation/btrfs-subvolume.8.gz Binary files differindex 9ae7d367..ba8ff190 100644 --- a/Documentation/btrfs-subvolume.8.gz +++ b/Documentation/btrfs-subvolume.8.gz diff --git a/Documentation/btrfs.5.gz b/Documentation/btrfs.5.gz Binary files differindex f0dbd468..c33db2bb 100644 --- a/Documentation/btrfs.5.gz +++ b/Documentation/btrfs.5.gz diff --git a/Documentation/btrfs.8.gz b/Documentation/btrfs.8.gz Binary files differindex 13d14727..1ad76a10 100644 --- a/Documentation/btrfs.8.gz +++ b/Documentation/btrfs.8.gz diff --git a/Documentation/btrfstune.8.gz b/Documentation/btrfstune.8.gz Binary files differindex 9de752e8..2a4babfc 100644 --- a/Documentation/btrfstune.8.gz +++ b/Documentation/btrfstune.8.gz diff --git a/Documentation/fsck.btrfs.8.gz b/Documentation/fsck.btrfs.8.gz Binary files differindex 1275946e..e47e730c 100644 --- a/Documentation/fsck.btrfs.8.gz +++ b/Documentation/fsck.btrfs.8.gz diff --git a/Documentation/mkfs.btrfs.8.gz b/Documentation/mkfs.btrfs.8.gz Binary files differindex c455e9ea..36275e8b 100644 --- a/Documentation/mkfs.btrfs.8.gz +++ b/Documentation/mkfs.btrfs.8.gz diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc index f69c529d..2a1c3592 100644 --- a/Documentation/mkfs.btrfs.asciidoc +++ b/Documentation/mkfs.btrfs.asciidoc @@ -100,7 +100,21 @@ Please see the mount option 'discard' for that in `btrfs`(5). *-r|--rootdir <rootdir>*:: Populate the toplevel subvolume with files from 'rootdir'. This does not -require root permissions and does not mount the filesystem. +require root permissions to write the new files or to mount the filesystem. ++ +NOTE: This option may enlarge the image or file to ensure it's big enough to +contain the files from 'rootdir'. Since version 4.14.1 the filesystem size is +not minimized. Please see option '--shrink' if you need that functionality. + +*--shrink*:: +Shrink the filesystem to its minimal size, only works with '--rootdir' option. ++ +If the destination is a regular file, this option will also truncate the +file to the minimal size. Otherwise it will reduce the filesystem available +space. Extra space will not be usable unless the filesystem is mounted and +resized using 'btrfs filesystem resize'. ++ +NOTE: prior to version 4.14.1, the shrinking was done automatically. *-O|--features <feature1>[,<feature2>...]*:: A list of filesystem features turned on at mkfs time. Not all features are |