summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2018-10-05 19:11:59 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-10-05 19:11:59 -0400
commitd3091215921bd4b8fdf3129bf8f733b8ca48dc80 (patch)
tree4f3b042174fcc00e198e5ce5509e35bf0efe6239
parentccd3c4373eacb044eb3832966299d13d2631f66f (diff)
docs: move ext4 administrative docs to admin-guide/
Move the ext4 mount option and other administrative stuff to the Linux administrator's guide. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--Documentation/admin-guide/ext4.rst (renamed from Documentation/filesystems/ext4/ext4.rst)2
-rw-r--r--Documentation/admin-guide/index.rst1
-rw-r--r--Documentation/conf.py2
-rw-r--r--Documentation/filesystems/ext4/index.rst1
4 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/filesystems/ext4/ext4.rst b/Documentation/admin-guide/ext4.rst
index e2b6bb7c2730..e506d3dae510 100644
--- a/Documentation/filesystems/ext4/ext4.rst
+++ b/Documentation/admin-guide/ext4.rst
@@ -1,7 +1,7 @@
.. SPDX-License-Identifier: GPL-2.0
========================
-General Information
+ext4 General Information
========================
Ext4 is an advanced level of the ext3 filesystem which incorporates
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
index 0873685bab0f..965745d5fb9a 100644
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@ -71,6 +71,7 @@ configure specific aspects of kernel behavior to your liking.
java
ras
bcache
+ ext4
pm/index
thunderbolt
LSM/index
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 05dad6bda787..4d32c01e1e16 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -383,6 +383,8 @@ latex_documents = [
'The kernel development community', 'manual'),
('filesystems/index', 'filesystems.tex', 'Linux Filesystems API',
'The kernel development community', 'manual'),
+ ('admin-guide/ext4', 'ext4-admin-guide.tex', 'ext4 Administration Guide',
+ 'ext4 Community', 'manual'),
('filesystems/ext4/index', 'ext4.tex', 'ext4 Filesystem',
'ext4 Filesystem Developers', 'manual'),
('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',
diff --git a/Documentation/filesystems/ext4/index.rst b/Documentation/filesystems/ext4/index.rst
index 71121605558c..427bc115012e 100644
--- a/Documentation/filesystems/ext4/index.rst
+++ b/Documentation/filesystems/ext4/index.rst
@@ -13,5 +13,4 @@ the ext4 community.
:maxdepth: 5
:numbered:
- ext4
ondisk/index