Index: /trunk/doc/manual/Makefile.kmk
===================================================================
--- /trunk/doc/manual/Makefile.kmk	(revision 56540)
+++ /trunk/doc/manual/Makefile.kmk	(revision 56541)
@@ -431,11 +431,11 @@
 	$(call MSG_L1,Pre-processing [1] $(@F) to $@)
 	$(QUIET)$(RM) -f $@ $@.tmp
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
+	$(QUIET)$(SED) -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
+	               -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+	               -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+	               -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+	               -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+	               -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+	               -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
 	               --output $@.tmp $<
 	$(QUIET)$(MV) -f $@.tmp $@
@@ -446,22 +446,22 @@
 	$(call MSG_L1,Pre-processing [3] $(@F) to $@)
 	$(QUIET)$(RM) -f $@ $@.tmp $@.tmp2
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
+	$(QUIET)$(SED) -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
+	               -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+	               -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+	               -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+	               -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+	               -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+	               -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
 	               --output $@.tmp $<
-	$(QUIET)$(SED) -e '1,/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/!d' \
-	               -e 's/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->//' \
+	$(QUIET)$(SED) -e '1,/<!--@VIRTUALBOX_CHANGELOG_IMPL@-->/!d' \
+	               -e 's/<!--@VIRTUALBOX_CHANGELOG_IMPL@-->//' \
 	               --output $@ $@.tmp
-	var=`$(SED) -n '/!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/p' $<`; \
+	var=`$(SED) -n '/!--@VIRTUALBOX_CHANGELOG_IMPL@-->/p' $<`; \
 		test -n "$${var}" \
 		&& $(SED) -e 's/<?xml version=\"1.0\" encoding=\"UTF-8\"?>//g' \
 			--append $@ $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml; \
        	true
-	$(QUIET)$(SED) -e '/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/,$$!d' \
-	               -e 's/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->//' --append $@ $@.tmp
+	$(QUIET)$(SED) -e '/<!--@VIRTUALBOX_CHANGELOG_IMPL@-->/,$$!d' \
+	               -e 's/<!--@VIRTUALBOX_CHANGELOG_IMPL@-->//' --append $@ $@.tmp
 	$(QUIET)$(RM) -f -- "$@.tmp"
 
@@ -500,11 +500,11 @@
 		-e '/@VBOX_MANAGE_OUTPUT@/{' -e 'r $@.screen' -e 'd' -e '}' \
                \
-		-e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-		-e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-		-e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-		-e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
+		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
+		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
 		-e 's|@VBOX_PATH_DOCBOOK@|$(VBOX_PATH_DOCBOOK)|g' \
 		-e 's|@VBOX_PATH_MANUAL_SRC@|$(VBOX_PATH_MANUAL_SRC)|g' \
@@ -685,18 +685,18 @@
 	$(call MSG_L1,Pre-processing [2] $(@F) to $@)
 	$(QUIET)$(RM) -f $@ $@.tmp
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
+	$(QUIET)$(SED) -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
+	               -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
+	               -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
+	               -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
+	               -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
+	               -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
+	               -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
 	               --output $@.tmp $<
-	$(QUIET)$(SED) -e '1,/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->/!d' \
-	               -e 's/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->//' \
+	$(QUIET)$(SED) -e '1,/<!--@VIRTUALBOX_MAIN_API_REFERENCE@-->/!d' \
+	               -e 's/<!--@VIRTUALBOX_MAIN_API_REFERENCE@-->//' \
 	               --output $@ $@.tmp
 	$(QUIET)$(SED) -e 's/<?xml version=\"1.0\" encoding=\"utf-8\"?>//g' --append $@ $(VBOX_MANUAL_APIREF_TMP)
-	$(QUIET)$(SED) -e '/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->/,$$!d' \
-	               -e 's/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->//' --append $@ $@.tmp
+	$(QUIET)$(SED) -e '/<!--@VIRTUALBOX_MAIN_API_REFERENCE@-->/,$$!d' \
+	               -e 's/<!--@VIRTUALBOX_MAIN_API_REFERENCE@-->//' --append $@ $@.tmp
 #	$(QUIET)$(MV) -f $@.tmp $@
 	$(QUIET)$(RM) -f -- "$@.tmp"
Index: /trunk/doc/manual/en_US/SDKRef.xml
===================================================================
--- /trunk/doc/manual/en_US/SDKRef.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/SDKRef.xml	(revision 56541)
@@ -4,18 +4,18 @@
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Programming Guide and Reference</subtitle>
 
-    <edition>Version $VBOX_VERSION_STRING</edition>
-
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <edition>Version @VBOX_VERSION_STRING@</edition>
+
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
-
-      <holder>$VBOX_VENDOR</holder>
+      <year>2004-@VBOX_C_YEAR@</year>
+
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
@@ -1199,5 +1199,5 @@
 
                 <para>And it will print
-                "$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD".</para>
+                "@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@".</para>
               </listitem>
 
@@ -2542,5 +2542,5 @@
   </chapter>
 
-  <!--$VIRTUALBOX_MAIN_API_REFERENCE-->
+  <!--@VIRTUALBOX_MAIN_API_REFERENCE@-->
 
   <chapter id="hgcm">
Index: /trunk/doc/manual/en_US/UserManual.xml
===================================================================
--- /trunk/doc/manual/en_US/UserManual.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/UserManual.xml	(revision 56541)
@@ -4,19 +4,19 @@
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>User Manual</subtitle>
 
     <edition>Version
-    $VBOX_VERSION_STRING</edition>
+    @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004-@VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
Index: /trunk/doc/manual/en_US/user_ChangeLog.xml
===================================================================
--- /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_ChangeLog.xml	(revision 56541)
@@ -14,5 +14,5 @@
   In addition, each build contains a revision number.</para>
 
-<!--$VIRTUALBOX_CHANGELOG_IMPL-->
+<!--@VIRTUALBOX_CHANGELOG_IMPL@-->
 
   <sect1>
Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 56541)
@@ -900,7 +900,7 @@
 
         <para>Starting with version 3.1.0, you can uninstall the Additions by
-        invoking <screen>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING/uninstall.sh</screen>Please
+        invoking <screen>/opt/VBoxGuestAdditions-@VBOX_VERSION_STRING@/uninstall.sh</screen>Please
         replace
-        <computeroutput>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING</computeroutput>
+        <computeroutput>/opt/VBoxGuestAdditions-@VBOX_VERSION_STRING@</computeroutput>
         with the correct Guest Additions installation directory.</para>
       </sect3>
@@ -1610,6 +1610,6 @@
     have <emphasis>all</emphasis> the available guest properties for a given
     running VM listed with their respective values, use this:<screen>$ VBoxManage guestproperty enumerate "Windows Vista III"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -1625,25 +1625,25 @@
 Name: /VirtualBox/GuestAdd/Revision, value: 40720,
     timestamp: 1229098279345664000, flags:
-Name: /VirtualBox/GuestAdd/Version, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD,
+Name: /VirtualBox/GuestAdd/Version, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@,
     timestamp: 1229098279479515000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279651731000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279804835000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279880611000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279882618000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279883195000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279885027000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279886838000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279890600000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279893056000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279895767000, flags:
 Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1,
@@ -1668,6 +1668,6 @@
     <para>To query the value of a single property, use the "get" subcommand
     like this:<screen>$ VBoxManage guestproperty get "Windows Vista III" "/VirtualBox/GuestInfo/OS/Product"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -1678,6 +1678,6 @@
     Guest Additions of VirtualBox 2.2 or later. When started from a Linux
     guest, this tool requires root privileges for security reasons:<screen>$ sudo VBoxControl guestproperty enumerate
-VirtualBox Guest Additions Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2009-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Guest Additions Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
Index: /trunk/doc/manual/en_US/user_Installation.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Installation.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_Installation.xml	(revision 56541)
@@ -413,5 +413,5 @@
         install the Debian package:</para>
 
-        <screen>sudo dpkg -i virtualbox-5.0_$VBOX_VERSION_STRING_Ubuntu_raring_i386.deb</screen>
+        <screen>sudo dpkg -i virtualbox-5.0_@VBOX_VERSION_STRING@_Ubuntu_raring_i386.deb</screen>
 
         <para>You will be asked to accept the VirtualBox Personal Use and
@@ -737,5 +737,5 @@
       commands:</para>
 
-      <screen>gunzip -cd VirtualBox-$VBOX_VERSION_STRING-SunOS.tar.gz | tar xvf -</screen>
+      <screen>gunzip -cd VirtualBox-@VBOX_VERSION_STRING@-SunOS.tar.gz | tar xvf -</screen>
 
       <para>Starting with VirtualBox 3.1 the VirtualBox kernel package is no
@@ -743,5 +743,5 @@
       Install the VirtualBox package using:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS.pkg</screen>
+      <screen>pkgadd -d VirtualBox-@VBOX_VERSION_STRING@-SunOS.pkg</screen>
 
       <note>
@@ -835,5 +835,5 @@
       installation. Then open a root terminal session and execute:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
+      <screen>pkgadd -d VirtualBox-@VBOX_VERSION_STRING@-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
 
       <para>To perform a non-interactive uninstallation, open a root terminal
Index: /trunk/doc/manual/en_US/user_Introduction.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Introduction.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_Introduction.xml	(revision 56541)
@@ -5,5 +5,5 @@
   <title>First steps</title>
 
-  <para>Welcome to $VBOX_PRODUCT!</para>
+  <para>Welcome to @VBOX_PRODUCT@!</para>
 
   <para>VirtualBox is a cross-platform virtualization application. What does
Index: /trunk/doc/manual/en_US/user_KnownIssues.xml
===================================================================
--- /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_KnownIssues.xml	(revision 56541)
@@ -48,5 +48,5 @@
       <title>Known Issues</title>
       <para>The following section describes known problems with VirtualBox
-      $VBOX_VERSION_STRING. Unless marked otherwise, these issues are planned to
+      @VBOX_VERSION_STRING@. Unless marked otherwise, these issues are planned to
       be fixed in later releases.</para>
     
Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 56540)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml	(revision 56541)
@@ -95,6 +95,6 @@
 
         <screen>$ VBoxManage createvm --name "SUSE 10.2" --register
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -322,6 +322,6 @@
 
     <para><screen>$ VBoxManage showvminfo "Windows XP"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -2801,6 +2801,6 @@
     <para>which would return</para>
 
-    <screen>VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+    <screen>VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
Index: /trunk/doc/manual/fr_FR/SDKRef.xml
===================================================================
--- /trunk/doc/manual/fr_FR/SDKRef.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/SDKRef.xml	(revision 56541)
@@ -4,18 +4,18 @@
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Programming Guide and Reference</subtitle>
 
-    <edition>Version $VBOX_VERSION_STRING</edition>
-
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <edition>Version @VBOX_VERSION_STRING@</edition>
+
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
-
-      <holder>$VBOX_VENDOR</holder>
+      <year>2004-@VBOX_C_YEAR@</year>
+
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
@@ -1184,5 +1184,5 @@
 
                 <para>And it will print
-                "$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD".</para>
+                "@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@".</para>
               </listitem>
 
@@ -2273,5 +2273,5 @@
   </chapter>
 
-  <!--$VIRTUALBOX_MAIN_API_REFERENCE-->
+  <!--@VIRTUALBOX_MAIN_API_REFERENCE@-->
 
   <chapter id="hgcm">
Index: /trunk/doc/manual/fr_FR/UserManual.xml
===================================================================
--- /trunk/doc/manual/fr_FR/UserManual.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/UserManual.xml	(revision 56541)
@@ -4,12 +4,12 @@
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Manuel de l'utilisateur</subtitle>
 
     <edition>Version
-    $VBOX_VERSION_STRING</edition>
+    @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <othercredit class="translator">
@@ -22,7 +22,7 @@
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004-@VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
Index: /trunk/doc/manual/fr_FR/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/fr_FR/user_GuestAdditions.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/user_GuestAdditions.xml	(revision 56541)
@@ -935,7 +935,7 @@
 
         <para>À partir de la version 3.1.0, vous pouvez désinstaller les 
-        suppléments en appelant <screen>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING/uninstall.sh</screen>Merci
+        suppléments en appelant <screen>/opt/VBoxGuestAdditions-@VBOX_VERSION_STRING@/uninstall.sh</screen>Merci
         de remplacer 
-        <computeroutput>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING</computeroutput>
+        <computeroutput>/opt/VBoxGuestAdditions-@VBOX_VERSION_STRING@</computeroutput>
         par le bon répertoire d'installation des suppléments invité.</para>
       </sect3>
@@ -1647,6 +1647,6 @@
     une Vm donnée en fonction, listées avec leurs valeurs respectives, utilisez
     ceci&#xA0;:<screen>$ VBoxManage guestproperty enumerate "Windows Vista III"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -1662,25 +1662,25 @@
 Name: /VirtualBox/GuestAdd/Revision, value: 40720,
     timestamp: 1229098279345664000, flags:
-Name: /VirtualBox/GuestAdd/Version, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD,
+Name: /VirtualBox/GuestAdd/Version, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@,
     timestamp: 1229098279479515000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279651731000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279804835000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279880611000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279882618000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279883195000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279885027000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279886838000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279890600000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279893056000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@r40720,
     timestamp: 1229098279895767000, flags:
 Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1,
@@ -1706,6 +1706,6 @@
     like this:<screen>$ VBoxManage guestproperty get "Windows Vista III"
          "/VirtualBox/GuestInfo/OS/Product"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -1717,6 +1717,6 @@
     invité Linux, cet outil exige les privilèges administrateur pour des raisons
     de sécurité&#xA0;:<screen>$ sudo VBoxControl guestproperty enumerate
-VirtualBox suppléments invité Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2009-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox suppléments invité Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
Index: /trunk/doc/manual/fr_FR/user_Installation.xml
===================================================================
--- /trunk/doc/manual/fr_FR/user_Installation.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/user_Installation.xml	(revision 56541)
@@ -394,5 +394,5 @@
         pour installer le paquet Debian&#xA0;:</para>
 
-        <screen>sudo dpkg -i VirtualBox-4.3_$VBOX_VERSION_STRING_Ubuntu_raring_i386.deb</screen>
+        <screen>sudo dpkg -i VirtualBox-4.3_@VBOX_VERSION_STRING@_Ubuntu_raring_i386.deb</screen>
 
         <para>On vous demandera d'accepter la licence d'utilisation Personelle
@@ -720,5 +720,5 @@
       commandes suivantes&#xA0;:</para>
 
-      <screen>gunzip -cd VirtualBox-$VBOX_VERSION_STRING-SunOS.tar.gz | tar xvf -</screen>
+      <screen>gunzip -cd VirtualBox-@VBOX_VERSION_STRING@-SunOS.tar.gz | tar xvf -</screen>
 
       <para>À partir de VirtualBox 3.1, le paquet noyau de VirtualBox n'est plus
@@ -726,5 +726,5 @@
       Installez le paquet VirtualBox en utilisant&#xA0;:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS.pkg</screen>
+      <screen>pkgadd -d VirtualBox-@VBOX_VERSION_STRING@-SunOS.pkg</screen>
 
       <note>
@@ -820,5 +820,5 @@
       Puis ouvrez une session administrateur en terminal et exécutez&#xA0;:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
+      <screen>pkgadd -d VirtualBox-@VBOX_VERSION_STRING@-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
 
       <para>Pour effectuer une désinstallation non interactive, ouvrez une session
Index: /trunk/doc/manual/fr_FR/user_Introduction.xml
===================================================================
--- /trunk/doc/manual/fr_FR/user_Introduction.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/user_Introduction.xml	(revision 56541)
@@ -5,5 +5,5 @@
   <title>Premiers pas</title>
 
-  <para>Bienvenue à $VBOX_PRODUCT!</para>
+  <para>Bienvenue à @VBOX_PRODUCT@!</para>
 
   <para>VirtualBox est une application de virtualisation de plateformes croisées.
Index: /trunk/doc/manual/fr_FR/user_KnownIssues.xml
===================================================================
--- /trunk/doc/manual/fr_FR/user_KnownIssues.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/user_KnownIssues.xml	(revision 56541)
@@ -48,5 +48,5 @@
       <title>Problèmes connus</title>
       <para>La section suivante décrit les problèmes connus avec VirtualBox
-      $VBOX_VERSION_STRING. Sauf autrement spécifié, il est prévu de corriger ces
+      @VBOX_VERSION_STRING@. Sauf autrement spécifié, il est prévu de corriger ces
       problèmes dans les prochaines versions.</para>
     
Index: /trunk/doc/manual/fr_FR/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/fr_FR/user_VBoxManage.xml	(revision 56540)
+++ /trunk/doc/manual/fr_FR/user_VBoxManage.xml	(revision 56541)
@@ -79,6 +79,6 @@
 
         <screen>$ VBoxManage createvm --name "SUSE 10.2" --register
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -144,5 +144,7 @@
     pour voir les commandes disponibles sur votre hôte en particulier.</para>
 
-    <screen>$VBOX_MANAGE_OUTPUT</screen>
+    <screen>@VBOX_MANAGE_OUTPUT@</screen> <!-- the whole line is replaced later -->
+    <xi:include href="../user_VBoxManage_CommandsOverview.xml" xpointer="element(/1)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <para>À chaque fois que vous appelez VBoxManage, une seule commande peut être
@@ -306,6 +308,6 @@
 
     <para><screen>$ VBoxManage showvminfo "Windows XP"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
@@ -2533,6 +2535,6 @@
     <para>qui renverrait</para>
 
-    <screen>VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+    <screen>VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@
+(C) 2005-@VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.