Re-add Todo item about merging.

[bpt/emacs.git] / etc / sex.6

diff --git a/etc/sex.6 b/etc/sex.6
index edff05c..28ca90f 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