From 0e4fa2abfefd6fd955e8cada7caf2733dabc529e Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 16:37:31 +0000 Subject: Docs: udev.xml: Offset daemon name with commas Signed-off-by: Michael Witten --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index ae9179826a..41d9790053 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -27,8 +27,8 @@ names provide a way to reliably identify devices based on their properties or current configuration. - The udev daemon udevd - 8 receives device uevents directly from + The udev daemon, udevd + 8, receives device uevents directly from the kernel whenever a device is added or removed from the system, or it changes its state. When udev receives a device event, it matches its configured set of rules against various device attributes to identify the device. Rules that match, may -- cgit v1.2.3-54-g00ecf From 0e846301f4439b2d3b8120efe9bdd647a9c3c758 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 16:39:17 +0000 Subject: Docs: udev.xml: Remove commas (and unnecessary repetition) Signed-off-by: Michael Witten --- udev/udev.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 41d9790053..c2d3f15446 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -31,18 +31,18 @@ 8, receives device uevents directly from the kernel whenever a device is added or removed from the system, or it changes its state. When udev receives a device event, it matches its configured set of rules - against various device attributes to identify the device. Rules that match, may - provide additional device information to be stored in the udev database, or information + against various device attributes to identify the device. Rules that match may + provide additional device information to be stored in the udev database or to be used to create meaningful symlink names. - All device information udev processes, is stored in the udev database and + All device information udev processes is stored in the udev database and sent out to possible event subscribers. Access to all stored data and the event sources are provided by the library libudev. Configuration udev configuration files are placed in /etc/udev/ - and /lib/udev/. All empty lines, or lines beginning with + and /lib/udev/. All empty lines or lines beginning with '#' will be ignored. Configuration file @@ -113,7 +113,7 @@ - Assign a value to a key. Keys that represent a list, are reset + Assign a value to a key. Keys that represent a list are reset and only this single value is assigned. @@ -483,7 +483,7 @@ - Number of seconds an event will wait for operations to finish, before it + Number of seconds an event will wait for operations to finish before it will terminate itself. @@ -499,10 +499,10 @@ Apply the permissions specified in this rule to a static device node with - the specified name. Static device nodes might be provided by kernel modules, + the specified name. Static device nodes might be provided by kernel modules or copied from /lib/udev/devices. These nodes might not have - a corresponding kernel device at the time udevd is started, and allow to trigger - automatic kernel module on-demand loading. + a corresponding kernel device at the time udevd is started; they can trigger + automatic kernel module loading. @@ -574,7 +574,7 @@ , - The value of a sysfs attribute found at the device, where + The value of a sysfs attribute found at the device where all keys of the rule have matched. If the matching device does not have such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or ATTRS test selected a parent device, use the attribute from that -- cgit v1.2.3-54-g00ecf From 17fd0f60f2735cbe1bb79ba55fed55291dd61fd2 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 16:41:14 +0000 Subject: Docs: udev.xml: `are' -> `is'; the subject is `Access' Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index c2d3f15446..2fc72ca91a 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -37,7 +37,7 @@ All device information udev processes is stored in the udev database and sent out to possible event subscribers. Access to all stored data and the event - sources are provided by the library libudev. + sources is provided by the library libudev. Configuration -- cgit v1.2.3-54-g00ecf From 933b56237d1de2927d4d27a007a56b9bfeb61738 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 16:50:42 +0000 Subject: Docs: udev.xml: Use present tense Signed-off-by: Michael Witten --- udev/udev.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 2fc72ca91a..c18d009b74 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -43,7 +43,7 @@ Configuration udev configuration files are placed in /etc/udev/ and /lib/udev/. All empty lines or lines beginning with - '#' will be ignored. + '#' are ignored. Configuration file udev expects its main configuration file at /etc/udev/udev.conf. @@ -314,25 +314,25 @@ and removes the node before udev even receives any event. Changing the node name from the kernel's default creates inconsistencies and is not supported. If the kernel and NAME specify different names, - an error will be logged. Udev is only expected to handle device node + an error is logged. Udev is only expected to handle device node permissions and to create additional symlinks, not to change kernel-provided device node names. Instead of renaming a device node, SYMLINK should be used. Symlink names must never conflict with - device node names, it will result in unpredictable behavior. + device node names, it results in unpredictable behavior. - The name of a symlink targeting the node. Every matching rule will add + The name of a symlink targeting the node. Every matching rule adds this value to the list of symlinks to be created. Multiple symlinks may be specified by separating the names by the space character. In case multiple - devices claim the same name, the link will always point to the device with - the highest link_priority. If the current device goes away, the links will - be re-evaluated and the device with the next highest link_priority will own + devices claim the same name, the link always points to the device with + the highest link_priority. If the current device goes away, the links are + re-evaluated and the device with the next highest link_priority becomes the owner of the link. If no link_priority is specified, the order of the devices, and - which one of them will own the link, is undefined. Claiming the same name for + which one of them owns the link, is undefined. Claiming the same name for a symlink, which is or might be used for a device node, may result in unexpected behavior and is not supported. @@ -439,7 +439,7 @@ Import a single property from the kernel commandline. For simple flags - the value of the property will be set to '1'. + the value of the property is set to '1'. @@ -453,7 +453,7 @@ - If no option is given, udev will choose between + If no option is given, udev chooses between and based on the executable bit of the file permissions. @@ -483,8 +483,8 @@ - Number of seconds an event will wait for operations to finish before it - will terminate itself. + Number of seconds an event waits for operations to finish before + giving up and terminating itself. @@ -509,7 +509,7 @@ Watch the device node with inotify, when closed after being opened for - writing, a change uevent will be synthesised. + writing, a change uevent is synthesised. -- cgit v1.2.3-54-g00ecf From d4a7bf2583f004e23452ca84ce2e11b7be819529 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 17:25:05 +0000 Subject: Docs: udev.xml: Clarification through proper wording Signed-off-by: Michael Witten --- udev/udev.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index c18d009b74..3bf7ee8ec5 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -74,10 +74,10 @@ default rules directory /lib/udev/rules.d/, the custom rules directory /etc/udev/rules.d/ and the temporary rules directory /run/udev/rules.d/. - All rule files are sorted and processed in lexical order, regardless - in which of these directories they live. Files in - /etc/udev/rules.d/ have precedence over files with - the same name in /lib/udev/rules.d/. This can be + All rule files are collectively sorted and processed in lexical order, + regardless of the directories in which they live. However, files in + /etc/udev/rules.d/ take precedence over files with + the same name in /lib/udev/rules.d/; this can be used to ignore a default rules file if needed. Rule files must end in .rules, other extensions -- cgit v1.2.3-54-g00ecf From c3cba32f18fc73e94975692fa1e68f1db2acf4fc Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 17:28:58 +0000 Subject: Docs: udev.xml: `,' -> `;' Signed-off-by: Michael Witten --- udev/udev.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 3bf7ee8ec5..d777570eb8 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -80,8 +80,8 @@ the same name in /lib/udev/rules.d/; this can be used to ignore a default rules file if needed. - Rule files must end in .rules, other extensions - are ignored. + Rule files must have the extension .rules; other + extensions are ignored. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. @@ -508,7 +508,7 @@ - Watch the device node with inotify, when closed after being opened for + Watch the device node with inotify; when closed after being opened for writing, a change uevent is synthesised. -- cgit v1.2.3-54-g00ecf From feedf8f3ee3773b93a293c821c2b36ea7808b059 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:08:15 +0000 Subject: Docs: udev.xml: `key value' -> `key-value' Signed-off-by: Michael Witten --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index d777570eb8..fcd2fe512f 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -83,7 +83,7 @@ Rule files must have the extension .rules; other extensions are ignored. - Every line in the rules file contains at least one key value pair. + Every line in the rules file contains at least one key-value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned. @@ -92,7 +92,7 @@ pointing to the device node, or run a specified program as part of the event handling. - A rule consists of a list of one or more key value pairs separated by + A rule consists of a list of one or more key-value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are: -- cgit v1.2.3-54-g00ecf From 57c0409fcebbfc34e386cc48425f44c364d378ff Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:13:37 +0000 Subject: Docs: udev.xml: `,' -> `:' Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index fcd2fe512f..e012bf8182 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -84,7 +84,7 @@ extensions are ignored. Every line in the rules file contains at least one key-value pair. - There are two kind of keys, match and assignment keys. + There are two kind of keys: match and assignment. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned. -- cgit v1.2.3-54-g00ecf From b834042f05a821f29e3d7cdb4d9262a9b7cdfc4d Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:15:25 +0000 Subject: Docs: udev.xml: Use `assignment' consistently Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index e012bf8182..475ded701d 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -86,7 +86,7 @@ Every line in the rules file contains at least one key-value pair. There are two kind of keys: match and assignment. If all match keys are matching against its value, the rule gets applied and the - assign keys get the specified value assigned. + assignment keys get the specified value assigned. A matching rule may rename a network interface, add symlinks pointing to the device node, or run a specified program as part of -- cgit v1.2.3-54-g00ecf From 55f5037ce819432e39f82f7634b35262104672f9 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:23:46 +0000 Subject: Docs: udev.xml: `comma-separated' is a better description Signed-off-by: Michael Witten --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 475ded701d..8224311221 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -92,8 +92,8 @@ pointing to the device node, or run a specified program as part of the event handling. - A rule consists of a list of one or more key-value pairs separated by - a comma. Each key has a distinct operation, depending on the used operator. Valid + A rule consists of a comma-separated list of one or more key-value pairs. + Each key has a distinct operation, depending on the used operator. Valid operators are: -- cgit v1.2.3-54-g00ecf From 2bf11540cff14a3acbf834505ad84c866336755e Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:26:51 +0000 Subject: Docs: udev.xml: Remove unnecessary repitition Signed-off-by: Michael Witten --- udev/udev.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 8224311221..668ce551e2 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -128,8 +128,7 @@ - Assign a value to a key finally; disallow any later changes, - which may be used to prevent changes by any later rules. + Assign a value to a key finally; disallow any later changes. -- cgit v1.2.3-54-g00ecf From 2e7f69ebbffdddf2933a2f350a8e973bfa08a880 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:30:04 +0000 Subject: Docs: udev.xml: Add a few more words for context Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 668ce551e2..74917e1547 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -188,7 +188,7 @@ - Match the driver name of the event device. Only set for devices + Match the driver name of the event device. Only set this key for devices which are bound to a driver at the time the event is generated. -- cgit v1.2.3-54-g00ecf From 65e039c2e2ec53b90aff1b949c3fc59fe1a8c02a Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:31:20 +0000 Subject: Docs: udev.xml: Use `unless' for clarity Signed-off-by: Michael Witten --- udev/udev.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 74917e1547..3b1b4f83de 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -196,8 +196,8 @@ Match sysfs attribute values of the event device. Trailing - whitespace in the attribute values is ignored, if the specified match - value does not contain trailing whitespace itself. + whitespace in the attribute values is ignored unless the specified match + value itself contains trailing whitespace. @@ -228,8 +228,8 @@ Search the devpath upwards for a device with matching sysfs attribute values. If multiple matches are specified, all of them - must match on the same device. Trailing whitespace in the attribute values is ignored, - if the specified match value does not contain trailing whitespace itself. + must match on the same device. Trailing whitespace in the attribute values is ignored + unless the specified match value itself contains trailing whitespace. -- cgit v1.2.3-54-g00ecf From 2e9820e374b3f849cc120b10ab2db6053ce03dc2 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:39:33 +0000 Subject: Docs: udev.xml: Clarify PROGRAM key Signed-off-by: Michael Witten --- udev/udev.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 3b1b4f83de..c9083446ed 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -258,10 +258,11 @@ - Execute a program. The key is true, if the program returns + Execute a program to determine whether there + is a match; the key is true if the program returns successfully. The device properties are made available to the - executed program in the environment. The program's output printed to - stdout, is available in the RESULT key. + executed program in the environment. The program's stdout + is available in the RESULT key. -- cgit v1.2.3-54-g00ecf From 401e59e9aefdda48d037e8d5026c2c8e1edec96e Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:40:34 +0000 Subject: Docs: udev.xml: `a shell style' -> `shell-style' Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index c9083446ed..78b538bd4a 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -275,7 +275,7 @@ - Most of the fields support a shell style pattern matching. The following + Most of the fields support shell-style pattern matching. The following pattern characters are supported: -- cgit v1.2.3-54-g00ecf From 954e9c52d1b28c4e2607dd98c62c8424e46f8549 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:41:32 +0000 Subject: Docs: udev.xml: Clean `*' description Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 78b538bd4a..40ccd541a0 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -281,7 +281,7 @@ - Matches zero, or any number of characters. + Matches zero or more characters. -- cgit v1.2.3-54-g00ecf From 2c47027b31f7af9b7b25348f2baba77bba586b61 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 21:45:16 +0000 Subject: Docs: udev.xml: Clean character range description Signed-off-by: Michael Witten --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 40ccd541a0..77053b7700 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -295,8 +295,8 @@ Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. - Ranges are also supported within this match with the '-' character. - For example, to match on the range of all digits, the pattern [0-9] would + Ranges are also supported via the '-' character. + For example, to match on the range of all digits, the pattern [0-9] could be used. If the first character following the '[' is a '!', any characters not enclosed are matched. -- cgit v1.2.3-54-g00ecf From ac1ba8e487b12e15c12e64ac78023b9dfbc0a30e Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:17:39 +0000 Subject: Docs: udev.xml: Clean up description of NAME assignment key Signed-off-by: Michael Witten --- udev/udev.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 77053b7700..225ad5ce3f 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -308,17 +308,17 @@ - The name, a network interface should be renamed to. Or as - a temporary workaround, the name a device node should be named. - Usually the kernel provides the defined node name, or even creates + What a network interface should be named. + Also, as a temporary workaround, this is what a device node + should be named; usually the kernel provides the defined node name or creates and removes the node before udev even receives any event. Changing the node name from the kernel's default creates inconsistencies and is not supported. If the kernel and NAME specify different names, - an error is logged. Udev is only expected to handle device node + an error is logged. udev is only expected to handle device node permissions and to create additional symlinks, not to change kernel-provided device node names. Instead of renaming a device node, - SYMLINK should be used. Symlink names must never conflict with - device node names, it results in unpredictable behavior. + SYMLINK should be used. However, symlink names must never conflict with + device node names, as that would result in unpredictable behavior. -- cgit v1.2.3-54-g00ecf From 9f38b806d273e19c4fcb71fdcbaa9c61839b2a51 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:21:51 +0000 Subject: Docs: udev.xml: Clean up description of SYMLINK assignment key Signed-off-by: Michael Witten --- udev/udev.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 225ad5ce3f..dc277c8918 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -331,10 +331,10 @@ devices claim the same name, the link always points to the device with the highest link_priority. If the current device goes away, the links are re-evaluated and the device with the next highest link_priority becomes the owner of - the link. If no link_priority is specified, the order of the devices, and - which one of them owns the link, is undefined. Claiming the same name for - a symlink, which is or might be used for a device node, may result in - unexpected behavior and is not supported. + the link. If no link_priority is specified, the order of the devices (and + which one of them owns the link) is undefined. Also, symlink names must + never conflict with the kernel's default device node names, as that would + result in unpredictable behavior. -- cgit v1.2.3-54-g00ecf From ed9c5fb721b45a647c4c629ca2b6a242a111e769 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:24:03 +0000 Subject: Docs: udev.xml: Clean up description of ENV assignment key Signed-off-by: Michael Witten --- udev/udev.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index dc277c8918..b10096544b 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -359,7 +359,8 @@ Set a device property value. Property names with a leading '.' - are not stored in the database or exported to external tool or events. + are neither stored in the database nor exported to events or + external tools (run by, say, the PROGRAM match key). -- cgit v1.2.3-54-g00ecf From 1d14abe61ff7f22f861fb2bbe06f0fdd64ac4c03 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:32:09 +0000 Subject: Docs: udev.xml: Clean up description of RUN assignment key Signed-off-by: Michael Witten --- udev/udev.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index b10096544b..f2e629a823 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -386,9 +386,11 @@ this or a dependent device. Long running tasks need to be immediately detached from the event process itself. If no absolute path is given, the program is expected to live in - /lib/udev, otherwise the absolute path must be - specified. Program name and arguments are separated by spaces. Single quotes - can be used to specify arguments with spaces. + the directory provided at compile-time to configure via --libexecdir + (this is usually /lib/udev), otherwise the absolute + path must be specified. The program name and following arguments are + separated by spaces. Single quotes can be used to specify arguments with + spaces. -- cgit v1.2.3-54-g00ecf From c24dfc80c6dded0184ecc3d9479c970b5a70e4e4 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:32:52 +0000 Subject: Docs: udev.xml: Clean up description of LABEL assignment key Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index f2e629a823..517d650ad8 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -397,7 +397,7 @@ - Named label where a GOTO can jump to. + A named label to which a GOTO may jump. -- cgit v1.2.3-54-g00ecf From 2f16de298f3b77a1973d9f5ac4af110a61cb8f27 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Fri, 8 Apr 2011 23:34:52 +0000 Subject: Docs: udev.xml: Add missing `.' Signed-off-by: Michael Witten --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 517d650ad8..336311c577 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -404,7 +404,7 @@ - Jumps to the next LABEL with a matching name + Jumps to the next LABEL with a matching name. -- cgit v1.2.3-54-g00ecf From b6a49cd681ac3ffd0702a79741fb482db85b5a36 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 00:56:21 +0000 Subject: Docs: udev.xml: `which' -> `content of which' --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 336311c577..b9884e521c 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -426,8 +426,8 @@ - Import a text file specified as the assigned value, which must be in - environment key format. + Import a text file specified as the assigned value, the content + of which must be in environment key format. -- cgit v1.2.3-54-g00ecf From ad9c70a8364e1792cb8d2536d2acf0a821b266fe Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 00:57:39 +0000 Subject: Docs: udev.xml: `commandline' -> `command line' --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index b9884e521c..66eeea4e31 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -441,7 +441,7 @@ - Import a single property from the kernel commandline. For simple flags + Import a single property from the kernel command line. For simple flags the value of the property is set to '1'. -- cgit v1.2.3-54-g00ecf From 793681cb55f22137016e4a01e7bec6f846297f34 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 01:00:57 +0000 Subject: Docs: udev.xml: Clean up WAIT_FOR description --- udev/udev.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 66eeea4e31..f472d9a7b8 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -465,9 +465,9 @@ - Wait for a file to become available or until a 10 - seconds timeout expires. The path is relative to the sysfs device, - i. e. if no path is specified this waits for an attribute to appear. + Wait for a file to become available or until a timeout of + 10 seconds expires. The path is relative to the sysfs device; + if no path is specified, this waits for an attribute to appear. -- cgit v1.2.3-54-g00ecf From 0fbda083a2977fe1809467913cc198bbdb681041 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 01:07:35 +0000 Subject: Docs: udev.xml: `a' -> `the' --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index f472d9a7b8..48980577c0 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -501,7 +501,7 @@ - Apply the permissions specified in this rule to a static device node with + Apply the permissions specified in this rule to the static device node with the specified name. Static device nodes might be provided by kernel modules or copied from /lib/udev/devices. These nodes might not have a corresponding kernel device at the time udevd is started; they can trigger -- cgit v1.2.3-54-g00ecf From 57e804843b42676246f14cea149299189abb8d18 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 01:12:52 +0000 Subject: Docs: udev.xml: Clean up introduction to substitutions. For one thing, they are not at all like printf conversion specifications. --- udev/udev.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 48980577c0..57f13e07b0 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -528,10 +528,10 @@ The , , , , , and - fields support simple printf-like string substitutions. The - format chars gets applied after all rules have been processed, right before the program - is executed. It allows the use of device properties set by earlier matching - rules. For all other fields, substitutions are applied while the individual rule is + fields support simple string substitutions. The + substitutions are performed after all rules have been processed, right before the program + is executed, allowing for the use of device properties set by earlier matching + rules. For all other fields, substitutions are performed while the individual rule is being processed. The available substitutions are: -- cgit v1.2.3-54-g00ecf From f2db23cd0d07a2c7992b8fb59497a8355bb16108 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 01:29:37 +0000 Subject: Docs: udev.xml: Use normal sentence structure --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 57f13e07b0..8cace1a1c6 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -580,8 +580,8 @@ The value of a sysfs attribute found at the device where all keys of the rule have matched. If the matching device does not have such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or - ATTRS test selected a parent device, use the attribute from that - parent device. + ATTRS test selected a parent device, then the attribute from that + parent device is used. If the attribute is a symlink, the last element of the symlink target is returned as the value. -- cgit v1.2.3-54-g00ecf From f61501b0f872b02951fba76ae4c6a079da042ed7 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 01:30:25 +0000 Subject: Docs: udev.xml: Actually make a separate paragraph --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 8cace1a1c6..6f32f2164f 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -581,8 +581,8 @@ all keys of the rule have matched. If the matching device does not have such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or ATTRS test selected a parent device, then the attribute from that - parent device is used. - If the attribute is a symlink, the last element of the symlink target is + parent device is used. + If the attribute is a symlink, the last element of the symlink target is returned as the value. -- cgit v1.2.3-54-g00ecf From 21188522ae018e7c819271dd9213c3fdd81925c1 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 03:43:16 +0000 Subject: Docs: udev.xml: Add comma --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 6f32f2164f..04e98e8963 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -612,9 +612,9 @@ , The string returned by the external program requested with PROGRAM. - A single part of the string, separated by a space character may be selected + A single part of the string, separated by a space character, may be selected by specifying the part number as an attribute: . - If the number is followed by the '+' char this part plus all remaining parts + If the number is followed by the '+' char, this part plus all remaining parts of the result string are substituted: -- cgit v1.2.3-54-g00ecf From 509c02f16086bfce87943071daaa62fe34557641 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 03:44:43 +0000 Subject: Docs: udev.xml: `char' -> `character' --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 04e98e8963..0d6b4ef3ae 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -614,7 +614,7 @@ The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character, may be selected by specifying the part number as an attribute: . - If the number is followed by the '+' char, this part plus all remaining parts + If the number is followed by the '+' character, this part plus all remaining parts of the result string are substituted: -- cgit v1.2.3-54-g00ecf From e8b5e4e590aa8802db2f8c20e022ef06ee2d00ba Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 03:50:11 +0000 Subject: Docs: udev.xml: `comma-separated' is a better description --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 0d6b4ef3ae..263c3cfee1 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -637,7 +637,7 @@ - The current list of symlinks, separated by a space character. The value is + A space-separated list of the current symlinks. The value is only set if an earlier rule assigned a value, or during a remove events. -- cgit v1.2.3-54-g00ecf From 2d74bc75792bdd993e6298cf253541624001517c Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 03:50:42 +0000 Subject: Docs: udev.xml: Clarify through a change in word ordering --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 263c3cfee1..8521424206 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -638,7 +638,7 @@ A space-separated list of the current symlinks. The value is - only set if an earlier rule assigned a value, or during a remove events. + only set during a remove event or if an earlier rule assigned a value. -- cgit v1.2.3-54-g00ecf From d0878effb94b9375185e9f590e1708b3664b8ab3 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 03:51:43 +0000 Subject: Docs: udev.xml: Improved word order --- udev/udev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 8521424206..9b40cbb03e 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -659,7 +659,7 @@ , - The name of a created temporary device node to provide access to + The name of a temporary device node created to provide access to the device from a external program before the real node is created. -- cgit v1.2.3-54-g00ecf From 620da34de221f70df7c61d3cdefef46bf56dac25 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 11 Apr 2011 04:16:31 +0000 Subject: Docs: udev.xml: Fix dangling modifier --- udev/udev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev') diff --git a/udev/udev.xml b/udev/udev.xml index 9b40cbb03e..8a4212fd54 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -511,8 +511,8 @@ - Watch the device node with inotify; when closed after being opened for - writing, a change uevent is synthesised. + Watch the device node with inotify; when the node is closed after being opened for + writing, a change uevent is synthesized. -- cgit v1.2.3-54-g00ecf