[vbox-dev] Latest updated manual

[Michael Thayer]

Hello Jean-Philippe,

On 09/11/13 14:54, MENGUAL Jean-Philippe wrote:
> Could you, instead, give me a diff between 4.3 branch and latest trunk?
> it'd be easier to maintain.

I'm afraid that in the long run the differences might start getting too 
big to be practical, but for now they are indeed almost identical - see 
below.  Actually the difference was slightly bigger fifteen minutes ago, 
but I reduced it by back-porting a change which clearly also applied to 4.3.

Thanks and regards,

Michael

$ diff doc/manual/en_US/ ../branches/VBox-4.3/doc/manual/en_US/ -du
Common subdirectories: doc/manual/en_US/images and 
../branches/VBox-4.3/doc/manual/en_US/images
diff -du doc/manual/en_US/user_AdvancedTopics.xml 
../branches/VBox-4.3/doc/manual/en_US/user_AdvancedTopics.xml
--- doc/manual/en_US/user_AdvancedTopics.xml	2013-11-04 
13:16:23.002820858 +0100
+++ ../branches/VBox-4.3/doc/manual/en_US/user_AdvancedTopics.xml 
2013-11-04 13:17:09.198822041 +0100
@@ -859,7 +859,7 @@
    <sect1>
      <title>Webcam passthrough</title>

-    <sect2>
+    <sect2 id="webcam-passthrough">
        <title>Using a host webcam in the guest</title>

        <para>VirtualBox 4.3 includes an experimental feature which 
allows a guest to use
diff -du doc/manual/en_US/user_VBoxManage.xml 
../branches/VBox-4.3/doc/manual/en_US/user_VBoxManage.xml
--- doc/manual/en_US/user_VBoxManage.xml	2013-11-04 13:16:23.002820858 +0100
+++ ../branches/VBox-4.3/doc/manual/en_US/user_VBoxManage.xml	2013-11-04 
13:17:09.198822041 +0100
@@ -1991,7 +1991,7 @@
                              [--add <ide/sata/scsi/floppy>]
                              [--controller 
<LsiLogic|LSILogicSAS|BusLogic|
 
IntelAhci|PIIX3|PIIX4|ICH6|I82078>]
-                            [--sataportcount <1-30>]
+                            [--portcount <1-30>]
                              [--hostiocache on|off]
                              [--bootable on|off]
                              [--remove]</screen>
@@ -2032,7 +2032,7 @@
          </glossentry>

          <glossentry>
- 
<glossterm><computeroutput>--sataportcount</computeroutput></glossterm>
+ 
<glossterm><computeroutput>--portcount</computeroutput></glossterm>

            <glossdef>
              <para>This determines how many ports the SATA controller 
should
-- 
ORACLE Deutschland B.V. & Co. KG   Michael Thayer
Werkstrasse 24                     VirtualBox engineering
71384 Weinstadt, Germany           mailto:michael.thayer at oracle.com

Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603
Geschäftsführer: Jürgen Kunz

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Alexander van der Ven, Astrid Kepper, Val Maher