From d56ba626eecc8b486399350632a679f94d138ea0 Mon Sep 17 00:00:00 2001 From: Jaromir Hradilek Date: Dec 22 2011 12:49:06 +0000 Subject: Minor adjustments. --- diff --git a/en-US/Preface.xml b/en-US/Preface.xml index 19c42d8..d606a61 100644 --- a/en-US/Preface.xml +++ b/en-US/Preface.xml @@ -235,7 +235,7 @@ is based on an article written by Michael Solberg. - The authors of this book would like to thank the following people for their valuable contributions: Adam Tkáč, Andrew Fitzsimon, Andrius Benokraitis, Brian Cleary Edward Bailey, Garrett LeSage, Jeffrey Fearn, Joe Orton, Joshua Wulf, Karsten Wade, Lucy Ringland, Marcela Mašláňová, Mark Johnson, Michael Behm, Miroslav Lichvár, Radek Vokál, Rahul Kavalapara, Rahul Sundaram, Sandra Moore, Zbyšek Mráz, Jan Včelák, Peter Hutterer, and James Antill, among many others. + The authors of this book would like to thank the following people for their valuable contributions: Adam Tkáč, Andrew Fitzsimon, Andrius Benokraitis, Brian Cleary Edward Bailey, Garrett LeSage, Jeffrey Fearn, Joe Orton, Joshua Wulf, Karsten Wade, Lucy Ringland, Marcela Mašláňová, Mark Johnson, Michael Behm, Miroslav Lichvár, Radek Vokál, Rahul Kavalapara, Rahul Sundaram, Sandra Moore, Zbyšek Mráz, Jan Včelák, Peter Hutterer, T.C. Hollingsworth, and James Antill, among many others. diff --git a/en-US/The_proc_File_System.xml b/en-US/The_proc_File_System.xml index d35c0d6..430bb3d 100644 --- a/en-US/The_proc_File_System.xml +++ b/en-US/The_proc_File_System.xml @@ -5145,12 +5145,10 @@ kernel.sysrq = 1 - Each time the system boots, systemd executes sysctl using /etc/sysctl.conf - to determine the values passed to the kernel.Any values added /etc/sysctl.conf therefore take effect each time - the system boots. Additionally, systemd checks several directories for values, including - /etc/sysctl.d, reading values from any file ending in .conf. This directory can be used to - organize values into different files, and also permits them to be easily disabled by simply changing the extension of the file. - A complete list of directories read by systemd is located in the sysctl.d(5) man page. + Each time the system boots, systemd executes sysctl using the /etc/sysctl.conf configuration file to determine the values passed to the kernel. Any values added to /etc/sysctl.conf therefore take effect each time the system boots. + + + Additionally, systemd determines the contents of several directories including /etc/sysctl.d/ and reads values from any file with the .conf extension. The /etc/sysctl.d/ directory can be used to organize values into different files, and also permits them to be disabled by changing the extension of the file. For a complete list of directories read by systemd, refer to the sysctl.d(5) manual page.