summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2018-04-25 00:05:18 -0500
committerAustin Seipp <aseipp@pobox.com>2018-04-25 00:05:18 -0500
commite4e85628066b0fa33ff5d3ba01ad24a50974639a (patch)
tree3c0a1777a33fc65927db6f05154083f8dd8b645b /nixos
parentfefbc047d23c1a4b4f00c1a009edb56075e995ab (diff)
downloadnixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar.gz
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar.bz2
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar.lz
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar.xz
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.tar.zst
nixpkgs-e4e85628066b0fa33ff5d3ba01ad24a50974639a.zip
nixos: typofixes/tab deletion in some foundationdb docs/module
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/databases/foundationdb.nix8
-rw-r--r--nixos/modules/services/databases/foundationdb.xml9
2 files changed, 9 insertions, 8 deletions
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index ba921a9c152..22acddc8ca9 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -206,7 +206,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Machine identifier key. All processes on a machine should share a
+              Machine identifier key. All processes on a machine should share a
               unique id. By default, processes on a machine determine a unique id to share.
               This does not generally need to be set.
             '';
@@ -216,7 +216,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Zone identifier key. Processes that share a zone id are
+              Zone identifier key. Processes that share a zone id are
               considered non-unique for the purposes of data replication.
               If unset, defaults to machine id.
             '';
@@ -226,7 +226,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Data center identifier key. All processes physically located in a
+              Data center identifier key. All processes physically located in a
               data center should share the id. If you are depending on data
               center based replication this must be set on all processes.
             '';
@@ -236,7 +236,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Data hall identifier key. All processes physically located in a
+              Data hall identifier key. All processes physically located in a
               data hall should share the id. If you are depending on data
               hall based replication this must be set on all processes.
             '';
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index d10a5cfe836..2a0e3c76c9d 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -16,8 +16,8 @@
 
 <para>FoundationDB (or "FDB") is a distributed, open source, high performance,
 transactional key-value store. It can store petabytes of data and deliver
-exceptional performance while maintaining consistency and ACID semantics over a
-large cluster.</para>
+exceptional performance while maintaining consistency and ACID semantics
+(serializable transactions) over a large cluster.</para>
 
 <section><title>Configuring and basic setup</title>
 
@@ -101,7 +101,7 @@ FoundationDB worker processes that should be started on the machine.</para>
 
 <para>FoundationDB worker processes typically require 4GB of RAM per-process at
 minimum for good performance, so this option is set to 1 by default since the
-maximum aount of RAM is unknown. You're advised to abide by this restriction,
+maximum amount of RAM is unknown. You're advised to abide by this restriction,
 so pick a number of processes so that each has 4GB or more.</para>
 
 <para>A similar option exists in order to scale backup agent processes,
@@ -129,7 +129,8 @@ client applications will use to find and join coordinators. Note that this file
 <emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is
 designed so that it will rewrite the file at runtime for all clients and nodes
 when cluster coordinators change, with clients transparently handling this
-without intervention.</para>
+without intervention. It is fundamentally a mutable file, and you should not
+try to manage it in any way in NixOS.</para>
 
 <para>When dealing with a cluster, there are two main things you want to
 do:</para>