Skip to content

Commit 2b4d2dd

Browse files
committed
general edits
1 parent 0692939 commit 2b4d2dd

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

dflib2-docs/src/docs/asciidoc/_user-guide-includes/_joins.ad

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ L.id L.name R.id R.age
6262
3 Joan 3 59
6363
----
6464

65-
NOTE: `DataFrame` immutability applies to name assignments as well. Calling `.as()` creates a separate
66-
`DataFrame`, so the original one remains unnamed.
65+
NOTE: `DataFrame` immutability assumption applies to name assignments too. Calling `.as()` creates a new
66+
`DataFrame`, and the original one's name remains unchanged (in our example, `null`, i.e., unnamed).
6767

6868
=== Transform Columns
6969

@@ -156,7 +156,7 @@ NOTE: Nested loop joins are _much_ slower, and should be avoided unless absolute
156156
=== Positional Joins
157157

158158
A special form of joins is by row position. This is essentially the same as putting two DataFrames next to each other
159-
to produce the resulting DataFrame:
159+
to produce the resulting DataFrame (what we used to call "horizontal concatenation" in the older versions of DFLib):
160160

161161
[source,java,indent=0]
162162
----

dflib2-docs/src/docs/asciidoc/_user-guide-includes/_union.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ n
2323
6 elements
2424
----
2525

26-
=== DataFrames Union
26+
=== DataFrame Union
2727

28-
Similarly, to concatenate two or more DataFrames, you'd use `DataFrames.union(..)` static method:
28+
Similarly, to concatenate two or more DataFrames, you'd use `DataFrame.union(..)` static method:
2929

3030
[source,java,indent=0]
3131
----

docs/dflib/docs/2.x/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ <h1>DFLib DataFrame Documentation - v2 (alpha)</h1>
597597
<li><a href="#unions">Unions</a>
598598
<ul class="sectlevel2">
599599
<li><a href="#_series_union">Series Union</a></li>
600-
<li><a href="#_dataframes_union">DataFrames Union</a></li>
600+
<li><a href="#_dataframe_union">DataFrame Union</a></li>
601601
</ul>
602602
</li>
603603
<li><a href="#joins">Joins</a>
@@ -3928,9 +3928,9 @@ <h3 id="_series_union">Series Union</h3>
39283928
</div>
39293929
</div>
39303930
<div class="sect2">
3931-
<h3 id="_dataframes_union">DataFrames Union</h3>
3931+
<h3 id="_dataframe_union">DataFrame Union</h3>
39323932
<div class="paragraph">
3933-
<p>Similarly, to concatenate two or more DataFrames, you&#8217;d use <code>DataFrames.union(..)</code> static method:</p>
3933+
<p>Similarly, to concatenate two or more DataFrames, you&#8217;d use <code>DataFrame.union(..)</code> static method:</p>
39343934
</div>
39353935
<div class="listingblock">
39363936
<div class="content">
@@ -4176,8 +4176,8 @@ <h3 id="_column_namespace">Column Namespace</h3>
41764176
<i class="fa icon-note" title="Note"></i>
41774177
</td>
41784178
<td class="content">
4179-
<code>DataFrame</code> immutability applies to name assignments as well. Calling <code>.as()</code> creates a separate
4180-
<code>DataFrame</code>, so the original one remains unnamed.
4179+
<code>DataFrame</code> immutability assumption applies to name assignments too. Calling <code>.as()</code> creates a new
4180+
<code>DataFrame</code>, and the original one&#8217;s name remains unchanged (in our example, <code>null</code>, i.e., unnamed).
41814181
</td>
41824182
</tr>
41834183
</table>
@@ -4367,7 +4367,7 @@ <h3 id="_nested_loop_joins">Nested Loop Joins</h3>
43674367
<h3 id="_positional_joins">Positional Joins</h3>
43684368
<div class="paragraph">
43694369
<p>A special form of joins is by row position. This is essentially the same as putting two DataFrames next to each other
4370-
to produce the resulting DataFrame:</p>
4370+
to produce the resulting DataFrame (what we used to call "horizontal concatenation" in the older versions of DFLib):</p>
43714371
</div>
43724372
<div class="listingblock">
43734373
<div class="content">

0 commit comments

Comments
 (0)