Place README, REPORTING-BUGS, SecurityBugs and kernel-parameters
on an user's manual book.

As we'll be numbering the user's manual, remove the manual
numbering from SecurityBugs.

Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
---
 README => Documentation/admin-guide/README.rst     |  0
 .../{bad_memory.txt => admin-guide/bad-memory.rst} |  0
 .../basic-profiling.rst}                           |  0
 .../binfmt-misc.rst}                               |  0
 .../braille-console.rst}                           |  0
 .../{BUG-HUNTING => admin-guide/bug-hunting.rst}   |  0
 Documentation/admin-guide/conf.py                  | 10 +++++++
 .../{devices.txt => admin-guide/devices.rst}       |  0
 .../dynamic-debug-howto.rst}                       |  0
 Documentation/admin-guide/index.rst                | 33 ++++++++++++++++++++++
 Documentation/{init.txt => admin-guide/init.rst}   |  0
 .../{initrd.txt => admin-guide/initrd.rst}         |  0
 Documentation/{java.txt => admin-guide/java.rst}   |  0
 .../kernel-parameters.rst}                         |  0
 Documentation/{md.txt => admin-guide/md.rst}       |  0
 Documentation/{mono.txt => admin-guide/mono.rst}   |  0
 .../oops-tracing.rst}                              |  0
 .../{parport.txt => admin-guide/parport.rst}       |  0
 .../{ramoops.txt => admin-guide/ramoops.rst}       |  0
 .../admin-guide/reporting-bugs.rst                 |  0
 .../security-bugs.rst}                             | 12 ++++----
 .../serial-console.rst}                            |  0
 .../sysfs-rules.rst}                               |  0
 Documentation/{sysrq.txt => admin-guide/sysrq.rst} |  0
 .../{unicode.txt => admin-guide/unicode.rst}       |  0
 .../vga-softcursor.rst}                            |  0
 Documentation/conf.py                              |  2 ++
 Documentation/index.rst                            |  1 +
 28 files changed, 52 insertions(+), 6 deletions(-)
 rename README => Documentation/admin-guide/README.rst (100%)
 rename Documentation/{bad_memory.txt => admin-guide/bad-memory.rst} (100%)
 rename Documentation/{basic_profiling.txt => admin-guide/basic-profiling.rst} 
(100%)
 rename Documentation/{binfmt_misc.txt => admin-guide/binfmt-misc.rst} (100%)
 rename Documentation/{braille-console.txt => admin-guide/braille-console.rst} 
(100%)
 rename Documentation/{BUG-HUNTING => admin-guide/bug-hunting.rst} (100%)
 create mode 100644 Documentation/admin-guide/conf.py
 rename Documentation/{devices.txt => admin-guide/devices.rst} (100%)
 rename Documentation/{dynamic-debug-howto.txt => 
admin-guide/dynamic-debug-howto.rst} (100%)
 create mode 100644 Documentation/admin-guide/index.rst
 rename Documentation/{init.txt => admin-guide/init.rst} (100%)
 rename Documentation/{initrd.txt => admin-guide/initrd.rst} (100%)
 rename Documentation/{java.txt => admin-guide/java.rst} (100%)
 rename Documentation/{kernel-parameters.txt => 
admin-guide/kernel-parameters.rst} (100%)
 rename Documentation/{md.txt => admin-guide/md.rst} (100%)
 rename Documentation/{mono.txt => admin-guide/mono.rst} (100%)
 rename Documentation/{oops-tracing.txt => admin-guide/oops-tracing.rst} (100%)
 rename Documentation/{parport.txt => admin-guide/parport.rst} (100%)
 rename Documentation/{ramoops.txt => admin-guide/ramoops.rst} (100%)
 rename REPORTING-BUGS => Documentation/admin-guide/reporting-bugs.rst (100%)
 rename Documentation/{SecurityBugs => admin-guide/security-bugs.rst} (95%)
 rename Documentation/{serial-console.txt => admin-guide/serial-console.rst} 
(100%)
 rename Documentation/{sysfs-rules.txt => admin-guide/sysfs-rules.rst} (100%)
 rename Documentation/{sysrq.txt => admin-guide/sysrq.rst} (100%)
 rename Documentation/{unicode.txt => admin-guide/unicode.rst} (100%)
 rename Documentation/{VGA-softcursor.txt => admin-guide/vga-softcursor.rst} 
(100%)

diff --git a/README b/Documentation/admin-guide/README.rst
similarity index 100%
rename from README
rename to Documentation/admin-guide/README.rst
diff --git a/Documentation/bad_memory.txt 
b/Documentation/admin-guide/bad-memory.rst
similarity index 100%
rename from Documentation/bad_memory.txt
rename to Documentation/admin-guide/bad-memory.rst
diff --git a/Documentation/basic_profiling.txt 
b/Documentation/admin-guide/basic-profiling.rst
similarity index 100%
rename from Documentation/basic_profiling.txt
rename to Documentation/admin-guide/basic-profiling.rst
diff --git a/Documentation/binfmt_misc.txt 
b/Documentation/admin-guide/binfmt-misc.rst
similarity index 100%
rename from Documentation/binfmt_misc.txt
rename to Documentation/admin-guide/binfmt-misc.rst
diff --git a/Documentation/braille-console.txt 
b/Documentation/admin-guide/braille-console.rst
similarity index 100%
rename from Documentation/braille-console.txt
rename to Documentation/admin-guide/braille-console.rst
diff --git a/Documentation/BUG-HUNTING 
b/Documentation/admin-guide/bug-hunting.rst
similarity index 100%
rename from Documentation/BUG-HUNTING
rename to Documentation/admin-guide/bug-hunting.rst
diff --git a/Documentation/admin-guide/conf.py 
b/Documentation/admin-guide/conf.py
new file mode 100644
index 000000000000..86f738953799
--- /dev/null
+++ b/Documentation/admin-guide/conf.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8; mode: python -*-
+
+project = 'Linux Kernel User Documentation'
+
+tags.add("subproject")
+
+latex_documents = [
+    ('index', 'linux-user.tex', 'Linux Kernel User Documentation',
+     'The kernel development community', 'manual'),
+]
diff --git a/Documentation/devices.txt b/Documentation/admin-guide/devices.rst
similarity index 100%
rename from Documentation/devices.txt
rename to Documentation/admin-guide/devices.rst
diff --git a/Documentation/dynamic-debug-howto.txt 
b/Documentation/admin-guide/dynamic-debug-howto.rst
similarity index 100%
rename from Documentation/dynamic-debug-howto.txt
rename to Documentation/admin-guide/dynamic-debug-howto.rst
diff --git a/Documentation/admin-guide/index.rst 
b/Documentation/admin-guide/index.rst
new file mode 100644
index 000000000000..4d87487ba40c
--- /dev/null
+++ b/Documentation/admin-guide/index.rst
@@ -0,0 +1,33 @@
+Linux Kernel User's Documentation
+=================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+   :numbered:
+
+   README
+   reporting-bugs
+   bug-hunting
+   oops-tracing
+   ramoops
+   initrd
+   init
+   dynamic-debug-howto
+   security-bugs
+   kernel-parameters
+   serial-console
+   braille-console
+   parport
+   md
+   sysrq
+   unicode
+   vga-softcursor
+   sysfs-rules
+   devices
+   binfmt-misc
+   mono
+   java
+   bad-memory
+   basic-profiling
diff --git a/Documentation/init.txt b/Documentation/admin-guide/init.rst
similarity index 100%
rename from Documentation/init.txt
rename to Documentation/admin-guide/init.rst
diff --git a/Documentation/initrd.txt b/Documentation/admin-guide/initrd.rst
similarity index 100%
rename from Documentation/initrd.txt
rename to Documentation/admin-guide/initrd.rst
diff --git a/Documentation/java.txt b/Documentation/admin-guide/java.rst
similarity index 100%
rename from Documentation/java.txt
rename to Documentation/admin-guide/java.rst
diff --git a/Documentation/kernel-parameters.txt 
b/Documentation/admin-guide/kernel-parameters.rst
similarity index 100%
rename from Documentation/kernel-parameters.txt
rename to Documentation/admin-guide/kernel-parameters.rst
diff --git a/Documentation/md.txt b/Documentation/admin-guide/md.rst
similarity index 100%
rename from Documentation/md.txt
rename to Documentation/admin-guide/md.rst
diff --git a/Documentation/mono.txt b/Documentation/admin-guide/mono.rst
similarity index 100%
rename from Documentation/mono.txt
rename to Documentation/admin-guide/mono.rst
diff --git a/Documentation/oops-tracing.txt 
b/Documentation/admin-guide/oops-tracing.rst
similarity index 100%
rename from Documentation/oops-tracing.txt
rename to Documentation/admin-guide/oops-tracing.rst
diff --git a/Documentation/parport.txt b/Documentation/admin-guide/parport.rst
similarity index 100%
rename from Documentation/parport.txt
rename to Documentation/admin-guide/parport.rst
diff --git a/Documentation/ramoops.txt b/Documentation/admin-guide/ramoops.rst
similarity index 100%
rename from Documentation/ramoops.txt
rename to Documentation/admin-guide/ramoops.rst
diff --git a/REPORTING-BUGS b/Documentation/admin-guide/reporting-bugs.rst
similarity index 100%
rename from REPORTING-BUGS
rename to Documentation/admin-guide/reporting-bugs.rst
diff --git a/Documentation/SecurityBugs 
b/Documentation/admin-guide/security-bugs.rst
similarity index 95%
rename from Documentation/SecurityBugs
rename to Documentation/admin-guide/security-bugs.rst
index 342d769834f6..df795e22d08b 100644
--- a/Documentation/SecurityBugs
+++ b/Documentation/admin-guide/security-bugs.rst
@@ -8,8 +8,8 @@ like to know when a security bug is found so that it can be 
fixed and
 disclosed as quickly as possible.  Please report security bugs to the
 Linux kernel security team.
 
-1) Contact
-----------
+Contact
+-------
 
 The Linux kernel security team can be contacted by email at
 <secur...@kernel.org>.  This is a private list of security officers
@@ -23,8 +23,8 @@ REPORTING-BUGS if you are unclear about what information is 
helpful.
 Any exploit code is very helpful and will not be released without
 consent from the reporter unless it has already been made public.
 
-2) Disclosure
--------------
+Disclosure
+----------
 
 The goal of the Linux kernel security team is to work with the
 bug submitter to bug resolution as well as disclosure.  We prefer
@@ -39,8 +39,8 @@ disclosure is from immediate (esp. if it's already publicly 
known)
 to a few weeks.  As a basic default policy, we expect report date to
 disclosure date to be on the order of 7 days.
 
-3) Non-disclosure agreements
-----------------------------
+Non-disclosure agreements
+-------------------------
 
 The Linux kernel security team is not a formal body and therefore unable
 to enter any non-disclosure agreements.
diff --git a/Documentation/serial-console.txt 
b/Documentation/admin-guide/serial-console.rst
similarity index 100%
rename from Documentation/serial-console.txt
rename to Documentation/admin-guide/serial-console.rst
diff --git a/Documentation/sysfs-rules.txt 
b/Documentation/admin-guide/sysfs-rules.rst
similarity index 100%
rename from Documentation/sysfs-rules.txt
rename to Documentation/admin-guide/sysfs-rules.rst
diff --git a/Documentation/sysrq.txt b/Documentation/admin-guide/sysrq.rst
similarity index 100%
rename from Documentation/sysrq.txt
rename to Documentation/admin-guide/sysrq.rst
diff --git a/Documentation/unicode.txt b/Documentation/admin-guide/unicode.rst
similarity index 100%
rename from Documentation/unicode.txt
rename to Documentation/admin-guide/unicode.rst
diff --git a/Documentation/VGA-softcursor.txt 
b/Documentation/admin-guide/vga-softcursor.rst
similarity index 100%
rename from Documentation/VGA-softcursor.txt
rename to Documentation/admin-guide/vga-softcursor.rst
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 5992ba4d9b6f..7a2ee5c6e932 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -336,6 +336,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
+    ('user/index', 'linux-user.tex', 'Linux Kernel User Documentation',
+     'The kernel development community', 'manual'),
     ('kernel-documentation', 'kernel-documentation.tex', 'The Linux Kernel 
Documentation',
      'The kernel development community', 'manual'),
     ('process/index', 'development-process.tex', 'Linux Kernel Development 
Documentation',
diff --git a/Documentation/index.rst b/Documentation/index.rst
index e1f18b3db6e4..f6a3d4766495 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -11,6 +11,7 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
+   admin-guide/index
    kernel-documentation
    process/index
    dev-tools/tools
-- 
2.7.4


--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to