Skip to content

Commit 3277238

Browse files
authored
Merge branch 'live' into patch-1
2 parents 79f5ee3 + be9dfbb commit 3277238

29 files changed

Lines changed: 991 additions & 734 deletions

.openpublishing.redirection.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"source_path": "wsl/install_guide.md",
55
"redirect_url": "/windows/wsl/install-win10",
6-
"redirect_document_id": true
6+
"redirect_document_id": false
77
},
88
{
99
"source_path": "wsl/user_support.md",
@@ -16,9 +16,24 @@
1616
"redirect_document_id": true
1717
},
1818
{
19-
"source_path": "WSL/index.md",
20-
"redirect_url": "about",
19+
"source_path": "wsl/initialize-distro.md",
20+
"redirect_url": "install-win10",
21+
"redirect_document_id": true
22+
},
23+
{
24+
"source_path": "wsl/wsl2-ux-changes.md",
25+
"redirect_url": "compare-versions",
26+
"redirect_document_id": true
27+
},
28+
{
29+
"source_path": "wsl/wsl2-install",
30+
"redirect_url": "install-win10",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "wsl/wsl2-install",
35+
"redirect_url": "install-win10",
2136
"redirect_document_id": false
2237
}
2338
]
24-
}
39+
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ If you find doc issues / errors or have an improvement you'd like to suggest, pl
66
> **Note:** This repo's issue tracker is only for reporting issues with the WSL docs.
77
> Other related issue repo's:
88
> * WSL: https://github.com/Microsoft/WSL/
9-
> * Windows Console: https://github.com/Microsoft/Console/
9+
> * Windows Console: https://github.com/Microsoft/Terminal/
1010
1111
## External Links
1212

1313
[Rendered documentation website](https://docs.microsoft.com/windows/wsl/)
1414

15-
[Release notes for WSL](https://docs.microsoft.com/en-us/windows/wsl/release-notes)
15+
[Release notes for WSL](https://docs.microsoft.com/windows/wsl/release-notes)
1616

1717
## Microsoft Open Source Code of Conduct
1818

ThirdPartyNotices

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ may be either trademarks or registered trademarks of Microsoft in the United Sta
99
The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
1010
Microsoft's general trademark guidelines can be found at https://go.microsoft.com/fwlink/?LinkID=254653.
1111

12-
Privacy information can be found at https://privacy.microsoft.com/en-us/
12+
Privacy information can be found at https://privacy.microsoft.com/
1313

1414
Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
1515
or trademarks, whether by implication, estoppel or otherwise.

WSL/TOC.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

WSL/about.md

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,61 @@
11
---
2-
title: Learn about the Windows Subsystem for Linux
3-
description: Learn more about how the Windows Subsystem for Linux works.
2+
title: An overview on the the Windows Subsystem for Linux
3+
description: Learn about the Windows Subsystem for Linux, the different versions and ways you can use them.
44
keywords: BashOnWindows, bash, wsl, windows, windowssubsystem, gnu, linux
5-
ms.date: 07/11/2016
5+
ms.date: 05/12/2020
66
ms.topic: article
77
ms.assetid: 3cefe0db-7616-4848-a2b6-9296746a178b
8-
ms.custom: seodec18
98
ms.localizationpriority: high
109
---
1110

12-
# Windows Subsystem for Linux Documentation
11+
# What is the Windows Subsystem for Linux?
1312

14-
The Windows Subsystem for Linux lets developers run a GNU/Linux environment -- including most command-line tools, utilities, and applications -- directly on Windows, unmodified, without the overhead of a virtual machine.
13+
The Windows Subsystem for Linux lets developers run a GNU/Linux environment -- including most command-line tools, utilities, and applications -- directly on Windows, unmodified, without the overhead of a virtual machine.
1514

1615
You can:
1716

18-
1. Choose your favorite GNU/Linux distributions [from the Microsoft Store](https://aka.ms/wslstore).
19-
1. Run common command-line free software such as `grep`, `sed`, `awk`, or other ELF-64 binaries.
20-
1. Run Bash shell scripts and GNU/Linux command-line applications including:
17+
* Choose your favorite GNU/Linux distributions [from the Microsoft Store](https://aka.ms/wslstore).
18+
* Run common command-line tools such as `grep`, `sed`, `awk`, or other ELF-64 binaries.
19+
* Run Bash shell scripts and GNU/Linux command-line applications including:
2120
* Tools: vim, emacs, tmux
22-
* Languages: Javascript/node.js, Ruby, Python, C/C++, C# & F#, Rust, Go, etc.
23-
* Services: sshd, MySQL, Apache, lighttpd
24-
1. Install additional software using own GNU/Linux distribution package manager.
25-
1. Invoke Windows applications using a Unix-like command-line shell.
26-
1. Invoke GNU/Linux applications on Windows.
21+
*Languages: [NodeJS](https://docs.microsoft.com/windows/nodejs/setup-on-wsl2), Javascript, [Python](https://docs.microsoft.com/windows/python/web-frameworks), Ruby, C/C++, C# & F#, Rust, Go, etc.
22+
*Services: SSHD, MySQL, Apache, lighttpd, [MongoDB](https://docs.microsoft.com/windows/nodejs/databases), [PostgreSQL](https://docs.microsoft.com/windows/python/databases).
23+
* Install additional software using own GNU/Linux distribution package manager.
24+
* Invoke Windows applications using a Unix-like command-line shell.
25+
* Invoke GNU/Linux applications on Windows.
2726

28-
## Getting Started
27+
## What is WSL 2?
2928

30-
* [Install Linux on Windows 10](install-win10.md)
31-
* [Visit the command reference](reference.md)
32-
* [Read frequently asked questions](faq.md)
29+
WSL 2 is a new version of the Windows Subsystem for Linux architecture that powers the Windows Subsystem for Linux to run ELF64 Linux binaries on Windows. Its primary goals are to **increase file system performance**, as well as adding **full system call compatibility**.
3330

34-
## Team Blogs
35-
* [Overview post with a collection of videos and blogs](https://blogs.msdn.microsoft.com/commandline/learn-about-windows-console-and-windows-subsystem-for-linux-wsl/)
36-
* [Command-Line blog](https://blogs.msdn.microsoft.com/commandline/) (Active)
37-
* [Windows Subsystem for Linux Blog](https://blogs.msdn.microsoft.com/wsl/) (Historical)
31+
This new architecture changes how these Linux binaries interact with Windows and your computer's hardware, but still provides the same user experience as in WSL 1 (the current widely available version).
3832

39-
## Posts & Articles
40-
* [Run Bash on Ubuntu on Windows](https://blogs.windows.com/buildingapps/2016/03/30/run-bash-on-ubuntu-on-windows/)
41-
* [Developers Can Run Bash And Usermode Ubuntu Linux Binaries On Windows 10](https://www.hanselman.com/blog/DevelopersCanRunBashShellAndUsermodeUbuntuLinuxBinariesOnWindows10.aspx)
42-
* [Ubuntu on Windows – The Ubuntu Userspace for Windows Developers](https://insights.ubuntu.com/2016/03/30/ubuntu-on-windows-the-ubuntu-userspace-for-windows-developers/)
33+
Individual Linux distributions can be run with either the WSL 1 or WSL 2 architecture. Each distribution can be upgraded or downgraded at any time and you can run WSL 1 and WSL 2 distributions side by side. WSL 2 uses an entirely new architecture that benefits from running a real Linux kernel.
4334

44-
## Provide Feedback
45-
* [GitHub issue tracker](https://github.com/Microsoft/BashOnWindows/issues)
35+
## Next steps
4636

37+
* [Install WSL 1 and update to WSL 2](./install-win10.md)
38+
39+
* [Compare WSL 2 and WSL 1](./compare-versions.md)
40+
41+
* [Create a user account and password for your new Linux distribution](./user-support.md)
42+
43+
* [Read Frequently Asked Questions](./faq.md)
44+
45+
* [Read Frequently Asked Questions about WSL 2](./wsl2-faq.md)
46+
47+
* [Troubleshooting](./troubleshooting.md)
48+
49+
* [Run interoperability commands between Windows and Linux](./interop.md)
50+
51+
* [Run launch commands and configurations](./wsl-config.md)
52+
53+
* [Set up file permissions](./file-permissions.md)
54+
55+
* [Set up WSL for Enterprise](./enterprise.md)
56+
57+
* [Reference WSL commands](./reference.md)
58+
59+
* [Build a custom distributions](./build-custom-distro.md)
60+
61+
* [Read the WSL Release Notes](./release-notes.md)

0 commit comments

Comments
 (0)