Merge pull request #18 from UNSWComputing/jayenashar-cpus

Max number of CPUs
UNSWComputing · May 10, 2020 · ae74010 · ae74010
2 parents 68fc772 + def1f0e
commit ae74010
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/source/contributing/pc_setup_virtual_box.rst b/source/contributing/pc_setup_virtual_box.rst
@@ -17,10 +17,9 @@ VirtualBox Instructions
        Memory Size 4096MB
        =========== ======
 
-        .. tip::
-            Memory size of 4GB is a minimum.
-            You also want to leave at least 4GB for your host machine.
-            Recommendation is half your system memory.
+       .. tip::
+           Memory size of 2GB is a minimum.
+           Recommendation is half your system memory.
     #. Next
     #. Create a Virtual Hard Disk now
     #. Create
@@ -40,8 +39,8 @@ VirtualBox Instructions
             ============ ======
 
             .. tip::
-                The number of processors should be equal to the number of cores on your system.
-                Ignore the 'Invalid settings detected'.
+                Maximum 1 CPU per 1.5GB Base Memory
+                Recommendation is equal to the number of cores on your system.  Ignore the 'Invalid settings detected'.
     #. Storage
         #. Click on *Empty* under *Controller:IDE*.
         #. *Attributess* -> *Optical Drive* -> click on the disc icon

diff --git a/source/contributing/vm_image_creation.rst b/source/contributing/vm_image_creation.rst
@@ -21,10 +21,9 @@ These are instructions on creating an OVA file to be used in :ref:`pc_setup` for
        Memory Size 4096MB
        =========== ======
 
-        .. tip::
-            Memory size of 4GB is a minimum.
-            You also want to leave at least 4GB for your host machine.
-            Recommendation is half your system memory.
+       .. tip::
+           Memory size of 2GB is a minimum.
+           Recommendation is half your system memory.
     #. Next
     #. Create a Virtual Hard Disk now
     #. Create
@@ -44,8 +43,8 @@ These are instructions on creating an OVA file to be used in :ref:`pc_setup` for
             ============ ======
 
             .. tip::
-                The number of processors should be equal to the number of cores on your system.
-                Ignore the 'Invalid settings detected'.
+                Maximum 1 CPU per 1.5GB Base Memory
+                Recommendation is equal to the number of cores on your system.  Ignore the 'Invalid settings detected'.
     #. Storage
         #. Click on *Empty* under *Controller:IDE*.
         #. *Attributess* -> *Optical Drive* -> click on the disc icon

diff --git a/source/setup/pc_setup.rst b/source/setup/pc_setup.rst
@@ -31,17 +31,16 @@ Import rUNSWift VM Image
             =========== =======
 
             .. tip::
-                Memory size of 4GB is a minimum.
-                You also want to leave at least 4GB for your host OS.
+                Memory size of 2GB is a minimum.
                 Recommendation is half your system memory.
         * Processor
             ============ ======
             Processor(s) 4 CPUs
             ============ ======
 
             .. tip::
-                The number of processors should be equal to the number of cores on your system.
-                Ignore the 'Invalid settings detected'.
+                Maximum 1 CPU per 1.5GB Base Memory
+                Recommendation is equal to the number of cores on your system.  Ignore the 'Invalid settings detected'.
 #. Start
 
 .. tip::