Skip to content
This repository was archived by the owner on Aug 6, 2020. It is now read-only.

Commit 4a87134

Browse files
jexpjexp
committed
render
1 parent 6f14759 commit 4a87134

File tree

9 files changed

+68
-41
lines changed

9 files changed

+68
-41
lines changed

‎data-modeling/guide-data-modeling/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ <h3>Nodes</h3>
785785
</div>
786786
<div class="imageblock">
787787
<p class="content">
788-
<img src="./data-modeling-3.png" alt="Extract Nodes">
788+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//data-modeling-3.png" alt="Extract Nodes">
789789
</p>
790790
</div>
791791
</div>
@@ -882,7 +882,7 @@ <h3>Labels</h3>
882882
</div>
883883
<div class="imageblock">
884884
<p class="content">
885-
<img src="./data-modeling-2.png" alt="Extract labels">
885+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//data-modeling-2.png" alt="Extract labels">
886886
</p>
887887
</div>
888888

@@ -895,7 +895,7 @@ <h3>Labels</h3>
895895

896896
<div class="imageblock">
897897
<p class="content">
898-
<img src="./data-modeling-4.png" alt="Apply labels">
898+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//data-modeling-4.png" alt="Apply labels">
899899
</p>
900900
</div>
901901
</div>
@@ -952,7 +952,7 @@ <h3>Draw the Data Model</h3>
952952

953953
<div class="imageblock">
954954
<p class="content">
955-
<img src="./data-modeling-1.png" alt="Graph data model">
955+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//data-modeling-1.png" alt="Graph data model">
956956
</p>
957957
</div>
958958
</div>
@@ -1007,7 +1007,7 @@ <h3>List your Questions</h3>
10071007

10081008
<div class="imageblock">
10091009
<p class="content">
1010-
<img src="./data-modeling-5.png" alt="Graph data model with properties">
1010+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//data-modeling-5.png" alt="Graph data model with properties">
10111011
</p>
10121012
</div>
10131013
<div class="ulist side-nav">

‎data-modeling/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ <h1><a href="http://neo4j.com/"><img
259259
<div class="marquee blue">
260260
<div class="row text-center">
261261
<div class="medium-10 small-centered columns">
262-
<h1 class="entry-title">Cypher Query Language</h1>
262+
<h1 class="entry-title">Data Modeling</h1>
263263
</div>
264264
</div>
265265
</div>
@@ -272,7 +272,7 @@ <h1 class="entry-title">Cypher Query Language</h1>
272272
<ul class="breadcrumbs">
273273
<li><a href="/developer-resources">Developer Guides</a></li>
274274

275-
<li class="current"><a href="#">Cypher Query Language</a></li>
275+
<li class="current"><a href="#">Data Modeling</a></li>
276276
</ul>
277277
</div>
278278
</div>

‎in-production/guide-cloud-deployment/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ <h4>GrapheneDB</h4>
828828
</div>
829829
<div class="imageblock">
830830
<p class="content">
831-
<img src="./graphenedb.png" alt="graphenedb" width="400">
831+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//graphenedb.png" alt="graphenedb" width="400">
832832
</p>
833833
</div>
834834

‎in-production/guide-performance-tuning/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ <h3>OS Memory Sizing</h3>
663663
<h3>Page Cache Sizing</h3>
664664
<div class="imageblock" style="float: right;">
665665
<p class="content">
666-
<img src="./neo4j_memory_usage.jpg" alt="neo4j memory usage" width="300">
666+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads//neo4j_memory_usage.jpg" alt="neo4j memory usage" width="300">
667667
</p>
668668
</div>
669669

‎integration/docker/docker-2.x/index.html

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,8 @@ <h1 class="entry-title">Docker image for Neo4j 2.x</h1>
605605
<i class="fa icon-note" title="Note"></i>
606606
</td>
607607
<td class="content">
608-
Docker does not run natively on Mac OSX or Windows. For running Docker on <a href="https://docs.docker.com/engine/installation/mac/">Max OSX</a> and <a href="https://docs.docker.com/engine/installation/windows/">Windows</a> please consult the Docker documentation.
608+
Docker does not run natively on Mac OSX or Windows.
609+
For running Docker on <a href="https://docs.docker.com/engine/installation/mac/">Mac OSX</a> and <a href="https://docs.docker.com/engine/installation/windows/">Windows</a> please consult the Docker documentation.
609610
</td>
610611
</tr>
611612
</table>
@@ -641,7 +642,8 @@ <h3>Overview</h3>
641642
<i class="fa icon-note" title="Note"></i>
642643
</td>
643644
<td class="content">
644-
All the volumes in this documentation are stored under <code>$HOME</code> in order to work on OSX where <code>$HOME</code> is automatically mounted into the machine VM. On Linux the volumes can be stored anywhere.
645+
All the volumes in this documentation are stored under <code>$HOME</code> in order to work on OSX where <code>$HOME</code> is automatically mounted into the machine VM.
646+
On Linux the volumes can be stored anywhere.
645647
</td>
646648
</tr>
647649
</table>
@@ -653,7 +655,8 @@ <h3>Overview</h3>
653655
<i class="fa icon-note" title="Note"></i>
654656
</td>
655657
<td class="content">
656-
By default Neo4j requires authentication. You have to login with <code>neo4j/neo4j</code> at the first connection and set a new password.
658+
By default Neo4j requires authentication.
659+
You have to login with <code>neo4j/neo4j</code> at the first connection and set a new password.
657660
</td>
658661
</tr>
659662
</table>
@@ -687,13 +690,17 @@ <h3>Neo4j editions</h3>
687690

688691

689692
<div class="paragraph">
690-
<p>Neo4j Enterprise Edition is designed for commercial deployments where scale and availability are important. Use of Neo4j Enterprise Edition requires a commercial license agreement with Neo Technology. Please see <a href="http://neo4j.com/licensing/">Neo4j licensing</a> for details.</p>
693+
<p>Neo4j Enterprise Edition is designed for commercial deployments where scale and availability are important.
694+
Use of Neo4j Enterprise Edition requires a commercial license agreement with Neo Technology.
695+
Please see <a href="http://neo4j.com/licensing/">Neo4j licensing</a> for details.</p>
691696
</div>
692697

693698

694699

695700
<div class="paragraph">
696-
<p>Tags are available for both editions. Version-specific Enterprise tags have an <code>-enterprise</code> suffix (like <code>neo4j:2.3.0-enterprise</code>), Community tags have no suffix (like <code>neo4j:2.3.0</code>). The latest Enterprise release is available as <code>neo4j:enterprise</code>.</p>
701+
<p>Tags are available for both editions.
702+
Version-specific Enterprise tags have an <code>-enterprise</code> suffix (like <code>neo4j:2.3.0-enterprise</code>), Community tags have no suffix (like <code>neo4j:2.3.0</code>).
703+
The latest Enterprise release is available as <code>neo4j:enterprise</code>.</p>
697704
</div>
698705

699706
</div>
@@ -710,7 +717,8 @@ <h3>File descriptor limit</h3>
710717

711718

712719
<div class="paragraph">
713-
<p>Docker controls the number of open file descriptors in a container; the limit depends on the configuration of your system. We recommend a limit of at least 40000 for running Neo4j.</p>
720+
<p>Docker controls the number of open file descriptors in a container; the limit depends on the configuration of your system.
721+
We recommend a limit of at least 40000 for running Neo4j.</p>
714722
</div>
715723

716724

@@ -748,7 +756,9 @@ <h3>Neo4j configuration</h3>
748756

749757

750758
<div class="paragraph">
751-
<p>The default configuration provided by this image is intended for learning about Neo4j, but must be modified to make it suitable for production use. In particular the memory assigned to Neo4j is very limited (see <code>NEO4J_CACHE_MEMORY</code> and <code>NEO4J_HEAP_MEMORY</code> below), to allow multiple containers to be run on the same server. You can read more about configuring Neo4j in the <a href="http://neo4j.com/docs/stable/configuration.html">manual</a>.</p>
759+
<p>The default configuration provided by this image is intended for learning about Neo4j, but must be modified to make it suitable for production use.
760+
In particular the memory assigned to Neo4j is very limited (see <code>NEO4J_CACHE_MEMORY</code> and <code>NEO4J_HEAP_MEMORY</code> below), to allow multiple containers to be run on the same server.
761+
You can read more about configuring Neo4j in the <a href="http://neo4j.com/docs/stable/configuration.html">manual</a>.</p>
752762
</div>
753763

754764

@@ -850,7 +860,9 @@ <h3><code>/conf</code> volume</h3>
850860

851861

852862
<div class="paragraph">
853-
<p>Any configuration files in the <code>/conf</code> volume will override files provided by the image. This includes values that may have been set in response to environment variables passed to the container by Docker. So if you want to change one value in a file you must ensure that the rest of the file is complete and correct.</p>
863+
<p>Any configuration files in the <code>/conf</code> volume will override files provided by the image.
864+
This includes values that may have been set in response to environment variables passed to the container by Docker.
865+
So if you want to change one value in a file you must ensure that the rest of the file is complete and correct.</p>
854866
</div>
855867

856868

@@ -921,7 +933,8 @@ <h3>Neo4j HA</h3>
921933

922934

923935
<div class="paragraph">
924-
<p>In order to run Neo4j in HA mode under Docker you need to wire up the containers in the cluster so that they can talk to each other. Each container must have a network route to each of the others and the <code>NEO4J_HA_ADDRESS</code> and <code>NEO4J_INITIAL_HOSTS</code> environment variables must be set according (see above).</p>
936+
<p>In order to run Neo4j in HA mode under Docker you need to wire up the containers in the cluster so that they can talk to each other.
937+
Each container must have a network route to each of the others and the <code>NEO4J_HA_ADDRESS</code> and <code>NEO4J_INITIAL_HOSTS</code> environment variables must be set according (see above).</p>
925938
</div>
926939

927940

@@ -956,7 +969,8 @@ <h3>Plugins and unmanaged extensions</h3>
956969

957970

958971
<div class="paragraph">
959-
<p>To install a plugin or unmanaged extension, provide a <code>/plugins</code> volume containing the jars. For unmanged extensions you also need to provide an environment variable specifying a URI mapping.</p>
972+
<p>To install a plugin or unmanaged extension, provide a <code>/plugins</code> volume containing the jars.
973+
For unmanged extensions you also need to provide an environment variable specifying a URI mapping.</p>
960974
</div>
961975

962976
<div class="listingblock">
@@ -992,19 +1006,22 @@ <h3>AppArmor</h3>
9921006

9931007

9941008
<div class="paragraph">
995-
<p>Neo4j uses of <code>lsof</code> to ensure the server is running and accepting connections on a given port. Some AppArmor configurations (specifically the default configuration on Linux Mint) prevent <code>lsof</code> from working as expected.</p>
1009+
<p>Neo4j uses of <code>lsof</code> to ensure the server is running and accepting connections on a given port.
1010+
Some AppArmor configurations (specifically the default configuration on Linux Mint) prevent <code>lsof</code> from working as expected.</p>
9961011
</div>
9971012

9981013

9991014

10001015
<div class="paragraph">
1001-
<p>A workaround is to run the docker image in privileged mode, by adding <code>--privileged=true</code> to the docker command line. This is a workaround that disables the security provided by AppArmor, and is not recommended for deployments.</p>
1016+
<p>A workaround is to run the docker image in privileged mode, by adding <code>--privileged=true</code> to the docker command line.
1017+
This is a workaround that disables the security provided by AppArmor, and is not recommended for deployments.</p>
10021018
</div>
10031019

10041020

10051021

10061022
<div class="paragraph">
1007-
<p>The current best known solution is to enable the use of ptrace in the docker profile of AppArmor. Do this by adding the following line to <code>/etc/init.d/docker</code>:</p>
1023+
<p>The current best known solution is to enable the use of ptrace in the docker profile of AppArmor.
1024+
Do this by adding the following line to <code>/etc/init.d/docker</code>:</p>
10081025
</div>
10091026

10101027
<div class="literalblock">
@@ -1024,7 +1041,10 @@ <h3>HTTPS support</h3>
10241041

10251042

10261043
<div class="paragraph">
1027-
<p>To use your own key and certificate, provide an <code>/ssl</code> volume with the key and certificate inside. The key filename must end in <code>.key</code>, and the certificate in <code>.cert</code>. Only one of each file may be present. You must also publish port <code>7473</code> to access the HTTPS endpoint.</p>
1044+
<p>To use your own key and certificate, provide an <code>/ssl</code> volume with the key and certificate inside.
1045+
The key filename must end in <code>.key</code>, and the certificate in <code>.cert</code>.
1046+
Only one of each file may be present.
1047+
You must also publish port <code>7473</code> to access the HTTPS endpoint.</p>
10281048
</div>
10291049

10301050
<div class="listingblock">

‎integration/docker/docker-3.0/index.html

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ <h3>Overview</h3>
626626
<pre>docker run \
627627
--publish=7474:7474 --publish=7687:7687 \
628628
--volume=$HOME/neo4j/data:/data \
629-
neo4j</pre>
629+
neo4j:3.0</pre>
630630
</div>
631631
</div>
632632

@@ -722,6 +722,13 @@ <h3>Upgrading</h3>
722722
</li>
723723
</ul>
724724
</div>
725+
726+
727+
<div class="paragraph">
728+
<p>If you are supplying your own configuration files rather than using environment variables then you will need to migrate those.
729+
See the <a href="http://neo4j.com/docs/operations-manual/3.0-RC1/#deployment-upgrading">manual</a> for details.</p>
730+
</div>
731+
725732
</div>
726733
<div id="_docker_configuration" class="sect1 columns medium-12" style='padding-left: 0;' >
727734
<h3>Docker configuration</h3>
@@ -748,7 +755,7 @@ <h3>File descriptor limit</h3>
748755

749756
<div class="listingblock">
750757
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
751-
<pre>docker run neo4j \
758+
<pre>docker run neo4j:3.0 \
752759
bash -c 'echo Soft limit: $(ulimit -Sn); echo Hard limit: $(ulimit -Hn)'</pre>
753760
</div>
754761
</div>
@@ -765,7 +772,7 @@ <h3>File descriptor limit</h3>
765772
--publish=7474:7474 --publish=7687:7687 \
766773
--volume=$HOME/neo4j/data:/data \
767774
--ulimit=nofile=40000:40000
768-
neo4j</pre>
775+
neo4j:3.0</pre>
769776
</div>
770777
</div>
771778
</div>
@@ -801,7 +808,7 @@ <h3>Environment variables</h3>
801808
--publish=7474:7474 --publish=7687:7687 \
802809
--volume=$HOME/neo4j/data:/data \
803810
--env=NEO4J_dbms_memory_pagecache_size=4G \
804-
neo4j</pre>
811+
neo4j:3.0</pre>
805812
</div>
806813
</div>
807814

@@ -879,7 +886,7 @@ <h3><code>/conf</code> volume</h3>
879886
--publish=7474:7474 --publish=7687:7687 \
880887
--volume=$HOME/neo4j/data:/data \
881888
--volume=$HOME/neo4j/conf:/conf \
882-
neo4j</pre>
889+
neo4j:3.0</pre>
883890
</div>
884891
</div>
885892

@@ -900,7 +907,7 @@ <h3><code>/conf</code> volume</h3>
900907
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
901908
<pre>docker run --rm\
902909
--volume=$HOME/neo4j/conf:/conf \
903-
neo4j dump-config</pre>
910+
neo4j:3.0 dump-config</pre>
904911
</div>
905912
</div>
906913
</div>
@@ -914,7 +921,7 @@ <h3>Build a new image</h3>
914921

915922
<div class="listingblock">
916923
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
917-
<pre>FROM neo4j</pre>
924+
<pre>FROM neo4j:3.0</pre>
918925
</div>
919926
</div>
920927

@@ -976,19 +983,19 @@ <h3>Neo4j HA</h3>
976983
--env=NEO4J_dbms_mode=HA --env=NEO4J_ha_serverId=1 \
977984
--env=NEO4J_ha_host_coordination=instance1:5001 --env=NEO4J_ha_host_data=instance1:6001 \
978985
--env=NEO4J_ha_initialHosts=instance1:5001,instance2:5001,instance3:5001 \
979-
neo4j:enterprise
986+
neo4j:enterprise-3.0
980987

981988
docker run --name=instance2 --detach --publish 7475:7474 --publish=7688:7687 --net=cluster --hostname=instance2 \
982989
--env=NEO4J_dbms_mode=HA --env=NEO4J_ha_serverId=2 \
983990
--env=NEO4J_ha_host_coordination=instance2:5001 --env=NEO4J_ha_host_data=instance2:6001 \
984991
--env=NEO4J_ha_initialHosts=instance1:5001,instance2:5001,instance3:5001 \
985-
neo4j:enterprise
992+
neo4j:enterprise-3.0
986993

987994
docker run --name=instance3 --detach --publish 7476:7474 --publish=7689:7687 --net=cluster --hostname=instance3 \
988995
--env=NEO4J_dbms_mode=HA --env=NEO4J_ha_serverId=3 \
989996
--env=NEO4J_ha_host_coordination=instance3:5001 --env=NEO4J_ha_host_data=instance3:6001 \
990997
--env=NEO4J_ha_initialHosts=instance1:5001,instance2:5001,instance3:5001 \
991-
neo4j:enterprise</pre>
998+
neo4j:enterprise-3.0</pre>
992999
</div>
9931000
</div>
9941001

@@ -1008,7 +1015,7 @@ <h3>User-defined procedures</h3>
10081015

10091016
<div class="listingblock">
10101017
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
1011-
<pre>docker run --publish 7474:7474 --publish=7687:7687 --volume=$HOME/neo4j/plugins:/plugins neo4j</pre>
1018+
<pre>docker run --publish 7474:7474 --publish=7687:7687 --volume=$HOME/neo4j/plugins:/plugins neo4j:3.0</pre>
10121019
</div>
10131020
</div>
10141021

@@ -1044,7 +1051,7 @@ <h3>TLS support</h3>
10441051

10451052
<div class="listingblock">
10461053
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
1047-
<pre>docker run --publish 7473:7473 --publish=7687:7687 --volume $HOME/neo4j/ssl:/ssl neo4j</pre>
1054+
<pre>docker run --publish 7473:7473 --publish=7687:7687 --volume $HOME/neo4j/ssl:/ssl neo4j:3.0</pre>
10481055
</div>
10491056
</div>
10501057
</div>

‎integration/mongodb/neo4j-doc-manager/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ <h4>2.1.1. Install neo4j-doc-manager</h4>
757757

758758
<div class="listingblock">
759759
<div class="content code-panel" style="width: 100%; height: auto; border: medium 1px;">
760-
<pre style="font-size: 16px; font-weight: 100;" class="code programlisting cm-s-neo"><code>pip install neo4j-doc-manager --pre</code></pre>
760+
<pre style="font-size: 16px; font-weight: 100;" class="code programlisting cm-s-neo"><code>pip install neo4j-doc-manager</code></pre>
761761
</div>
762762
</div>
763763
<div id="_alternate_installation" class="sect4 " >

‎language-guides/r/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,4 +1175,4 @@ <h5>Get Neo4j News</h5>
11751175
<script src="http://neo4j.com/wp-content/themes/neo4jweb/assets/js/foundation/foundation.equalizer.js"></script>
11761176

11771177
</body>
1178-
</html>
1178+
</html>

‎resources/ruby-course/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ <h3 class="title">Overview</h3>
681681
};
682682
})();
683683
</script>
684-
<img src=".screencast_screenshot.png" style="width: 59%; border: 1px solid black; border-radius: 0.5em; margin-bottom: 1em" />
684+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads/screencast_screenshot.png" style="width: 59%; border: 1px solid black; border-radius: 0.5em; margin-bottom: 1em" />
685685
<div class="quoteblock abstract">
686686
<div class="title">Goals</div>
687687
<blockquote style="padding-left: 0;">
@@ -746,7 +746,7 @@ <h3>Introduction to Neo4j</h3>
746746
<div class="content">
747747
<div class="imageblock">
748748
<p class="content">
749-
<img src=".simple_graph.png" alt=".simple graph">
749+
<img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads/simple_graph.png" alt="simple graph">
750750
</p>
751751
</div>
752752
</div>
@@ -818,8 +818,8 @@ <h4>Cypher</h4>
818818

819819

820820
<div class="paragraph">
821-
<p><span class="image"><img src=".cypher_match_1.png" alt=".cypher match 1" width="49%"></span>
822-
<span class="image"><img src=".cypher_match_2.png" alt=".cypher match 2" width="49%"></span></p>
821+
<p><span class="image"><img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads/cypher_match_1.png" alt="cypher match 1" width="49%"></span>
822+
<span class="image"><img src="http://dev.assets.neo4j.com.s3.amazonaws.com/wp-content/uploads/cypher_match_2.png" alt="cypher match 2" width="49%"></span></p>
823823
</div>
824824

825825

0 commit comments

Comments
 (0)