nsubstitute · Romfos · Jul 13, 2025 · Jun 9, 2025 · Jun 22, 2025 · Jul 13, 2025
diff --git a/docs/docs/2019-01-01-search.md b/docs/docs/2019-01-01-search.md
diff --git a/docs/docs/toc.yml b/docs/docs/toc.yml
diff --git a/docs/help.md b/docs/help.md
@@ -3,8 +3,8 @@ title: Docs and getting help
 permalink: /help.html
 ---
 
-<p>Read <a href="/docs/2010-01-01-getting-started.html">Getting started</a> for a quick tour of NSubstitute.</p>
+<p>Read <a href="/help/getting-started">Getting started</a> for a quick tour of NSubstitute.</p>
 
-<p>For more in depth information start with <a href="/docs/2010-01-02-creating-a-substitute.html">Creating a substitute</a>.</p>
+<p>For more in depth information start with <a href="/help/creating-a-substitute">Creating a substitute</a>.</p>
 
 <p>If you can't find the answer you're looking for, or if you have feature requests or feedback on NSubstitute, please <a href="https://github.com/nsubstitute/NSubstitute/issues">raise an issue</a> on our project site. All questions are welcome via our project site, but for "how-to"-style questions you can also try <a href="https://stackoverflow.com/tags/nsubstitute">StackOverflow with the [nsubstitute] tag</a>, which often leads to very good answers from the larger programming community. StackOverflow is especially useful if your question also relates to other libraries that our team may not be as familiar with (e.g. NSubstitute with Entity Framework).</p>
diff --git a/...docs/2010-12-01-actions-with-arguments.md → docs/help/actions-with-arguments/index.md b/...docs/2010-12-01-actions-with-arguments.md → docs/help/actions-with-arguments/index.md
diff --git a/docs/docs/2010-04-01-argument-matchers.md → docs/help/argument-matchers/index.md b/docs/docs/2010-04-01-argument-matchers.md → docs/help/argument-matchers/index.md
diff --git a/...cs/2010-10-01-auto-and-recursive-mocks.md → docs/help/auto-and-recursive-mocks/index.md b/...cs/2010-10-01-auto-and-recursive-mocks.md → docs/help/auto-and-recursive-mocks/index.md
diff --git a/docs/docs/2010-05-01-callbacks.md → docs/help/callbacks/index.md b/docs/docs/2010-05-01-callbacks.md → docs/help/callbacks/index.md
diff --git a/docs/docs/2010-03-10-clear-received-calls.md → docs/help/clear-received-calls/index.md b/docs/docs/2010-03-10-clear-received-calls.md → docs/help/clear-received-calls/index.md
diff --git a/docs/docs/2013-04-15-compat-args.md → docs/help/compat-args/index.md b/docs/docs/2013-04-15-compat-args.md → docs/help/compat-args/index.md
diff --git a/docs/docs/2010-05-10-configure.md → docs/help/configure/index.md b/docs/docs/2010-05-10-configure.md → docs/help/configure/index.md
diff --git a/.../docs/2010-01-02-creating-a-substitute.md → docs/help/creating-a-substitute/index.md b/.../docs/2010-01-02-creating-a-substitute.md → docs/help/creating-a-substitute/index.md
@@ -14,7 +14,7 @@ This is how you'll normally create substitutes for types. Generally this type wi
 
 ⚠️ **Warning:** Substituting for classes can have some nasty side-effects!
 
-For starters, **NSubstitute can only work with *virtual* members of the class** that are overridable in the test assembly, so any non-virtual code in the class will actually execute! If you try to substitute for a class that formats your hard drive in the constructor or in a non-virtual property setter then you're asking for trouble. By overridable we mean `public virtual`, `protected virtual`, `protected internal virtual`, or `internal virtual` with `InternalsVisibleTo` attribute applied (although to configure or assert on calls members will also need to be callable from the test assembly, so `public virtual` or `internal virtual` with `InternalsVisibleTo`). See [How NSubstitute works](/help/how-nsub-works) for more information.
+For starters, **NSubstitute can only work with *virtual* members of the class** that are overridable in the test assembly, so any non-virtual code in the class will actually execute! If you try to substitute for a class that formats your hard drive in the constructor or in a non-virtual property setter then you're asking for trouble. By overridable we mean `public virtual`, `protected virtual`, `protected internal virtual`, or `internal virtual` with `InternalsVisibleTo` attribute applied (although to configure or assert on calls members will also need to be callable from the test assembly, so `public virtual` or `internal virtual` with `InternalsVisibleTo`). See [How NSubstitute works](/help/how-nsub-works/) for more information.
 
 It also means features like `Received()`, `Returns()`, `Arg.Is()`, `Arg.Any()` and `When()..Do()` **will not work with these non-overridable members**. For example: `subClass.Received().NonVirtualCall()` will not actually run an assertion (it will always pass, even if there are no calls to `NonVirtualCall()`), and can even cause confusing problems with later tests. These features will work correctly with virtual members of the class, but we have to be careful to avoid the non-virtual ones.
 

diff --git a/docs/docs/2010-01-01-getting-started.md → docs/help/getting-started/index.md b/docs/docs/2010-01-01-getting-started.md → docs/help/getting-started/index.md
diff --git a/docs/docs/2015-01-01-how-nsub-works.md → docs/help/how-nsub-works/index.md b/docs/docs/2015-01-01-how-nsub-works.md → docs/help/how-nsub-works/index.md
diff --git a/docs/docs/2010-02-04-multiple-returns.md → docs/help/multiple-returns/index.md b/docs/docs/2010-02-04-multiple-returns.md → docs/help/multiple-returns/index.md
diff --git a/.../docs/2013-05-01-nsubstitute-analysers.md → docs/help/nsubstitute-analysers/index.md b/.../docs/2013-05-01-nsubstitute-analysers.md → docs/help/nsubstitute-analysers/index.md
diff --git a/docs/docs/2013-02-01-partial-subs.md → docs/help/partial-subs/index.md b/docs/docs/2013-02-01-partial-subs.md → docs/help/partial-subs/index.md
diff --git a/docs/docs/2010-06-01-raising-events.md → docs/help/raising-events/index.md b/docs/docs/2010-06-01-raising-events.md → docs/help/raising-events/index.md
diff --git a/docs/docs/2010-03-01-received-calls.md → docs/help/received-calls/index.md b/docs/docs/2010-03-01-received-calls.md → docs/help/received-calls/index.md
diff --git a/docs/docs/2013-01-01-received-in-order.md → docs/help/received-in-order/index.md b/docs/docs/2013-01-01-received-in-order.md → docs/help/received-in-order/index.md
diff --git a/...ocs/2010-02-10-replacing-return-values.md → docs/help/replacing-return-values/index.md b/...ocs/2010-02-10-replacing-return-values.md → docs/help/replacing-return-values/index.md
diff --git a/docs/docs/2013-03-01-return-for-all.md → docs/help/return-for-all/index.md b/docs/docs/2013-03-01-return-for-all.md → docs/help/return-for-all/index.md
diff --git a/docs/docs/2010-02-03-return-for-any-args.md → docs/help/return-for-any-args/index.md b/docs/docs/2010-02-03-return-for-any-args.md → docs/help/return-for-any-args/index.md
diff --git a/docs/docs/2010-02-02-return-for-args.md → docs/help/return-for-args/index.md b/docs/docs/2010-02-02-return-for-args.md → docs/help/return-for-args/index.md
diff --git a/docs/docs/2010-02-03-return-from-function.md → docs/help/return-from-function/index.md b/docs/docs/2010-02-03-return-from-function.md → docs/help/return-from-function/index.md
diff --git a/docs/help/search/index.md b/docs/help/search/index.md
@@ -0,0 +1,7 @@
+---
+title: Search
+---
+
+<script async src="https://cse.google.com/cse.js?cx=005697633880271604295:lw9srlgcpg8">
+</script>
+<div class="gcse-search"></div>
diff --git a/docs/docs/2010-02-01-set-return-value.md → docs/help/set-return-value/index.md b/docs/docs/2010-02-01-set-return-value.md → docs/help/set-return-value/index.md
diff --git a/...10-11-01-setting-out-and-ref-arguments.md → ...lp/setting-out-and-ref-arguments/index.md b/...10-11-01-setting-out-and-ref-arguments.md → ...lp/setting-out-and-ref-arguments/index.md
diff --git a/docs/docs/2013-04-01-threading.md → docs/help/threading/index.md b/docs/docs/2013-04-01-threading.md → docs/help/threading/index.md
diff --git a/docs/docs/2010-05-02-throwing-exceptions.md → docs/help/throwing-exceptions/index.md b/docs/docs/2010-05-02-throwing-exceptions.md → docs/help/throwing-exceptions/index.md
diff --git a/docs/help/toc.yml b/docs/help/toc.yml
@@ -0,0 +1,26 @@
+- href: getting-started/index.md
+- href: creating-a-substitute/index.md
+- href: set-return-value/index.md
+- href: return-for-args/index.md
+- href: return-for-any-args/index.md
+- href: return-from-function/index.md
+- href: multiple-returns/index.md
+- href: replacing-return-values/index.md
+- href: received-calls/index.md
+- href: clear-received-calls/index.md
+- href: argument-matchers/index.md
+- href: callbacks/index.md
+- href: throwing-exceptions/index.md
+- href: configure/index.md
+- href: raising-events/index.md
+- href: auto-and-recursive-mocks/index.md
+- href: setting-out-and-ref-arguments/index.md
+- href: actions-with-arguments/index.md
+- href: received-in-order/index.md
+- href: partial-subs/index.md
+- href: return-for-all/index.md
+- href: threading/index.md
+- href: compat-args/index.md
+- href: nsubstitute-analysers/index.md
+- href: how-nsub-works/index.md
+- href: search/index.md
diff --git a/docs/index.md b/docs/index.md
@@ -3,6 +3,29 @@ layout: landing
 title: A friendly substitute for .NET mocking libraries
 ---
 
+<div id="downloads" class="sidebar download">
+
+# Welcome to NSubstitute
+
+<p>Mock, stub, fake, spy, test double? Strict or loose? Nah, just substitute for the type you need!</p>
+<p>NSubstitute is designed for Arrange-Act-Assert (AAA) testing, so you just need to arrange how it should work, then assert it received the calls you expected once you're done.</p>
+
+<ul>
+<li class="nuget">
+<a href="https://nuget.org/List/Packages/NSubstitute">Install via NuGet:</a> <code>Install-Package NSubstitute</code>
+</li>
+<li class="nuget"><a href="/help/nsubstitute-analysers">Optional analysers for C#:</a>
+<code>Install-Package NSubstitute.<wbr>Analyzers.<wbr>CSharp</code>
+</li>
+<li class="nuget"><a href="/help/nsubstitute-analysers">Optional analysers for VB:</a>
+<code>Install-Package NSubstitute.<wbr>Analyzers.<wbr>VisualBasic</code>
+</li>
+<li class="github">
+<a href="https://github.com/nsubstitute/nsubstitute">Source</a>
+</li>
+</ul>
+</div>
+
 <div id="features">
 <div class="feature" markdown="1">
 
@@ -54,31 +77,6 @@ Received 2 non-matching calls (non-matching arguments indicated with '*' charact
 </div>
 </div>
 
-<div class="feature" markdown="1">
-
-## Don't sweat the small stuff
-
-<p>Mock, stub, fake, spy, test double? Strict or loose? Nah, just substitute for the type you need!</p>
-<p>NSubstitute is designed for Arrange-Act-Assert (AAA) testing, so you just need to arrange how it should work, then assert it received the calls you expected once you're done. Because you've got more important code to write than whether you need a mock or a stub.</p>
-</div>
-
-</div>
-
-<div id="downloads" class="sidebar download">
-<ul>
-<li class="nuget">
-<a href="https://nuget.org/List/Packages/NSubstitute">Install via NuGet:</a> <code>Install-Package NSubstitute</code>
-</li>
-<li class="nuget"><a href="/help/nsubstitute-analysers/">Optional analysers for C#:</a>
-<code>Install-Package NSubstitute.<wbr>Analyzers.<wbr>CSharp</code>
-</li>
-<li class="nuget"><a href="/help/nsubstitute-analysers/">Optional analysers for VB:</a>
-<code>Install-Package NSubstitute.<wbr>Analyzers.<wbr>VisualBasic</code>
-</li>
-<li class="github">
-<a href="https://github.com/nsubstitute/nsubstitute">Source</a>
-</li>
-</ul>
 </div>
 
 <div class="sidebar">

diff --git a/docs/toc.yml b/docs/toc.yml
@@ -1,5 +1,5 @@
 - name: Documentation
-  href: docs/
+  href: help/
 
 - name: Getting help
   href: help.md

diff --git a/tests/NSubstitute.Documentation.Tests.Generator/DocumentationTestsGenerator.cs b/tests/NSubstitute.Documentation.Tests.Generator/DocumentationTestsGenerator.cs
@@ -37,7 +37,13 @@ public static string FormatCode(string code)
 
     private static string GenerateTestsClassName(AdditionalText markdownFile)
     {
-        return $"Tests_{Path.GetFileNameWithoutExtension(markdownFile.Path).Replace("-", "_")}";
+        var file = Path.GetFileNameWithoutExtension(markdownFile.Path);
+        var pathSegments = markdownFile.Path.Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var dirName = pathSegments[pathSegments.Length - 2]; // second last path segment
+        var nameToUse = string.Equals(file, "index", StringComparison.InvariantCultureIgnoreCase)
+            ? dirName
+            : file;
+        return $"Tests_{nameToUse.Replace("-", "_")}";
     }
 
     private static string GenerateTestClassContent(string testsClassName, AdditionalText markdownFile)
@@ -55,7 +61,7 @@ private static string GenerateTestClassContent(string testsClassName, Additional
             using NSubstitute.ExceptionExtensions;
 
             namespace NSubstitute.Documentation.Tests.Generated;
-            
+
             public sealed class {{testsClassName}}
             {
             """);

diff --git a/tests/NSubstitute.Documentation.Tests/NSubstitute.Documentation.Tests.csproj b/tests/NSubstitute.Documentation.Tests/NSubstitute.Documentation.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="..\..\docs\docs\*.md" />
+    <AdditionalFiles Include="..\..\docs\**\*.md" />
   </ItemGroup>
 
   <ItemGroup>