Merge remote-tracking branch 'github/master' into portable

History.md

@@ -6,7 +6,8 @@
  * [new] better tooltip over the action buttons (such as Download, View al file, Get all)
  * [new] show the debomatic architecture in the header description
  * [new] show architecture and version in footer if header is hidden in preferences
- * [fix] when watching a file which gets deletion tail lib crashes
+ * [fix] system crashes when watch a file and it gets deletion
+ * [fix] never loses first errors received client side
 
 # 0.4.2 (2014-06-15)
  * [fix] calculate pidfile for debomatic status check after merging configurations

debomatic-webui/views/commands.ejs

@@ -67,7 +67,7 @@ cannot be downloaded and processed by Deb-o-Matic.
 <p>You could want to prepare a porter upload, a binary-only upload which generates
 architecture dependent binaries only. Additional information can be found in
 <a class="reference external" href="http://www.debian.org/doc/manuals/developers-reference/pkgs.html#porter-guidelines">Debian Developer’s Reference</a>.</p>
-<p>In order to do so, you must use the <code>rebuild</code> command:</p>
+<p>In order to do so, you must use the <code>porter</code> command:</p>
 <pre>echo "porter foo_version dist Joe Doe &lt;j.doe@acme.com&gt;" &gt; foo.commands</pre>
 <p>where foo is the name of the source package you want to rebuild, version is
 the version of the package you want to rebuild, dist is the distribution which