diff --git a/docs/man/ModemManager.8 b/docs/man/ModemManager.8 index 5cd79f3c..62a4e43f 100644 --- a/docs/man/ModemManager.8 +++ b/docs/man/ModemManager.8 @@ -28,14 +28,8 @@ Specify which ports are probed and how: \fB'WHITELIST-ONLY'\fR Only devices or ports explicitly whitelisted with the 'ID_MM_DEVICE_PROCESS' udev tag are probed. .TP -\fB'DEFAULT'\fR -All ports are allowed to be probed except for the ones explicitly greylisted as RS232 adapters or completely blacklisted. -.TP \fB'STRICT'\fR -Only the TTY ports that are heurstically determined to be very likely to be modem ports are probed. Nay end up ignoring some devices. -.TP -\fB'PARANOID'\fR -This is equivalent to running the STRICT mode but also applying the blacklist and RS232 greylist filters explicitly. +Only the TTY ports that are heuristically determined to be very likely to be modem ports are probed. Nay end up ignoring some devices. .RE .TP .B \-\-no\-auto\-scan diff --git a/docs/reference/api/ModemManager-overview.xml b/docs/reference/api/ModemManager-overview.xml index 1094950b..9135da00 100644 --- a/docs/reference/api/ModemManager-overview.xml +++ b/docs/reference/api/ModemManager-overview.xml @@ -245,32 +245,6 @@ $ sudo udevadm trigger # /usr/sbin/ModemManager --filter-policy=WHITELIST-ONLY - - Default - - This is a policy where the following rules are enabled: - - MM_FILTER_RULE_EXPLICIT_WHITELIST - MM_FILTER_RULE_EXPLICIT_BLACKLIST - MM_FILTER_RULE_VIRTUAL - MM_FILTER_RULE_NET - MM_FILTER_RULE_USBMISC - MM_FILTER_RULE_TTY - MM_FILTER_RULE_TTY_BLACKLIST - MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY - MM_FILTER_RULE_TTY_PLATFORM_DRIVER - MM_FILTER_RULE_TTY_DEFAULT_ALLOWED - - - - This policy is the default one when a different one not explicitly - selected, and is equivalent to the way ModemManager has worked in previous - releases. This policy is the least restrictive one, and will end up - allowing port probing of all TTYs not explicitly blacklisted in one way - or another. - - # /usr/sbin/ModemManager --filter-policy=DEFAULT - Strict @@ -290,44 +264,12 @@ $ sudo udevadm trigger - This policy is stricter than the default one, as by default all TTYs are - forbidden except for the ones explicitly allowed by one of the TTY-specific - rules. Distributions or users should use this policy if they don't want - ModemManager to mess around with TTY ports that may not be exposed by - actual modems. + This policy is the default one when a different one is not explicitly + selected. In this policy, all TTYs are forbidden except for the ones + explicitly allowed by one of the TTY-specific rules. # /usr/sbin/ModemManager --filter-policy=STRICT - - Paranoid - - This policy is a mix of the Default and Strict ones: - - MM_FILTER_RULE_EXPLICIT_WHITELIST - MM_FILTER_RULE_EXPLICIT_BLACKLIST - MM_FILTER_RULE_VIRTUAL - MM_FILTER_RULE_NET - MM_FILTER_RULE_USBMISC - MM_FILTER_RULE_TTY - MM_FILTER_RULE_TTY_BLACKLIST - MM_FILTER_RULE_TTY_MANUAL_SCAN_ONLY - MM_FILTER_RULE_TTY_PLATFORM_DRIVER - MM_FILTER_RULE_TTY_DRIVER - MM_FILTER_RULE_TTY_ACM_INTERFACE - MM_FILTER_RULE_TTY_WITH_NET - MM_FILTER_RULE_TTY_DEFAULT_FORBIDDEN - - - - This policy is equivalent to the Strict policy, but where the ModemManager - provided blacklist and manual scan only greylist are also used. It is not - recommended to use this option in normal setups as the blacklists may be - obsoleted in future ModemManager versions (in favor of using the Strict - policy as default). - - # /usr/sbin/ModemManager --filter-policy=PARANOID - - Custom @@ -335,12 +277,12 @@ $ sudo udevadm trigger by explicitly enabling or disabling rules via environment variables. - E.g. this would launch ModemManager with the Default filter policy but with all + E.g. this would launch ModemManager with the Strict filter policy but with all net and cdc-wdm ports forbidden completely: # MM_FILTER_RULE_NET=0 \ MM_FILTER_RULE_USBMISC=0 \ - /usr/sbin/ModemManager --filter-policy=DEFAULT + /usr/sbin/ModemManager --filter-policy=STRICT E.g. this would launch ModemManager with the Whitelist-only filter policy but also