Merge pull request #6631 from benbc/3.0-database-by-name

Document references to database by name instead of path

community/dbms/src/main/java/org/neo4j/dbms/DatabaseManagementSystemSettings.java

@@ -30,8 +30,11 @@ public interface DatabaseManagementSystemSettings
 {
     @Description("Name of the database to load")
     Setting<String> active_database = Settings.setting( "dbms.active_database", Settings.STRING, "graph.db" );
-    @Description("Path of the data directory")
+
+    @Description("Path of the data directory. You must not configure more than one Neo4j installation to use the " +
+            "same data directory.")
     Setting<File> data_directory = Settings.setting( "dbms.directories.data", Settings.PATH, "data" );
+
     @Internal
     Setting<File> database_path = Settings.derivedSetting( "unsupported.dbms.directories.database",
             data_directory, active_database,

community/neo4j/src/docs/ops/upgrades.asciidoc

@@ -4,6 +4,7 @@
 :manual-base-url: http://neo4j.com/docs/{neo4j-version}
 :manual-ha-upgrade-guide: {manual-base-url}/ha-upgrade-guide.html
 :manual-cypher-compatibility: {manual-base-url}/cypher-compatibility.html
+:manual-neo4j-admin-manpage: {manual-base-url}/re02.html
 :neo4j-releases-download-page: http://neo4j.com/download/other-releases
 
 This section describes upgrading a _single_ Neo4j instance.
@@ -54,7 +55,9 @@ available with Neo4j Enterprise, ensure that backups have completed successfully
 . Install Neo4j {neo4j-version}.
 . Review the settings in the files under configuration files in the previous installation, and transfer any custom settings to the {neo4j-version} installation.
   Be aware of settings that have changed name between versions.
-. Copy the database from the old installation (typically _data/graph.db_) into the new one (_data/databases/graph.db_).
+. Import your data from the old installation using `neo4j-admin import --mode=database --database=<database-name> --from=<source-directory>` (for details, see
+ifndef::upgradetext[<<neo4j-admin-manpage, the man page>>).]
+ifdef::upgradetext[the man page at {manual-neo4j-admin-manpage}).]
 . If the database is not called `graph.db`, set `dbms.active_database` in `neo4j.conf` to the name of the database.
 . Set `dbms.allow_format_migration=true` in `neo4j.conf` of the {neo4j-version} installation.
   Neo4j will fail to start without this configuration.

manual/contents/src/operations/installation-deployment/file-locations.asciidoc

@@ -1,14 +1,17 @@
 [[file-locations]]
 = File Locations
 
-This table shows where important files can be found in various Neo4j distribution packages.
+This table shows where important files can be found by default in various Neo4j distribution packages.
+Many of these paths are configurable; see <<configuration-settings>> for details.
 
 [options="header"]
 |===
-|Package               |Configuration
-|Linux or OS X tarball |_<neo4j-root>/conf/neo4j.conf_
-|Windows zip           |_<neo4j-root>\conf\neo4j.conf_
-|Debian/Ubuntu .deb    |_/etc/neo4j/neo4j.conf_
-|Windows desktop       |_%APPDATA%\Neo4j Community Edition\neo4j.conf_
-|OS X desktop          |_$\{HOME\}/Documents/Neo4j/neo4j.conf_
+|Package               |Configuration                                  |Data
+|Linux or OS X tarball |_<neo4j-root>/conf/neo4j.conf_                 |_<neo4j-root>/data_
+|Windows zip           |_<neo4j-root>\conf\neo4j.conf_                 |_<neo4j-root>\data_
+|Debian/Ubuntu .deb    |_/etc/neo4j/neo4j.conf_                        |_/var/lib/neo4j_
+|Windows desktop       |_%APPDATA%\Neo4j Community Edition\neo4j.conf_ |_%APPDATA%\Neo4j Community Edition_
+|OS X desktop          |_$\{HOME\}/Documents/Neo4j/neo4j.conf_         |_$\{HOME\}/Documents/Neo4j_
 |===
+
+Please note that the structure directories and files in the data directory is internal to Neo4j and subject to change between versions without notice.