about summary refs log tree commit diff
path: root/doc/package-notes.xml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/package-notes.xml')
-rw-r--r--doc/package-notes.xml66
1 files changed, 33 insertions, 33 deletions
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index d2c660e22a9b..ef3c2a7c848a 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -311,7 +311,8 @@ packageOverrides = pkgs: {
   <title>Elm</title>
 
   <para>
-   To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command>
+   To start a development environment do <command>nix-shell -p elmPackages.elm
+   elmPackages.elm-format</command>
   </para>
 
   <para>
@@ -506,10 +507,11 @@ stdenv.mkDerivation {
    <para>
     The IBus engine is based on <literal>hunspell</literal> to support
     completion in many languages. By default the dictionaries
-    <literal>de-de</literal>, <literal>en-us</literal>, <literal>fr-moderne</literal>
-    <literal>es-es</literal>, <literal>it-it</literal>,
-    <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add
-    another dictionary, the package can be overridden like this:
+    <literal>de-de</literal>, <literal>en-us</literal>,
+    <literal>fr-moderne</literal> <literal>es-es</literal>,
+    <literal>it-it</literal>, <literal>sv-se</literal> and
+    <literal>sv-fi</literal> are in use. To add another dictionary, the package
+    can be overridden like this:
 <programlisting>ibus-engines.typing-booster.override {
   langs = [ "de-at" "en-gb" ];
 }</programlisting>
@@ -543,47 +545,45 @@ stdenv.mkDerivation {
   <title>Nginx</title>
 
   <para>
-    <link xlink:href="https://nginx.org/">Nginx</link> is a
-    reverse proxy and lightweight webserver.
+   <link xlink:href="https://nginx.org/">Nginx</link> is a reverse proxy and
+   lightweight webserver.
   </para>
 
   <section xml:id="sec-nginx-etag">
    <title>ETags on static files served from the Nix store</title>
 
    <para>
-     HTTP has a couple different mechanisms for caching to prevent
-     clients from having to download the same content repeatedly
-     if a resource has not changed since the last time it was requested.
-     When nginx is used as a server for static files, it implements
-     the caching mechanism based on the
-     <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link>
-     response header automatically; unfortunately, it works by using
-     filesystem timestamps to determine the value of the
-     <literal>Last-Modified</literal> header. This doesn't give the
-     desired behavior when the file is in the Nix store, because all
-     file timestamps are set to 0 (for reasons related to build
-     reproducibility).
+    HTTP has a couple different mechanisms for caching to prevent clients from
+    having to download the same content repeatedly if a resource has not
+    changed since the last time it was requested. When nginx is used as a
+    server for static files, it implements the caching mechanism based on the
+    <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified"><literal>Last-Modified</literal></link>
+    response header automatically; unfortunately, it works by using filesystem
+    timestamps to determine the value of the <literal>Last-Modified</literal>
+    header. This doesn't give the desired behavior when the file is in the Nix
+    store, because all file timestamps are set to 0 (for reasons related to
+    build reproducibility).
    </para>
 
    <para>
-     Fortunately, HTTP supports an alternative (and more effective)
-     caching mechanism: the
+    Fortunately, HTTP supports an alternative (and more effective) caching
+    mechanism: the
     <link xlink:href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag"><literal>ETag</literal></link>
-    response header. The value of the <literal>ETag</literal> header
-    specifies some identifier for the particular content that the
-    server is sending (e.g. a hash). When a client makes a second
-    request for the same resource, it sends that value back in an
-    <literal>If-None-Match</literal> header. If the ETag value is
-    unchanged, then the server does not need to resend the content.
+    response header. The value of the <literal>ETag</literal> header specifies
+    some identifier for the particular content that the server is sending (e.g.
+    a hash). When a client makes a second request for the same resource, it
+    sends that value back in an <literal>If-None-Match</literal> header. If the
+    ETag value is unchanged, then the server does not need to resend the
+    content.
    </para>
 
    <para>
-    As of NixOS 19.09, the nginx package in Nixpkgs is patched such
-    that when nginx serves a file out of <filename>/nix/store</filename>,
-    the hash in the store path is used as the <literal>ETag</literal>
-    header in the HTTP response, thus providing proper caching functionality.
-    This happens automatically; you do not need to do modify any
-    configuration to get this behavior.
+    As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when
+    nginx serves a file out of <filename>/nix/store</filename>, the hash in the
+    store path is used as the <literal>ETag</literal> header in the HTTP
+    response, thus providing proper caching functionality. This happens
+    automatically; you do not need to do modify any configuration to get this
+    behavior.
    </para>
   </section>
  </section>