summaryrefslogtreecommitdiff
path: root/Documentation/mono.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 16:03:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 16:03:55 -0700
commita9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f (patch)
treed97875ecd47172c8739ec8f24ea159bbee8fb628 /Documentation/mono.txt
parent9613bebb223dea3179c265dc31e1bb41ae39f321 (diff)
parentc48013824b855c4498092aa6f2fa5345962c1f65 (diff)
Merge branch 'dunlap' (Randy's Documentation patches)
Merge Documentation fixes from Randy Dunlap. Fixed up several small annoyances (bad changelogs and corrupted utf8 names), I need to try to convince people to do things right. * emailed from Randy Dunlap <rdunlap@xenotime.net>: Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc Documentation: replace install commands with softdeps Documentation: remove references to /etc/modprobe.conf Documentation: input.txt: clarify mousedev 'cat' command syntax Documentation: CodingStyle: add inline assembly guidelines Documentation: sysrq: Crutcher Dunnavant is unavailable Documentation: mention scripts/diffconfig tool Documentation: remove 'mach' from dontdiff file
Diffstat (limited to 'Documentation/mono.txt')
-rw-r--r--Documentation/mono.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/mono.txt b/Documentation/mono.txt
index e8e1758e87da..d01ac6052194 100644
--- a/Documentation/mono.txt
+++ b/Documentation/mono.txt
@@ -38,11 +38,11 @@ if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then
/sbin/modprobe binfmt_misc
# Some distributions, like Fedora Core, perform
# the following command automatically when the
- # binfmt_misc module is loaded into the kernel.
+ # binfmt_misc module is loaded into the kernel
+ # or during normal boot up (systemd-based systems).
# Thus, it is possible that the following line
- # is not needed at all. Look at /etc/modprobe.conf
- # to check whether this is applicable or not.
- mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+ # is not needed at all.
+ mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
fi
# Register support for .NET CLR binaries