import 15.2.0 Octopus source

[ceph.git] / ceph / doc / start / intro.rst

diff --git a/ceph/doc/start/intro.rst b/ceph/doc/start/intro.rst
index 69f1bb99f5aa40b871bdcad8ab71b2c280308724..4907789b88e8d8106c6ac162ce1ae5553ab83db2 100644 (file)
--- a/ceph/doc/start/intro.rst
+++ b/ceph/doc/start/intro.rst
@@ -4,12 +4,12 @@
 
 Whether you want to provide :term:`Ceph Object Storage` and/or
 :term:`Ceph Block Device` services to :term:`Cloud Platforms`, deploy
-a :term:`Ceph Filesystem` or use Ceph for another purpose, all
+a :term:`Ceph File System` or use Ceph for another purpose, all
 :term:`Ceph Storage Cluster` deployments begin with setting up each
 :term:`Ceph Node`, your network, and the Ceph Storage Cluster. A Ceph
 Storage Cluster requires at least one Ceph Monitor, Ceph Manager, and
 Ceph OSD (Object Storage Daemon). The Ceph Metadata Server is also
-required when running Ceph Filesystem clients.
+required when running Ceph File System clients.
 
 .. ditaa::  +---------------+ +------------+ +------------+ +---------------+
             |      OSDs     | | Monitors   | |  Managers  | |      MDSs     |
@@ -17,11 +17,11 @@ required when running Ceph Filesystem clients.
 
 - **Monitors**: A :term:`Ceph Monitor` (``ceph-mon``) maintains maps
   of the cluster state, including the monitor map, manager map, the
-  OSD map, and the CRUSH map.  These maps are critical cluster state
-  required for Ceph daemons to coordinate with each other.  Monitors
-  are also responsible for managing authentication between daemons and
-  clients.  At least three monitors are normally required for
-  redundancy and high availability.
+  OSD map, the MDS map, and the CRUSH map.  These maps are critical 
+  cluster state required for Ceph daemons to coordinate with each other.  
+  Monitors are also responsible for managing authentication between 
+  daemons and clients.  At least three monitors are normally required 
+  for redundancy and high availability.
 
 - **Managers**: A :term:`Ceph Manager` daemon (``ceph-mgr``) is
   responsible for keeping track of runtime metrics and the current
@@ -40,7 +40,7 @@ required when running Ceph Filesystem clients.
   and high availability.
 
 - **MDSs**: A :term:`Ceph Metadata Server` (MDS, ``ceph-mds``) stores
-  metadata on behalf of the :term:`Ceph Filesystem` (i.e., Ceph Block
+  metadata on behalf of the :term:`Ceph File System` (i.e., Ceph Block
   Devices and Ceph Object Storage do not use MDS). Ceph Metadata
   Servers allow POSIX file system users to execute basic commands (like
   ``ls``, ``find``, etc.) without placing an enormous burden on the