Merge pull request MicrosoftDocs#364 from foxmsft/foxmsft/live-conflicts

Fix conflict with live branch
jdrch · Mar 23, 2021 · bf5388c · bf5388c
2 parents b3014df + 33f5eee
commit bf5388c
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 21 deletions.
diff --git a/sysinternals/downloads/adinsight.md b/sysinternals/downloads/adinsight.md
@@ -34,7 +34,7 @@ tracing DLL, which means that it does not require administrative
 permissions, however, if run with administrative rights, it will also
 monitor system processes, including windows services.
 
-![ADInsight](media/adinsight/adinsight.jpg)  
+![ADInsight screenshot](media/adinsight/adinsight.jpg)  
 
 [![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/AdInsight.zip) [**Download AdInsight**](https://download.sysinternals.com/files/AdInsight.zip) **(3.3 MB)**
 
@@ -53,4 +53,4 @@ utility enables you to restore deleted objects on Windows Server 2003
 domains.
 
 [AD Explorer](adexplorer.md)
-is an advanced Active Directory (AD) viewer and editor.  
+is an advanced Active Directory (AD) viewer and editor.  
diff --git a/sysinternals/downloads/cacheset.md b/sysinternals/downloads/cacheset.md
@@ -13,7 +13,7 @@ ms.date: 11/01/2006
 
 Published: November 1, 2006
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/CacheSet.zip) [**Download CacheSet**](https://download.sysinternals.com/files/CacheSet.zip) **(44 KB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/CacheSet.zip) [**Download CacheSet**](https://download.sysinternals.com/files/CacheSet.zip) **(44 KB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/Cacheset.exe).
 
 ## Introduction
@@ -35,7 +35,7 @@ the "Increase Quota" privilege (administrator accounts have this
 privilege by default). *CacheSet* has been updated to enable this
 privilege so that it works on SP4.
 
-![CacheSet](media/cacheset/CacheSet.gif)
+![CacheSet screenshot](media/cacheset/CacheSet.gif)
 
 ## Installation and Use
 

diff --git a/sysinternals/downloads/clockres.md b/sysinternals/downloads/clockres.md
@@ -22,7 +22,6 @@ the maximum timer resolution that your application could obtain? The
 answer lies in a simple function named *GetSystemTimeAdjustment*, and
 the *ClockRes* applet performs the function and shows you the result.
 
-
 [![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/ClockRes.zip) [**Download ClockRes**](https://download.sysinternals.com/files/ClockRes.zip) **(494 KB)**
 
 **Runs on:**

diff --git a/sysinternals/downloads/cpustres.md b/sysinternals/downloads/cpustres.md
@@ -17,15 +17,14 @@ Published: July 18, 2018
 ## Introduction
 
 **CpuStres**  
-CpuStres is a utility that can be used to simulate CPU activity by running 
+CpuStres is a utility that can be used to simulate CPU activity by running
 up to 64 threads in a tight loop.
 
 Each thread can be started, paused or stopped independently and can be configured with the following parameters:
 
 - **Activity Level**  This can be Low, Medium, Busy or Maximum which controls how long the thread sleepss between cycles. Setting this value to Maximum causes the thread to run continuously.
 - **Priority**  This controls the thread priority. Refer to Windows Internals by Mark Russinovich for details on thread priorities
 
-
 **Runs on:**
 
 - Client: Windows Vista and higher

diff --git a/sysinternals/downloads/debugview.md b/sysinternals/downloads/debugview.md
@@ -13,7 +13,7 @@ ms.date: 09/17/2020
 
 Published: April 23, 2019
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/DebugView.zip) [**Download DebugView**](https://download.sysinternals.com/files/DebugView.zip) **(1.3 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/DebugView.zip) [**Download DebugView**](https://download.sysinternals.com/files/DebugView.zip) **(1.3 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/Dbgview.exe).
 
 ## Introduction

diff --git a/sysinternals/downloads/junction.md b/sysinternals/downloads/junction.md
@@ -71,7 +71,6 @@ To delete a junction, use the –d switch:
 **0**  - on failed deletion of junction  (e.g. if file not found)  
 **0**  - on the check if a file is a junction fails (e.g. if file not found)  
 
-
 [![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/Junction.zip) [**Download Junction**](https://download.sysinternals.com/files/Junction.zip) **(504 KB)**
 
 **Runs on:**

diff --git a/sysinternals/downloads/logonsessions.md b/sysinternals/downloads/logonsessions.md
@@ -24,7 +24,6 @@ running in each session.
 
 **Usage: logonsessions \[-c\[t\]\] \[-p\]**
 
-
 |Parameter  |Description  |
 |---------|---------|
 |  **-c**   | Print output as CSV. |

diff --git a/sysinternals/downloads/portmon.md b/sysinternals/downloads/portmon.md
@@ -13,7 +13,7 @@ ms.date: 01/12/2012
 
 Published: January 12, 2012
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PortMon.zip) [**Download Portmon**](https://download.sysinternals.com/files/PortMon.zip) **(226 KB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PortMon.zip) [**Download Portmon**](https://download.sysinternals.com/files/PortMon.zip) **(226 KB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/portmon.exe).
 
 ## Introduction
@@ -50,7 +50,7 @@ features.
 
 The on-line help-file describes all these features, and more, in detail.
 
-![PortMon](media/portmon/PortMon.gif)
+![PortMon screenshot](media/portmon/PortMon.gif)
 
 ## Installation and Use
 
@@ -110,6 +110,6 @@ intercept all accesses to VCOMM's functions. Like its NT device driver,
 format. On Windows 95 and 98 *Portmon* monitors all ports so there is no
 port selection like on NT.
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PortMon.zip) [**Download Portmon**](https://download.sysinternals.com/files/PortMon.zip) **(226 KB)** 
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PortMon.zip) [**Download Portmon**](https://download.sysinternals.com/files/PortMon.zip) **(226 KB)**
 
-**Run now** from [Sysinternals Live](https://live.sysinternals.com/portmon.exe).
+**Run now** from [Sysinternals Live](https://live.sysinternals.com/portmon.exe).
diff --git a/sysinternals/downloads/process-explorer.md b/sysinternals/downloads/process-explorer.md
@@ -13,7 +13,7 @@ ms.date: 09/17/2020
 
 Published: April 28, 2020
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/ProcessExplorer.zip) [**Download Process Explorer**](https://download.sysinternals.com/files/ProcessExplorer.zip) **(2.5 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/ProcessExplorer.zip) [**Download Process Explorer**](https://download.sysinternals.com/files/ProcessExplorer.zip) **(2.5 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/procexp.exe).
 
 ## Introduction
@@ -47,9 +47,9 @@ into the way Windows and applications work.
     The official updates and errata page for the definitive book on Windows internals, by Mark Russinovich and David Solomon.
 - [Windows Sysinternals Administrator's Reference](~/resources/troubleshooting-book.md) The official guide to the Sysinternals utilities by Mark Russinovich and Aaron Margosis, including descriptions of all the tools, their features, how to use them for troubleshooting, and example real-world cases of their use.
 
-## Download 
+## Download
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/ProcessExplorer.zip) [**Download Process Explorer**](https://download.sysinternals.com/files/ProcessExplorer.zip) **(2.5 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/ProcessExplorer.zip) [**Download Process Explorer**](https://download.sysinternals.com/files/ProcessExplorer.zip) **(2.5 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/procexp.exe).
 
 **Runs on:**

diff --git a/sysinternals/downloads/psfile.md b/sysinternals/downloads/psfile.md
@@ -50,4 +50,4 @@ system that are open by remote systems. Typing a command followed by "-
 
 *PsFile* uses the NET API, which is documented in the Platform SDK.
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PSTools.zip) [**Download PsTools**](https://download.sysinternals.com/files/PSTools.zip) **(1.6 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PSTools.zip) [**Download PsTools**](https://download.sysinternals.com/files/PSTools.zip) **(1.6 MB)**
diff --git a/sysinternals/downloads/tcpview.md b/sysinternals/downloads/tcpview.md
@@ -13,7 +13,7 @@ ms.date: 03/23/2021
 
 Published: March 23, 2021
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/TCPView.zip) [**Download TCPView**](https://download.sysinternals.com/files/TCPView.zip) **(1.4 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/TCPView.zip) [**Download TCPView**](https://download.sysinternals.com/files/TCPView.zip) **(1.4 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/Tcpview.exe).
 
 ## Introduction

diff --git a/sysinternals/downloads/winobj.md b/sysinternals/downloads/winobj.md
@@ -13,7 +13,7 @@ ms.date: 03/23/2021
 
 Published: March 23, 2021
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/WinObj.zip) [**Download WinObj**](https://download.sysinternals.com/files/WinObj.zip) **(1.4 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/WinObj.zip) [**Download WinObj**](https://download.sysinternals.com/files/WinObj.zip) **(1.4 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/Winobj.exe).
 
 ## Introduction
@@ -55,7 +55,7 @@ Object Manager name space, and Mark's October 1997 [WindowsITPro
 Magazine](https://www.windowsitpro.com/) column, "Inside the Object
 Manager", is (of course) an excellent overview.
 
-[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/WinObj.zip) [**Download WinObj**](https://download.sysinternals.com/files/WinObj.zip) **(1.4 MB)**
+[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/WinObj.zip) [**Download WinObj**](https://download.sysinternals.com/files/WinObj.zip) **(1.4 MB)**  
 **Run now** from [Sysinternals Live](https://live.sysinternals.com/Winobj.exe).
 
 **Runs on:**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,4 +50,4 @@ system that are open by remote systems. Typing a command followed by "-

		PsFile uses the NET API, which is documented in the Platform SDK.

		[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PSTools.zip) [Download PsTools](https://download.sysinternals.com/files/PSTools.zip) (1.6 MB)
		[![Download](media/shared/Download_sm.png)](https://download.sysinternals.com/files/PSTools.zip) [Download PsTools](https://download.sysinternals.com/files/PSTools.zip) (1.6 MB)