Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 75945)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 75946)
@@ -1490,11 +1490,8 @@
             <emphasis role="bold">Linux and Solaris guests:</emphasis>
             Folders are mounted under the <computeroutput>/media</computeroutput>
-            directory on Linux and <computeroutput>/mnt</computeroutput> on
-            Solaris.  The folder name is normalized (no spaces, slashes,
+            directory.  The folder name is normalized (no spaces, slashes,
             colons) and prefixed with <computeroutput>sf_</computeroutput>.
             Say you have a shared folder called <computeroutput>myfiles</computeroutput>
-            it will appear as <computeroutput>/media/sf_myfiles</computeroutput>
-            in a Linux guest and <computeroutput>/mnt/sf_myfiles</computeroutput>
-            in a Solaris one.
+            it will appear as <computeroutput>/media/sf_myfiles</computeroutput> in the guest.
           </para>
 
Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	(revision 75945)
+++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	(revision 75946)
@@ -88,9 +88,5 @@
  */
 #ifndef VBOXSERVICE_AUTOMOUNT_DEFAULT_DIR
-# ifdef RT_OS_SOLARIS
-#  define VBOXSERVICE_AUTOMOUNT_DEFAULT_DIR      "/mnt"
-# else
-#  define VBOXSERVICE_AUTOMOUNT_DEFAULT_DIR      "/media"
-# endif
+# define VBOXSERVICE_AUTOMOUNT_DEFAULT_DIR      "/media"
 #endif