diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 14:25:08 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 14:25:08 -0600 |
commit | 24844fd33945470942c954324ad2c655929000cc (patch) | |
tree | 391b2999f1900e0ca93349000fd8b334a77615c7 /Documentation/index.rst | |
parent | Documentation: ftrace: clarify filters with dynamic ftrace and graph (diff) | |
parent | docs/vm: add index.rst and link MM documentation to top level index (diff) | |
download | linux-24844fd33945470942c954324ad2c655929000cc.tar.gz linux-24844fd33945470942c954324ad2c655929000cc.tar.bz2 linux-24844fd33945470942c954324ad2c655929000cc.zip |
Merge branch 'mm-rst' into docs-next
Mike Rapoport says:
These patches convert files in Documentation/vm to ReST format, add an
initial index and link it to the top level documentation.
There are no contents changes in the documentation, except few spelling
fixes. The relatively large diffstat stems from the indentation and
paragraph wrapping changes.
I've tried to keep the formatting as consistent as possible, but I could
miss some places that needed markup and add some markup where it was not
necessary.
[jc: significant conflicts in vm/hmm.rst]
Diffstat (limited to 'Documentation/index.rst')
-rw-r--r-- | Documentation/index.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst index 3b99ab931d41..fdc585703498 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -45,7 +45,7 @@ the kernel interface as seen by application developers. .. toctree:: :maxdepth: 2 - userspace-api/index + userspace-api/index Introduction to kernel development @@ -89,6 +89,7 @@ needed). sound/index crypto/index filesystems/index + vm/index Architecture-specific documentation ----------------------------------- |