Merge branch 'master' into master

Author: guzman-raphael

docs-parts/computation/01-autopopulate_lang1.rst

@@ -13,6 +13,6 @@
         def make(self, key):
             img = (test.Image & key).fetch1('image')
             key['filtered_image'] = myfilter(img)
-            self.insert(key)
+            self.insert1(key)
 
 The ``make`` method receives one argument: the dict ``key`` containing the primary key value of an element of :ref:`key source <keysource>` to be worked on.  

docs-parts/definition/11-ERD_lang1.rst

@@ -1,21 +1,21 @@
 
-To plot the ERD for an entire schema, an ERD object can be initialized with the schema object (which is normally used to decorate table objects)
+To plot the Diagram for an entire schema, an Diagram object can be initialized with the schema object (which is normally used to decorate table objects)
 
 .. code-block:: python
 
     import datajoint as dj
     schema = dj.Schema('my_database')
-    dj.ERD(schema).draw()
+    dj.Diagram(schema).draw()
 
 or alternatively an object that has the schema object as an attribute, such as the module defining a schema:
 
 .. code-block:: python
 
     import datajoint as dj
     import seq    # import the sequence module defining the seq database
-    dj.ERD(seq).draw()   # draw the ERD
+    dj.Diagram(seq).draw()   # draw the Diagram
 
 Note that calling the ``.draw()`` method is not necessary when working in a Jupyter notebook.
-The preferred workflow is to simply let the object display itself, for example by writing ``dj.ERD(seq)``.
-The ERD will then render in the notebook using its ``_repr_html_`` method.
-An ERD displayed without ``.draw()`` will be rendered as an SVG, and hovering the mouse over a table will reveal a compact version of the output of the ``.describe()`` method.
+You can simply let the object display itself, for example by entering ``dj.Diagram(seq)`` in a notebook cell.
+The Diagram will automatically render in the notebook by calling its ``_repr_html_`` method.
+A Diagram displayed without ``.draw()`` will be rendered as an SVG, and hovering the mouse over a table will reveal a compact version of the output of the ``.describe()`` method.

docs-parts/definition/11-ERD_lang2.rst

@@ -1,4 +1,4 @@
 
 .. code-block:: python
 
-    dj.ERD(seq.Genome).draw()
+    dj.Diagram(seq.Genome).draw()

docs-parts/definition/11-ERD_lang3.rst

@@ -1,5 +1,5 @@
 
 .. code-block:: python
 
-    # plot the ERD with tables Genome and Species from module seq.
-    (dj.ERD(seq.Genome) + dj.ERD(seq.Species)).draw()
+    # plot the Diagram with tables Genome and Species from module seq.
+    (dj.Diagram(seq.Genome) + dj.Diagram(seq.Species)).draw()

docs-parts/definition/11-ERD_lang4.rst

@@ -2,14 +2,14 @@
 .. code-block:: python
 
     # Plot all the tables directly downstream from ``seq.Genome``:
-    (dj.ERD(seq.Genome)+1).draw()
+    (dj.Diagram(seq.Genome)+1).draw()
 
 .. code-block:: python
 
     # Plot all the tables directly upstream from ``seq.Genome``:
-    (dj.ERD(seq.Genome)-1).draw()
+    (dj.Diagram(seq.Genome)-1).draw()
 
 .. code-block:: python
 
     # Plot the local neighborhood of ``seq.Genome``
-    (dj.ERD(seq.Genome)+1-1+1-1).draw()
+    (dj.Diagram(seq.Genome)+1-1+1-1).draw()