summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Bennett2008-05-08 12:28:51 (GMT)
committerStephen Bennett2008-05-08 12:28:51 (GMT)
commitde6ee9c6ad50d4d130e9ad02f31bddced15293f4 (patch)
tree236f53e4d910290dcd793142139a2cf251705dae
parent10aa0db466d621ea5377cd41a316f3506b6fdf18 (diff)
Note that mtimes may be discarded on merge
-rw-r--r--merge.tex6
1 files changed, 4 insertions, 2 deletions
diff --git a/merge.tex b/merge.tex
index b2ba786..1f88f79 100644
--- a/merge.tex
+++ b/merge.tex
@@ -30,7 +30,8 @@ except as follows:
its group be that of the root user.
\end{compactitem}
-On SELinux systems, the SELinux context must also be preserved. Other directory attributes may be discarded.
+On SELinux systems, the SELinux context must also be preserved. Other directory attributes, including
+modification time, may be discarded.
\subsection{Empty Directories}
@@ -59,7 +60,8 @@ as follows:
set*id bit set.
\end{compactitem}
-On SELinux systems, the SELinux context must also be preserved. Other file attributes may be discarded.
+On SELinux systems, the SELinux context must also be preserved. Other file attributes, including
+modification time, may be discarded.
\subsection{Configuration File Protection}
\label{config-protect}