Merge branch '3.0' into 3.1

neo4j · Nov 4, 2016 · d09fe67 · d09fe67
2 parents 3e0e784 + 65f5bcb
commit d09fe67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...ging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.conf b/...ging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.conf
@@ -11,10 +11,9 @@
 #dbms.directories.certificates=certificates
 #dbms.directories.logs=logs
 
-# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to
-# allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the `LOAD
-# CSV`
-# section of the manual for details.
+# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or comment it out to
+# allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the
+# `LOAD CSV` section of the manual for details.
 dbms.directories.import=import
 
 # Whether requests to Neo4j are authenticated.

diff --git a/...ng/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.conf b/...ng/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.conf
@@ -11,10 +11,9 @@
 #dbms.directories.certificates=certificates
 #dbms.directories.logs=logs
 
-# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to
-# allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the `LOAD
-# CSV`
-# section of the manual for details.
+# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or comment it out to
+# allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the
+# `LOAD CSV` section of the manual for details.
 dbms.directories.import=import
 
 # Whether requests to Neo4j are authenticated.