. d reformatted code and updated markdown snippets

Author: actions-user

approvaltests/docs/how_to/ConfigureReporters.md

@@ -35,7 +35,7 @@ All the [verify](./reference/Verify.md) functions have an overload that takes an
 <!-- snippet: configure_reporter_with_options -->
 <a id='snippet-configure_reporter_with_options'></a>
 ```java
-Options options = new Options().withReporter(BeyondCompareReporter.INSTANCE);
+Options options = new Options().withReporter(ReportWithBeyondCompare.INSTANCE);
 Approvals.verify(objectUnderTest, options);
 ```
 <sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/ApprovalsTest.java#L25-L28' title='Snippet source file'>snippet source</a> | <a href='#snippet-configure_reporter_with_options' title='Start of snippet'>anchor</a></sup>
@@ -49,7 +49,7 @@ At both the class and method level you can use the @UseReporter attribute to set
 <!-- snippet: use_reporter_single -->
 <a id='snippet-use_reporter_single'></a>
 ```java
-@UseReporter(DiffMergeReporter.class)
+@UseReporter(ReportWithDiffMerge.class)
 ```
 <sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/reporters/GenericDiffReporterTest.java#L23-L25' title='Snippet source file'>snippet source</a> | <a href='#snippet-use_reporter_single' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
@@ -75,8 +75,8 @@ You can also assign a default for an entire package (and all sub-packages) by cr
 ```java
 public class PackageSettings
 {
-  public static TkDiffReporter   UseReporter         = TkDiffReporter.INSTANCE;
-  public static CountingReporter FrontloadedReporter = new CountingReporter();
+  public static ReportWithTkDiffMac UseReporter         = ReportWithTkDiffMac.INSTANCE;
+  public static CountingReporter    FrontloadedReporter = new CountingReporter();
 }
 ```
 <sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/packagesettings/PackageSettings.java#L5-L11' title='Snippet source file'>snippet source</a> | <a href='#snippet-use_reporter_package_settings' title='Start of snippet'>anchor</a></sup>

approvaltests/docs/reference/Reporters.md

@@ -22,17 +22,20 @@ Currently the search goes in this order:
 <!-- snippet: mac_diff_reporters -->
 <a id='snippet-mac_diff_reporters'></a>
 ```java
-BeyondCompareMacReporter.INSTANCE,
-DiffMergeMacOsReporter.INSTANCE,
-KaleidoscopeDiffReporter.INSTANCE,
-P4MergeReporter.INSTANCE,
-AraxisMergeReporter.INSTANCE,
-KDiff3MacReporter.INSTANCE,
-TkDiffReporter.INSTANCE,
-IntelliJReporter.INSTANCE,
-VisualStudioCodeReporter.INSTANCE
+ReportWithDiffMergeMac.INSTANCE,
+ReportWithFileMergeMac.INSTANCE,
+ReportWithBeyondCompareMac.INSTANCE,
+ReportWithKaleidoscopeMac.INSTANCE,
+ReportWithKaleidoscope3Mac.INSTANCE,
+ReportWithKdiff3Mac.INSTANCE,
+ReportWithP4mergeMac.INSTANCE,
+ReportWithTkDiffMac.INSTANCE,
+ReportWithVisualStudioCodeMac.INSTANCE,
+ReportWithAraxisMergeMac.INSTANCE,
+ReportWithDiffCommandLineMac.INSTANCE,
+ReportWithSublimeMergeMac.INSTANCE
 ```
-<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/macosx/MacDiffReporter.java#L13-L23' title='Snippet source file'>snippet source</a> | <a href='#snippet-mac_diff_reporters' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/macosx/ReportWithDiffToolOnMac.java#L14-L27' title='Snippet source file'>snippet source</a> | <a href='#snippet-mac_diff_reporters' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -41,29 +44,35 @@ VisualStudioCodeReporter.INSTANCE
 <!-- snippet: windows_diff_reporters -->
 <a id='snippet-windows_diff_reporters'></a>
 ```java
-TortoiseDiffReporter.INSTANCE,
-BeyondCompareReporter.INSTANCE,
-WinMergeReporter.INSTANCE,
-AraxisMergeReporter.INSTANCE,
-CodeCompareReporter.INSTANCE,
-KDiff3WindowsReporter.INSTANCE,
-IntelliJReporter.INSTANCE,
-VisualStudioCodeReporter.INSTANCE
+ReportWithBeyondCompare3Windows.INSTANCE,
+ReportWithBeyondCompare4Windows.INSTANCE,
+ReportWithBeyondCompare5Windows.INSTANCE,
+ReportWithTortoiseImageDiffWindows.INSTANCE,
+ReportWithTortoiseTextDiffWindows.INSTANCE,
+ReportWithTortoiseGitImageDiffWindows.INSTANCE,
+ReportWithTortoiseGitTextDiffWindows.INSTANCE,
+ReportWithWinMergeReporterWindows.INSTANCE,
+ReportWithAraxisMergeWindows.INSTANCE,
+ReportWithCodeCompareWindows.INSTANCE,
+ReportWithKdiff3Windows.INSTANCE,
+ReportWithVisualStudioCodeWindows.INSTANCE,
+ReportWithSublimeMergeWindows.INSTANCE
 ```
-<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/windows/WindowsDiffReporter.java#L13-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-windows_diff_reporters' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/windows/ReportWithDiffToolOnWindows.java#L14-L28' title='Snippet source file'>snippet source</a> | <a href='#snippet-windows_diff_reporters' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ### Linux
 
 <!-- snippet: linux_diff_reporters -->
 <a id='snippet-linux_diff_reporters'></a>
 ```java
-DiffMergeLinuxReporter.INSTANCE,
-MeldMergeReporter.INSTANCE,
-IntelliJReporter.INSTANCE,
-KDiff3LinuxReporter.INSTANCE
+ReportWithDiffMergeLinux.INSTANCE,
+ReportWithMeldMergeLinux.INSTANCE,
+ReportWithKdiff3Linux.INSTANCE,
+ReportWithDiffCommandLineLinux.INSTANCE,
+ReportWithSublimeMergeLinux.INSTANCE
 ```
-<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/linux/LinuxDiffReporter.java#L13-L18' title='Snippet source file'>snippet source</a> | <a href='#snippet-linux_diff_reporters' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/approvaltests/src/main/java/org/approvaltests/reporters/linux/ReportWithDiffToolOnLinux.java#L14-L20' title='Snippet source file'>snippet source</a> | <a href='#snippet-linux_diff_reporters' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ## Combining Reporters