diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 22:25:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 22:25:25 -0500 |
| commit | 255442c93843f52b6891b21d0b485bf2c97f93c3 (patch) | |
| tree | 8fd1daa752dbfa4721f64421ab7d4e695605d9f7 /fs/ext2 | |
| parent | d76e0a050e0f5e7c00e6d334f758178bbc16eb98 (diff) | |
| parent | ae17a87dd7c79fa742ef5dcf06d1095eec4e1925 (diff) | |
Merge tag 'docs-4.16' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"Documentation updates for 4.16.
New stuff includes refcount_t documentation, errseq documentation,
kernel-doc support for nested structure definitions, the removal of
lots of crufty kernel-doc support for unused formats, SPDX tag
documentation, the beginnings of a manual for subsystem maintainers,
and lots of fixes and updates.
As usual, some of the changesets reach outside of Documentation/ to
effect kerneldoc comment fixes. It also adds the new LICENSES
directory, of which Thomas promises I do not need to be the
maintainer"
* tag 'docs-4.16' of git://git.lwn.net/linux: (65 commits)
linux-next: docs-rst: Fix typos in kfigure.py
linux-next: DOC: HWPOISON: Fix path to debugfs in hwpoison.txt
Documentation: Fix misconversion of #if
docs: add index entry for networking/msg_zerocopy
Documentation: security/credentials.rst: explain need to sort group_list
LICENSES: Add MPL-1.1 license
LICENSES: Add the GPL 1.0 license
LICENSES: Add Linux syscall note exception
LICENSES: Add the MIT license
LICENSES: Add the BSD-3-clause "Clear" license
LICENSES: Add the BSD 3-clause "New" or "Revised" License
LICENSES: Add the BSD 2-clause "Simplified" license
LICENSES: Add the LGPL-2.1 license
LICENSES: Add the LGPL 2.0 license
LICENSES: Add the GPL 2.0 license
Documentation: Add license-rules.rst to describe how to properly identify file licenses
scripts: kernel_doc: better handle show warnings logic
fs/*/Kconfig: drop links to 404-compliant http://acl.bestbits.at
doc: md: Fix a file name to md-fault.c in fault-injection.txt
errseq: Add to documentation tree
...
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/Kconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig index c634874e12d9..894e4c53d1d2 100644 --- a/fs/ext2/Kconfig +++ b/fs/ext2/Kconfig | |||
| @@ -13,8 +13,7 @@ config EXT2_FS_XATTR | |||
| 13 | depends on EXT2_FS | 13 | depends on EXT2_FS |
| 14 | help | 14 | help |
| 15 | Extended attributes are name:value pairs associated with inodes by | 15 | Extended attributes are name:value pairs associated with inodes by |
| 16 | the kernel or by users (see the attr(5) manual page, or visit | 16 | the kernel or by users (see the attr(5) manual page for details). |
| 17 | <http://acl.bestbits.at/> for details). | ||
| 18 | 17 | ||
| 19 | If unsure, say N. | 18 | If unsure, say N. |
| 20 | 19 | ||
| @@ -26,9 +25,6 @@ config EXT2_FS_POSIX_ACL | |||
| 26 | Posix Access Control Lists (ACLs) support permissions for users and | 25 | Posix Access Control Lists (ACLs) support permissions for users and |
| 27 | groups beyond the owner/group/world scheme. | 26 | groups beyond the owner/group/world scheme. |
| 28 | 27 | ||
| 29 | To learn more about Access Control Lists, visit the Posix ACLs for | ||
| 30 | Linux website <http://acl.bestbits.at/>. | ||
| 31 | |||
| 32 | If you don't know what Access Control Lists are, say N | 28 | If you don't know what Access Control Lists are, say N |
| 33 | 29 | ||
| 34 | config EXT2_FS_SECURITY | 30 | config EXT2_FS_SECURITY |
