Move the SECURITY document to the doc/ dir

Reviewed-by: imsnah

diff --git a/Makefile.am b/Makefile.am
index 5ae2e1c..ec2c318 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,7 +115,8 @@ docrst = \
        doc/design-2.0-locking.rst \
        doc/design-2.0-master-daemon.rst \
        doc/design-2.0-os-interface.rst \
-       doc/design-2.0-rapi-changes.rst
+       doc/design-2.0-rapi-changes.rst \
+       doc/security.rst
 
 doc_DATA = \
        $(patsubst %.rst,%.html,$(docrst)) \

diff --git a/doc/design-2.0-index.rst b/doc/design-2.0-index.rst
index 9ff9dec..93d88e3 100644 (file)
--- a/doc/design-2.0-index.rst
+++ b/doc/design-2.0-index.rst
@@ -29,8 +29,8 @@ design-2.0-cluster-parameters document.
 The various changes brought in by the master daemon model and the
 read-write RAPI will require changes to the cluster security; we move
 away from Twisted and use http(s) for intra- and extra-cluster
-communications. For more details, see the SECURITY document in the top
-directory.
+communications. For more details, see the security document in the
+doc/ directory.
 
 
 Functionality changes

diff --git a/SECURITY b/doc/security.rst
similarity index 100%
rename from SECURITY
rename to doc/security.rst