Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -35,6 +35,7 @@ texlive.combine {
      You can list packages e.g. by <command>nix-repl</command>.
      <programlisting>
 $ nix-repl
+nix-repl> :l &lt;nixpkgs>
 nix-repl> texlive.collection-&lt;TAB>
      </programlisting>
    </para></listitem>