Skip to content

Commit 4fb881f

Browse files
committed
Merge branch 'master' into unify-numbers-docs
2 parents 52fdf1d + fc53fec commit 4fb881f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

KDOC_PREPROCESSING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ function, interface, or class as HTML.
695695
The Markdown of the KDoc is rendered to HTML using [JetBrains/markdown](https://github.com/JetBrains/markdown) and, in
696696
the case of DataFrame, put in [./docs/StardustDocs/resources/snippets/kdocs](docs/StardustDocs/resources/snippets/kdocs).
697697
From there, the HTML can be included in any WriterSide page as an iFrame.
698-
This can be done using our custom `<dataFrame src=""/>` tag.
698+
This can be done using our custom `<inline-frame src=""/>` tag.
699699

700700
An example of the result can be found in the
701701
[DataFrame documentation](https://kotlin.github.io/dataframe/columnselectors.html#full-dsl-grammar).

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SampleAggregator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fun main() {
99
it.nameWithoutExtension.startsWith("org.jetbrains")
1010
}
1111
// org.ClassName.functionName_properties
12-
// <dataFrame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
12+
// <inline-frame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
1313
.groupBy {
1414
it.nameWithoutExtension.substringBefore("_")
1515
}.mapValues { (name, files) ->

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SampleAggregator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fun main() {
99
it.nameWithoutExtension.startsWith("org.jetbrains")
1010
}
1111
// org.ClassName.functionName_properties
12-
// <dataFrame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
12+
// <inline-frame src="org.jetbrains.kotlinx.dataframe.samples.api.Modify.addDfs.html"/>
1313
.groupBy {
1414
it.nameWithoutExtension.substringBefore("_")
1515
}.mapValues { (name, files) ->

docs/StardustDocs/topics/ColumnSelectors.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ df.move { name.firstName and name.lastName }.after { city }
2525

2626
**Definitions**
2727

28-
<dataFrame src="kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html"/>
28+
<inline-frame src="resources/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.DefinitionsPartOfGrammar.html" width="100%"/>
2929

3030
<tabs>
3131
<tab title="Directly in the DSL">
32-
<dataFrame src="kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html"/>
32+
<inline-frame src="resources/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.PlainDslPartOfGrammar.html" width="100%"/>
3333
</tab>
3434
<tab title="On a Column Set">
35-
<dataFrame src="kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html"/>
35+
<inline-frame src="resources/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnSetPartOfGrammar.ForHtml.html" width="100%"/>
3636
</tab>
3737
<tab title="On a Column Group">
38-
<dataFrame src="kdocs/org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html"/>
38+
<inline-frame src=Aorg.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.DslGrammar.ColumnGroupPartOfGrammar.ForHtml.html" width="100%"/>
3939
</tab>
4040
</tabs>
4141

0 commit comments

Comments
 (0)