Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

[gnu-emacs] / etc / sex.6

diff --git a/etc/sex.6 b/etc/sex.6
index edff05c1e6b158d5ac46d21d0b6b3f5f8bd05b0b..28ca90f2f1da7f0d21ce07915d314ab7e5c54641 100644 (file)
--- a/etc/sex.6
+++ b/etc/sex.6
@@ -99,7 +99,7 @@ FILES
 
      /usr/lib/sex/sundaes          sundae recipes
 
-     /usr/lib/sex/s&m         sado-masochistic equipment
+     /usr/lib/sex/s+m         sado-masochistic equipment