Skip to content

Commit ac6ab28

Browse files
authored
Merge branch 'main' into carousel-support
2 parents 1793be3 + e89395b commit ac6ab28

File tree

20 files changed

+301
-239
lines changed

20 files changed

+301
-239
lines changed

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
4747
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
4848
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
49-
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
49+
<PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
5050
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
5151
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
5252
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
@@ -62,7 +62,7 @@
6262
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
6363
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
6464
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
65-
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
65+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />
6666
<PackageVersion Include="Unquote" Version="7.0.1" />
6767
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
6868
<PrivateAssets>all</PrivateAssets>

docs/syntax/links.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ The syntax follows the format `<scheme>://<path>`, where:
8989
- `path`: The file path within that repository
9090

9191
:::{important}
92-
The `path` in cross-repo links must be relative to the `docset.yml` file and not the full path within the repo
92+
- The `path` in cross-repo links must be relative to the `docset.yml` file and not the full path within the repo.
93+
- The link text is mandatory; if you omit it, the link will fail to be displayed.
9394
:::
9495

9596
Never use a full URL for links across documentation repositories.

src/Elastic.ApiExplorer/OpenApiGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private async Task<IFileInfo> Render<T>(INavigationItem current, T page, ApiRend
288288
if (!outputFile.Directory!.Exists)
289289
outputFile.Directory.Create();
290290

291-
var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, new Uri("http://ignored.example"), INavigationHtmlWriter.AllLevels, ctx);
291+
var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, INavigationHtmlWriter.AllLevels, ctx);
292292
renderContext = renderContext with
293293
{
294294
CurrentNavigation = current,

src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public interface INavigationHtmlWriter
1010
{
1111
const int AllLevels = -1;
1212

13-
Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource,
14-
int maxLevel, Cancel ctx = default);
13+
Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default);
1514

1615
async Task<string> Render(NavigationViewModel model, Cancel ctx)
1716
{

src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public class IsolatedBuildNavigationHtmlWriter(BuildContext context, IRootNaviga
1313
{
1414
private readonly ConcurrentDictionary<(string, int), string> _renderedNavigationCache = [];
1515

16-
public async Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
17-
Uri navigationSource, int maxLevel, Cancel ctx = default)
16+
public async Task<NavigationRenderResult> RenderNavigation(
17+
IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default
18+
)
1819
{
1920
var navigation = context.Configuration.Features.PrimaryNavEnabled || currentRootNavigation.IsUsingNavigationDropdown
2021
? currentRootNavigation

0 commit comments

Comments
 (0)