diff --git a/doc/promo b/doc/promo
index f7317c79..52be91d0 100644
--- a/doc/promo
+++ b/doc/promo
@@ -1,3 +1,24 @@
+=head1 What is GNU Parallel used for
+
+Searching for transit planets using data from the Kepler space telescope.
+
+Searching 1700 genomes for 1000-10000 protein sequences using Amazon
+EC2 compute cloud.
+
+Processing Earth Observation data from satellites to grep for pieces
+of information.
+
+Running tons of simulations of granular materials.
+
+Converting formats of movie frames in the film industry.
+
+Computational fluid dynamics. Numerical simulation of the compressible
+Navier-Stokes equations.
+
+Analysing data and running simulations for searching for the Higgs
+boson at the Tevatron.
+
+
 =head1 search terms
 
 run commands in parallel
diff --git a/doc/release_new_version b/doc/release_new_version
index ca0e7ff8..5f159426 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -171,18 +171,15 @@ cc:Sandro Cazzaniga <kharec@mandriva.org>,
    Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>,
    Jesse Alama <jesse.alama@gmail.com>
 
-Subject: GNU Parallel 20120822 ('Boson') released
+Subject: GNU Parallel 20120922 ('X') released
 
-GNU Parallel 20120822 ('Boson') has been released. It is
+GNU Parallel 20120922 ('X') has been released. It is
 available for download at: http://ftp.gnu.org/gnu/parallel/
 
 New in this release:
 
-* Due to a bugfix the main flow has changed. Making this release beta
-  quality.
-
-* Parallel Proxy Scraper & Checker Tool 
-  https://www.youtube.com/watch?v=iXCeR_XsP6o
+* When bash just isn’t quick enough.
+  https://soimasysadmin.wordpress.com/2012/08/15/gnu-parallel-when-bash-just-isnt-quick-enough/
 
 * Bug fixes and man page updates.
 
diff --git a/src/parallel b/src/parallel
index ece26ef4..21b757b5 100755
--- a/src/parallel
+++ b/src/parallel
@@ -2791,18 +2791,21 @@ sub no_of_cpus_gnu_linux {
     #   Number of physical CPUs on GNU/Linux
     #   undef if not GNU/Linux
     my $no_of_cpus;
+    my $no_of_cores;
     if(-e "/proc/cpuinfo") {
         $no_of_cpus = 0;
+        $no_of_cores = 0;
         my %seen;
         open(IN,"cat /proc/cpuinfo|") || return undef;
         while(<IN>) {
             if(/^physical id.*[:](.*)/ and not $seen{$1}++) {
                 $no_of_cpus++;
             }
+            /^processor.*[:]/ and $no_of_cores++;
         }
         close IN;
     }
-    return $no_of_cpus;
+    return ($no_of_cpus||$no_of_cores);
 }
 
 sub no_of_cores_gnu_linux {
diff --git a/src/parallel.pod b/src/parallel.pod
index b6c80e92..b841049f 100644
--- a/src/parallel.pod
+++ b/src/parallel.pod
@@ -2271,7 +2271,7 @@ The idea is to put the jobs into a file and have GNU B<parallel> read
 from that continuously. As GNU B<parallel> will stop at end of file we
 use B<tail> to continue reading:
 
-B<echo >>B<jobqueue>; B<tail -f jobqueue | parallel>
+B<true >>B<jobqueue>; B<tail -f jobqueue | parallel>
 
 To submit your jobs to the queue:
 
diff --git a/src/parallel.texi b/src/parallel.texi
index 81418bdf..3c49a8ae 100644
--- a/src/parallel.texi
+++ b/src/parallel.texi
@@ -2447,7 +2447,7 @@ The idea is to put the jobs into a file and have GNU @strong{parallel} read
 from that continuously. As GNU @strong{parallel} will stop at end of file we
 use @strong{tail} to continue reading:
 
-@strong{echo }>@strong{jobqueue}; @strong{tail -f jobqueue | parallel}
+@strong{true }>@strong{jobqueue}; @strong{tail -f jobqueue | parallel}
 
 To submit your jobs to the queue:
 
diff --git a/testsuite/tests-to-run/parallel-local9.sh b/testsuite/tests-to-run/parallel-local9.sh
index 52782c38..629286e1 100644
--- a/testsuite/tests-to-run/parallel-local9.sh
+++ b/testsuite/tests-to-run/parallel-local9.sh
@@ -39,10 +39,10 @@ echo '### Test --spreadstdin --files';
   nice seq 1 1000000 | shuf | parallel --files --recend "\n" -j10 --spreadstdin sort -n | parallel -Xj1 sort -nm {} ";"rm {} | md5sum
 
 echo '### Test --number-of-cpus'; 
-  parallel --number-of-cpus
+  stdout parallel --number-of-cpus
 
 echo '### Test --number-of-cores'; 
-  parallel --number-of-cores
+  stdout parallel --number-of-cores
 
 echo '### Test --use-cpus-instead-of-cores'; 
   (seq 1 4 | stdout parallel --use-cpus-instead-of-cores -j100% sleep) && echo CPUs done &