Author: sandervanderburg
Date: Thu Oct 21 11:25:19 2010
New Revision: 24398
URL: https://svn.nixos.org/websvn/nix/?rev=24398&sc=1
Log:
Fixed some manual typos
Modified:
disnix/disnix/trunk/doc/manual/advanced-options.xml
disnix/disnix/trunk/doc/manual/extensions.xml
disnix/disnix/trunk/doc/manual/installation.xml
disnix/disnix/trunk/doc/manual/introduction.xml
disnix/disnix/trunk/doc/manual/models.xml
disnix/disnix/trunk/doc/manual/usage.xml
Modified: disnix/disnix/trunk/doc/manual/advanced-options.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/advanced-options.xml Thu Oct 21 11:18:30
2010 (r24397)
+++ disnix/disnix/trunk/doc/manual/advanced-options.xml Thu Oct 21 11:25:19
2010 (r24398)
@@ -41,7 +41,7 @@
</para>
<para>
- Another useful usecase is setting the client interface
to <command>disnix-client</command>.
+ Another usecase is setting the client interface to
<command>disnix-client</command>.
This client interface connects directly to the D-Bus
system bus to invoke the disnix
service operations. This is useful for debugging
purposes, but you cannot use this client
for remote connections.
@@ -51,6 +51,8 @@
In some cases, also the target property must be
configured. By default Disnix uses the
<varname>hostname</varname> property defined in the
infrastructure model, to determine
how to connect to the remote Disnix service in order to
perform remote deployment steps.
+ This property is not always sufficient for every
protocol. A web service interface may require a URL
+ or a connection string may also need a port number
specification.
This property can be changed by either setting the
<varname>DISNIX_TARGET_PROPERTY</varname>
environment variable with the attribute name that
contains the address of the remote
Disnix service or by using the
<option>--target-property</option> command-line option.
Modified: disnix/disnix/trunk/doc/manual/extensions.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/extensions.xml Thu Oct 21 11:18:30
2010 (r24397)
+++ disnix/disnix/trunk/doc/manual/extensions.xml Thu Oct 21 11:25:19
2010 (r24398)
@@ -5,7 +5,7 @@
<title>Extensions</title>
<para>
- Although, Disnix makes the deployment of a distributed system
more convenient and
+ Although Disnix makes the deployment of a distributed system
more convenient and
offers features to make this process reiable and efficient,
some extensions have been
developed to make this process more convenient.
</para>
Modified: disnix/disnix/trunk/doc/manual/installation.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/installation.xml Thu Oct 21 11:18:30
2010 (r24397)
+++ disnix/disnix/trunk/doc/manual/installation.xml Thu Oct 21 11:25:19
2010 (r24398)
@@ -113,7 +113,7 @@
and an environment variable <code>NIXPKGS_ALL</code>
must point to the path where
it is installed, so that Disnix is able to find it. On
NixOS a copy is
already present and this environment variable has
already been configured.
- On other systems the variable can be configured by
adding the following lines to your
+ On other systems this variable can be configured by
adding the following lines to your
<filename>~/.bash_profile</filename> configuration (or
another configuration
file, if you use a different shell):
</para>
Modified: disnix/disnix/trunk/doc/manual/introduction.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/introduction.xml Thu Oct 21 11:18:30
2010 (r24397)
+++ disnix/disnix/trunk/doc/manual/introduction.xml Thu Oct 21 11:25:19
2010 (r24398)
@@ -6,7 +6,7 @@
<para>
Disnix is a toolset used to perform distributed deployment tasks
- and is built on top of the Nix; a package manager which has
some distinct
+ and is built on top of Nix; a package manager which has some
distinct
features compared to conventional package
managers to make deployment safe and reliable.
</para>
@@ -107,7 +107,7 @@
Disnix also allows you to specify
inter-dependencies of distributed system
components, which can be used to compose
distributed system components
into a complete system. If a certain service
has an inter-dependency on a
- different service, and the dependency is
missing, Disnix will notice this
+ particular service, and the dependency is
missing, Disnix will notice this
before deploying the system.
</para>
@@ -159,7 +159,7 @@
<para>
Disnix is, like Nix, supported on several
platforms including most Unix flavours
- such as Linux, FreeBSD, OpenBSD and Mac OS X.
It is also supported on Windows
+ such as Linux, FreeBSD, OpenBSD and Mac OS X.
Disnix is also supported on Windows
using Cygwin.
</para>
Modified: disnix/disnix/trunk/doc/manual/models.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/models.xml Thu Oct 21 11:18:30 2010
(r24397)
+++ disnix/disnix/trunk/doc/manual/models.xml Thu Oct 21 11:25:19 2010
(r24398)
@@ -289,7 +289,7 @@
Basically, a Disnix expression is nearly
identical to an ordinary
Nix expression, except that it is a nested
function (which has two
function headers instead of one). The headers
represent
- intra-dependencies and inter-dependencies
repspectively,
+ intra-dependencies and inter-dependencies
respectively,
which are both used to build and configure the
service.
</para>
@@ -531,9 +531,9 @@
<para>
The services expression is a function,
which takes 2 arguments.
The <varname>distribution</varname>
parameter represents the distribution model,
- in which services are mapped onto 1 or
more machines (this model is explained
+ in which services are mapped onto
machines in the network (this model is explained
later). This model can be used by
services to configure themselves based on the
- location of each service. The
<varname>service</varname> parameter is an identifier
+ location of each service. The
<varname>system</varname> parameter is an identifier
for the system architecture on which
services must be built. An examples of an
identifier is: <code>i686-linux</code>
representing a 32-bit <code>x86</code> Linux machine.
</para>
@@ -597,7 +597,7 @@
<para>
Finally, we must know how to activate
and deactive a service. Since services can represent
many things such as a database or web
application, we cannot perform this step generically.
- This attribute specifies the type of
the web service, which will invoke a activation script
+ This attribute specifies the type of
the service, which will invoke a activation script
on the target machine performing the
actual activation or deactivation process.
Various types are supported such as:
<code>tomcat-webapplication</code> which will activate
a web application on Apache Tomcat,
<code>mysql-database</code> which will import
@@ -650,7 +650,8 @@
<callout arearefs='co-1-target'>
<para>
The infrastructure model is an
attribute set in which each attribute represents a
- machine in the network.
+ machine in the network. This attribute
refers to the properties of a machine called
+ <code>test2</code>.
</para>
</callout>
@@ -728,7 +729,7 @@
<para>
This attribute assignment states that
the <code>zipcodes</code> service should be
deployed on machine <code>test2</code>.
- The machine and its properties be
accessed by using the <varname>target</varname> property
+ The machine and its properties can be
accessed by using the <varname>target</varname> property
on an inter-dependency argument in a
Disnix expression, such as
<xref linkend="ex-3-zipcode-service" />.
</para>
Modified: disnix/disnix/trunk/doc/manual/usage.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/usage.xml Thu Oct 21 11:18:30 2010
(r24397)
+++ disnix/disnix/trunk/doc/manual/usage.xml Thu Oct 21 11:25:19 2010
(r24398)
@@ -50,9 +50,9 @@
<para>
This command produces a <emphasis>manifest</emphasis>
file, which is basically
- a more concrete version of the distribution model. This
file contains
- to the Nix store paths of all the build results, types
and connection settings, which can be used to distribute
- services and to activate them.
+ a more concrete version of the distribution model. This
file contains references
+ to the Nix store paths of all the build results, types
and connection settings and dependent
+ mappings which can be used to distribute services and
to activate them.
As a side effect, all the services that are specified
in the distribution model
are built from source code.
The manifest is produced in the Nix store
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
