From 8ff82869c72bbba9536d361195db24c6c83e60d0 Mon Sep 17 00:00:00 2001
From: Matt Kangas <matt.kangas@mongodb.com>
Date: Tue, 25 Nov 2014 10:53:00 -0500
Subject: [PATCH] DOCS-4429 --noprealloc is deprecated

---
 source/faq/storage.txt                      | 19 -------------------
 source/includes/options-conf.yaml           | 14 --------------
 source/includes/options-mongod.yaml         |  8 ++++----
 source/tutorial/add-replica-set-arbiter.txt |  6 ++----
 4 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/source/faq/storage.txt b/source/faq/storage.txt
index 4576f82d90c..67c1776342c 100644
--- a/source/faq/storage.txt
+++ b/source/faq/storage.txt
@@ -129,25 +129,6 @@ inserted into the database. Consider the following possible causes:
   file that may be 90% empty. For most larger databases, unused
   allocated space is small compared to the database.
 
-  On Unix-like systems, :program:`mongod` preallocates an additional data file and
-  initializes the disk space to ``0``.  Preallocating data files in
-  the background prevents significant delays when a new database file
-  is next allocated.
-
-  You can disable preallocation by setting
-  :setting:`~storage.preallocDataFiles` to ``false``. However do not
-  disable :setting:`~storage.preallocDataFiles` for production
-  environments: only use :setting:`~storage.preallocDataFiles` for
-  testing and with small data sets where you frequently drop
-  databases.
-
-  On Linux systems you can use ``hdparm`` to get an idea of how costly
-  allocation might be:
-
-  .. code-block:: sh
-
-     time hdparm --fallocate $((1024*1024)) testfile
-
 - The :term:`oplog`.
 
   If this :program:`mongod` is a member of a replica set, the data
diff --git a/source/includes/options-conf.yaml b/source/includes/options-conf.yaml
index c8ca47989b1..2eba0dac750 100644
--- a/source/includes/options-conf.yaml
+++ b/source/includes/options-conf.yaml
@@ -717,20 +717,6 @@ post: |
   The {{role}} option is available only for :program:`mongod`.
 ---
 program: conf
-name: storage.preallocDataFiles
-type: boolean
-default: true
-directive: setting
-replacement:
-  program: ":program:`mongod`"
-inherit:
-  name: noprealloc
-  program: mongod
-  file: options-mongod.yaml
-post: |
-  The {{role}} option is available only for :program:`mongod`.
----
-program: conf
 name: storage.nsSize
 type: integer
 default: 16
diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml
index aba27530fba..c5c39e231d3 100644
--- a/source/includes/options-mongod.yaml
+++ b/source/includes/options-mongod.yaml
@@ -591,10 +591,10 @@ name: noprealloc
 args: null
 directive: option
 description: |
-  Disables the preallocation of data files. This shortens the
-  start up time in some cases and can cause significant performance
-  penalties during normal operations.
-optional: true
+  .. deprecated:: 2.6
+
+  Disables the preallocation of data files. Currently the default.
+  Exists for future compatibility and clarity.
 ---
 program: mongod
 name: noscripting
diff --git a/source/tutorial/add-replica-set-arbiter.txt b/source/tutorial/add-replica-set-arbiter.txt
index 0360d1a4d2a..ccc32ead6a0 100644
--- a/source/tutorial/add-replica-set-arbiter.txt
+++ b/source/tutorial/add-replica-set-arbiter.txt
@@ -38,12 +38,10 @@ arbiter's :doc:`configuration file </reference/configuration-options>`:
 
 - :setting:`~storage.smallFiles` to ``true``
 
-- :setting:`~storage.preallocDataFiles` to ``false``
-
 These settings are specific to arbiters. Do not set
 :setting:`journal.enabled <storage.journal.enabled>` to ``false`` on a
-data-bearing node. Similarly, do not set :setting:`~storage.smallFiles` or
-:setting:`~storage.preallocDataFiles` unless specifically indicated.
+data-bearing node. Similarly, do not set :setting:`~storage.smallFiles`
+unless specifically indicated.
 
 Add an Arbiter
 --------------