From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Aug 2018 21:29:31 +0000 (-0700)
Subject: Merge tag 'docs-4.19' of git://git.lwn.net/linux
X-Git-Tag: v4.19~427
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6ecec342fefc2df01438cb0b8bacdd8641a6418;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'docs-4.19' of git://git.lwn.net/linux

Pull documentation update from Jonathan Corbet:
 "This was a moderately busy cycle for docs, with the usual collection
  of small fixes and updates.

  We also have new ktime_get_*() docs from Arnd, some kernel-doc fixes,
  a new set of Italian translations (non so se vale la pena, ma non fa
  male - speriamo bene), and some extensive early memory-management
  documentation improvements from Mike Rapoport"

* tag 'docs-4.19' of git://git.lwn.net/linux: (52 commits)
  Documentation: corrections to console/console.txt
  Documentation: add ioctl number entry for v4l2-subdev.h
  Remove gendered language from management style documentation
  scripts/kernel-doc: Escape all literal braces in regexes
  docs/mm: add description of boot time memory management
  docs/mm: memblock: add overview documentation
  docs/mm: memblock: add kernel-doc description for memblock types
  docs/mm: memblock: add kernel-doc comments for memblock_add[_node]
  docs/mm: memblock: update kernel-doc comments
  mm/memblock: add a name for memblock flags enumeration
  docs/mm: bootmem: add overview documentation
  docs/mm: bootmem: add kernel-doc description of 'struct bootmem_data'
  docs/mm: bootmem: fix kernel-doc warnings
  docs/mm: nobootmem: fixup kernel-doc comments
  mm/bootmem: drop duplicated kernel-doc comments
  Documentation: vm.txt: Adding 'nr_hugepages_mempolicy' parameter description.
  doc:it_IT: translation for kernel-hacking
  docs: Fix the reference labels in Locking.rst
  doc: tracing: Fix a typo of trace_stat
  mm: Introduce new type vm_fault_t
  ...
---

e6ecec342fefc2df01438cb0b8bacdd8641a6418
diff --cc Documentation/index.rst
index f95ba98,5d310d9..d43fcd2
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -102,40 -104,13 +104,24 @@@ implementation
  
     sh/index
  
 +Filesystem Documentation
 +------------------------
 +
 +The documentation in this section are provided by specific filesystem
 +subprojects.
 +
 +.. toctree::
 +   :maxdepth: 2
 +
 +   filesystems/ext4/index
 +
- Korean translations
- -------------------
- 
- .. toctree::
-    :maxdepth: 1
- 
-    translations/ko_KR/index
- 
- Chinese translations
- --------------------
+ Translations
+ ------------
  
  .. toctree::
-    :maxdepth: 1
- 
-    translations/zh_CN/index
- 
- Japanese translations
- ---------------------
- 
- .. toctree::
-    :maxdepth: 1
+    :maxdepth: 2
  
-    translations/ja_JP/index
+    translations/index
  
  Indices and tables
  ==================