Merge staging-next into staging

2018-12-07 15:31:52 +01:00
parent 4deb04a97a 12e8ec041a
commit 747aa4cc93
225 changed files with 5366 additions and 4074 deletions
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -49,12 +49,12 @@ texlive.combine {
   </listitem>
   <listitem>
    <para>
-     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>
+     You can list packages e.g. by <command>nix repl</command>.
+<programlisting><![CDATA[
+$ nix repl
+nix-repl> :l <nixpkgs>
+nix-repl> texlive.collection-<TAB>
+]]></programlisting>
    </para>
   </listitem>
   <listitem>