aboutsummaryrefslogtreecommitdiff
path: root/doc/manual/introduction
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-16 14:36:32 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-16 14:36:32 +0200
commitd0608da13fa8e95e92c45e6f77a99731177d5d0c (patch)
tree8876915939f4335869ada0f6a2417269c7fb2362 /doc/manual/introduction
parent8b760182cda457d788c8e6a1cbef101d81eb4aac (diff)
Drop "service deployment" bla bla
Diffstat (limited to 'doc/manual/introduction')
-rw-r--r--doc/manual/introduction/about-nix.xml30
1 files changed, 1 insertions, 29 deletions
diff --git a/doc/manual/introduction/about-nix.xml b/doc/manual/introduction/about-nix.xml
index e45a32d21..0346934b0 100644
--- a/doc/manual/introduction/about-nix.xml
+++ b/doc/manual/introduction/about-nix.xml
@@ -80,11 +80,6 @@ package won’t be built or downloaded a second time. At the same time,
it is not possible for one user to inject a Trojan horse into a
package that might be used by another user.</para>
-<!--
-<para>More details can be found in Section 3 of our <a
-href="docs/papers.html#securesharing">ASE 2005 paper</a>.</para>
--->
-
</simplesect>
@@ -198,33 +193,10 @@ collection</emphasis> (Nixpkgs).</para>
</simplesect>
-<simplesect><title>Service deployment</title>
-
-<para>Nix can be used not only for rolling out packages, but also
-complete <emphasis>configurations</emphasis> of services. This is
-done by treating all the static bits of a service (such as software
-packages, configuration files, control scripts, static web pages,
-etc.) as “packages” that can be built by Nix expressions. As a
-result, all the features above apply to services as well: for
-instance, you can roll back a web server configuration if a
-configuration change turns out to be undesirable, you can easily have
-multiple instances of a service (e.g., a test and production server),
-and because the whole service is built in a purely functional way from
-a Nix expression, it is repeatable so you can easily reproduce the
-service on another machine.</para>
-
-<!--
-<para>You can read more about this in our <a
-href="docs/papers.html#servicecm">SCM-12 paper</a>.</para>
--->
-
-</simplesect>
-
-
<simplesect><title>Portability</title>
<para>Nix should run on most Unix systems, including Linux and Mac OS
-X.
+X.</para>
</simplesect>