diff --git a/doc/orgmode/chapters/using.org b/doc/orgmode/chapters/using.org
index 7bf39140f57702191dee06f459a506e2754c254f..86e108b4fc76133408a616fa21c6cc3750b0507f 100644
--- a/doc/orgmode/chapters/using.org
+++ b/doc/orgmode/chapters/using.org
@@ -165,33 +165,58 @@
      #+end_src
 
      List of main options that can be used in timing:
-     * ~--help~: show usage
-     * ~--threads~: Number of CPU workers (default:
-       ~_SC_NPROCESSORS_ONLN~)
-     * ~--gpus~: number of GPU workers (default: ~0~)
-     * ~--n_range=R~: range of N values, with ~R=Start:Stop:Step~
-       (default: ~500:5000:500~)
-     * ~--m=X~: dimension (M) of the matrices (default: ~N~)
-     * ~--k=X~: dimension (K) of the matrices (default: ~1~), useful for
-       GEMM algorithm (k is the shared dimension and must be defined
-       >1 to consider matrices and not vectors)
-     * ~--nrhs=X~: number of right-hand size (default: ~1~)
-     * ~--nb=X~: block/tile size. (default: ~128~)
-     * ~--ib=X~: inner-blocking/IB size. (default: ~32~)
-     * ~--niter=X~: number of iterations performed for each test
-       (default: ~1~)
-     * ~--rhblk=X~: if X > 0, enable Householder mode for QR and LQ
-       factorization. X is the size of each subdomain (default: ~0~)
-     * ~--[no]check~: check result (default: ~nocheck~)
-     * ~--[no]profile~: print profiling informations (default:
-       ~noprofile~)
-     * ~--[no]trace~: enable/disable trace generation (default: ~notrace~)
-     * ~--[no]dag~: enable/disable DAG generation (default: ~nodag~)
-     * ~--[no]inv~: check on inverse (default: ~noinv~)
-     * ~--nocpu~: all GPU kernels are exclusively executed on GPUs
-     * ~--ooc~: Enable out-of-core (available only with StarPU)
-     * ~--bound~: Compare result to area bound (available only with
-       StarPU) (default: ~0~)
+     * ~--help~: Show usage
+     * Machine parameters
+       * ~-t x, --threads=x~: Number of CPU workers (default: automatic
+         detection through runtime)
+       * ~-g x, --gpus=x~: Number of GPU workers (default: ~0~)
+       * ~-P x, --P=x~: Rows (P) in the PxQ process grid (default: ~1~)
+       * ~--nocpu~: All GPU kernels are exclusively executed on GPUs
+     * Matrix parameters
+       * ~-m x, --m=X, --M=x~: Dimension (M) of the matrices (default:
+         ~N~)
+       * ~-n x, --n=X, --N=x~: Dimension (N) of the matrices
+       * ~-N R, --n_range=R~: Range of N values to time with
+         ~R=Start:Stop:Step~ (default: ~500:5000:500~)
+       * ~-k x, --k=x, --K=x, --nrhs=x~: Dimension (K) of the matrices
+         or number of right-hand size (default: ~1~). This is useful for
+         GEMM algorithms (k is the shared dimension and must be defined
+         >1 to consider matrices and not vectors)
+       * ~-b x, --nb=x~: NB size. (default: ~320~)
+       * ~-i x, --ib=x~: IB size. (default: ~32~)
+     * Check/prints
+       * ~--niter=X~: Number of iterations performed for each test
+         (default: ~1~)
+       * ~-W, --nowarning~: Do not show warnings
+       * ~-w, --nowarmup~: Cancel the warmup run to pre-load libraries
+       * ~-c, --check~: Check result
+       * ~-C, --inc~: Check on inverse
+       * ~--mode=x~ : Change the xLATMS matrix mode generation for
+         SVD/EVD (default: ~4~). It must be between 0 and 20 included.
+     * Profiling parameters
+       * ~-T, --trace~: Enable trace generation
+       * ~--progress~: Display progress indicator
+       * ~-d, --dag~: Enable DAG generation. Generates a dot_dag_file.dot.
+       * ~-p, --profile~: Print profiling informations
+     * HQR parameters
+       * ~-a x, --qr_a=x, --rhblk=x~: Define the size of the local TS
+         trees in housholder reduction trees for QR and LQ
+         factorization. N is the size of each subdomain (default: ~-1~)
+       * ~-l x, --llvl=x~: Tree used for low level reduction inside
+         nodes (default: ~-1~)
+       * ~-L x, --hlvl=x~: Tree used for high level reduction between
+         nodes, only if P > 1 (default: ~-1~). Possible values are -1:
+         Automatic, 0: Flat, 1: Greedy, 2: Fibonacci, 3: Binary, 4:
+         Replicated greedy.
+       * ~-D, --domino~: Enable the domino between upper and lower trees
+     * Advanced options
+       * ~--nobigmat~: Disable single large matrix allocation for
+         multiple tiled allocations
+       * ~-s, --sync~: Enable synchronous calls in wrapper function such
+         as POTRI
+       * ~-o, --ooc~: Enable out-of-core (available only with StarPU)
+       * ~-G, --gemm3m~: Use gemm3m complex method
+       * ~--bound~: Compare result to area bound
 
      List of timing algorithms available:
      * LANGE: norms of matrices