Merge remote-tracking branch 'origin/live'

Author: scooley

README.md

@@ -5,14 +5,14 @@ If you find doc issues / errors or have an improvement you'd like to suggest, pl
 
 > **Note:** This repo's issue tracker is only for reporting issues with the WSL docs.
 > Other related issue repo's:
-> * WSL: https://github.com/Microsoft/BashOnWindows/
+> * WSL: https://github.com/Microsoft/WSL/
 > * Windows Console: https://github.com/Microsoft/Console/
 
 ## External Links
 
-[Rendered documentation website](https://msdn.microsoft.com/commandline) 
+[Rendered documentation website](https://docs.microsoft.com/windows/wsl/) 
 
-[Release notes for WSL](https://msdn.microsoft.com/en-us/commandline/wsl/release_notes)
+[Release notes for WSL](https://docs.microsoft.com/en-us/windows/wsl/release-notes)
 
 ## Microsoft Open Source Code of Conduct
 

WSL/TOC.md

@@ -1,9 +1,10 @@
 # [About the Windows Subsystem for Linux](./about.md)
 # [Install on Windows 10](./install-win10.md)
 # [Install on Windows Server](./install-on-server.md)
-# [User account and permissions](./user-support.md)
-# [Multi-distro management](./wsl-config.md)
+# [User accounts and permissions](./user-support.md)
+# [Distro management](./wsl-config.md)
 # [Interoperability](./interop.md)
+# [Build a Custom Distro](./build-custom-distro.md)
 # [Frequently Asked Questions](./faq.md)
 # [Troubleshooting](./troubleshooting.md)
 # [Release Notes](./release-notes.md)

WSL/about.md

@@ -34,7 +34,7 @@ You can:
 * [Read frequently asked questions](faq.md)
 
 ## Team Blogs
-* [Overview post with a collection of videos and blogs](https://blogs.msdn.microsoft.com/commandline/learn-about-bash-on-windows-subsystem-for-linux/)
+*  [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/)
 * [Command-Line blog](https://blogs.msdn.microsoft.com/commandline/)
 * [Windows Subsystem for Linux Blog](https://blogs.msdn.microsoft.com/wsl/)
 

WSL/build-custom-distro.md

@@ -0,0 +1,43 @@
+---
+title: Build a Custom Linux Distro for WSL
+description: Learn how to create a custom Linux distribution for WSL.
+keywords: BashOnWindows, bash, wsl, windows, windowssubsystem, distro, custom
+author: taraj
+ms.author: taraj
+ms.date: 3/27/2018
+ms.topic: article
+ms.prod: windows-subsystem-for-linux
+ms.service: windows-subsystem-for-linux
+ms.assetid: a5095219-0c82-4ce5-9a6d-5c2fc00835a3
+---
+
+# Creating a Custom Linux Distro for WSL
+
+Use our open source WSL sample to build WSL distro packages for the Microsoft Store and/or to create custom Linux distro packages for sideloading. You can find the [distro launcher repo](https://github.com/Microsoft/WSL-DistroLauncher) on GitHub.
+
+This project enables:
+* Linux distribution maintainers to package and submit a Linux distribution as an appx that runs on WSL
+* Developers to create custom Linux distributions that can be sideloaded onto their dev machine
+
+## Background
+We distribute Linux distros for WSL as UWP applications through the Microsoft Store. You can install those applications that will then run on WSL - the subsystem that sits in the Windows kernel. This delivery mechanism has many benefits as discussed in an earlier blog post.
+
+## Sideloading a Custom Linux Distro Package
+You can create a custom Linux distro package as an application to sideload on your personal machine. Please note that your custom package would not be distributed through the Microsoft Store unless you submit as a distribution maintainer.
+To set up your machine to sideload apps, you will need to enable this in the system settings under “For Developers”.  Be sure to either have developer mode, or sideload apps selected
+
+## For Linux Distro Maintainers
+To submit to the Store, you will need to work with us to receive publishing approval. If you are a Linux distribution owner interested in adding your distribution to the Microsoft Store, please contact [email protected].
+
+## Getting Started
+Follow the instructions on the [Distro Launcher GitHub repo](https://github.com/Microsoft/WSL-DistroLauncher) to create a custom Linux distro package.
+
+ 
+## Team Blogs
+*  [Open Sourcing a WSL Sample for Linux Distribution Maintainers and Sideloading Custom Linux Distributions](https://blogs.msdn.microsoft.com/commandline/2018/03/26/wsl-distro-launcher/)
+* [Command-Line blog](https://blogs.msdn.microsoft.com/commandline/)
+
+## Provide Feedback
+* [Distro Launcher Gitub repo](https://github.com/Microsoft/WSL-DistroLauncher)
+* [GitHub issue tracker for WSL](https://github.com/Microsoft/BashOnWindows/issues)
+* [Command-line UserVoice portal](https://wpdev.uservoice.com/forums/266908-command-prompt-console-bash-on-ubuntu-on-windo/category/161892-bash)

WSL/faq.md

@@ -31,7 +31,7 @@ You can also access your local machine’s filesystem from within the Linux Bash
 ![](media/ls.png)
 
 ### What is Bash?
-[Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) is a popular text-based shell and command-language. It is the default shell included within Ubuntu and other Linux distros, and in MacOS. Users type commands into a shell to execute scripts and/or run commands and tools to accomplish many tasks.
+[Bash](https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29) is a popular text-based shell and command-language. It is the default shell included within Ubuntu and other Linux distros, and in macOS. Users type commands into a shell to execute scripts and/or run commands and tools to accomplish many tasks.
 
 ### How does this work?
 Check out our [blog](https://blogs.msdn.microsoft.com/wsl/) where we go into detail about the underlying technology.

WSL/install-on-server.md

@@ -15,15 +15,14 @@ ms.assetid: 9281ffa2-4fa9-4078-bf6f-b51c967617e3
 
 > Applies to Windows Server 1709 and later
 
-At //Build2017, Microsoft announced that Windows Subsystem for Linux will be [available on Windows Server](https://blogs.technet.microsoft.com/hybridcloud/2017/05/10/windows-server-for-developers-news-from-microsoft-build-2017/).  These instructions walk through running on the Windows Subsystem for Linux on Windows Server 1709 and later.
+At //Build2017, Microsoft announced that Windows Subsystem for Linux will be [available on Windows Server](https://blogs.technet.microsoft.com/hybridcloud/2017/05/10/windows-server-for-developers-news-from-microsoft-build-2017/).  These instructions walk through running the Windows Subsystem for Linux on Windows Server 1709 and later.
 
 ## Enable the Windows Subsystem for Linux
 
 Enable the "Windows Subsystem for Linux" optional feature and reboot.
 
 1. Open PowerShell as Administrator and run:
     ``` PowerShell
-    PowerShell
     Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux
     ```
 
@@ -38,10 +37,9 @@ Enable the "Windows Subsystem for Linux" optional feature and reboot.
     * [OpenSUSE](https://aka.ms/wsl-opensuse-42)
     * [SLES](https://aka.ms/wsl-sles-12)
 
-    You can download the distributions to Windows Server with [`Invoke-WebRequest`](https://msdn.microsoft.com/powershell/reference/5.1/microsoft.powershell.utility/invoke-webrequest) cmdlet.  Here's a sample instruction to download OpenSUSE.
+    You can download the distributions to Windows Server with [`Invoke-WebRequest`](https://msdn.microsoft.com/powershell/reference/5.1/microsoft.powershell.utility/invoke-webrequest) cmdlet.  Here's a sample instruction to download Ubuntu.
     
     ``` PowerShell
-    PowerShell
     Invoke-WebRequest -Uri https://aka.ms/wsl-ubuntu-1604 -OutFile ~/Ubuntu.zip -UseBasicParsing
     ```
     
@@ -82,4 +80,4 @@ Enable the "Windows Subsystem for Linux" optional feature and reboot.
 
 You're done!  Go use your new Linux environment!
 
-![](media/server-cowsay.png)
+![](media/server-cowsay.png)

WSL/install-win10.md

@@ -24,15 +24,17 @@ Enable the "Windows Subsystem for Linux" optional feature and reboot.
 2. Restart your computer when prompted.
 
 ## Install your Linux Distribution of Choice
-### Fall Creators Update and later: Install from the Windows Store
+### Fall Creators Update and later: Install from the Microsoft Store
 
-> This section is for Windows Insiders (build 16215 or later).  Follow these steps to [Check your build](troubleshooting.md#check-your-build-number).  For earlier versions of Windows 10, follow [these instructions using lxrun](install-win10.md#for-anniversary-update-and-creators-update-install-using-lxrun).
+> This section is for Windows build 16215 or later.  Follow these steps to [check your build](troubleshooting.md#check-your-build-number).  For earlier versions of Windows 10, follow [these instructions using lxrun](install-win10.md#for-anniversary-update-and-creators-update-install-using-lxrun).
 
-1. Open the Windows Store and choose your favorite Linux distribution.      
+1. Open the Microsoft Store and choose your favorite Linux distribution.      
     Here are links directly to the store installers:
     * [Ubuntu](https://www.microsoft.com/store/p/ubuntu/9nblggh4msv6)
     * [OpenSUSE](https://www.microsoft.com/store/apps/9njvjts82tjx)
     * [SLES](https://www.microsoft.com/store/apps/9p32mwbh6cns)
+    * [Kali Linux](https://www.microsoft.com/store/apps/9PKR34TNCV07)
+    * [Debian GNU/Linux](https://www.microsoft.com/store/apps/9MSVKQC78PK6)
 
     ![](media/UbuntuStore.png)
 
@@ -44,7 +46,7 @@ Enable the "Windows Subsystem for Linux" optional feature and reboot.
     > ![](media/AppStorage.png)
     
 3. Once the download has completed, select "Launch".  
-    This will open a console window.  Wait for installation to complete then you will be prompted to create your UNIX user account.
+    This will open a console window.  Wait for installation to complete then you will be prompted to create your LINUX user account.
     ![](media/UbuntuInstall.png)
     
     > **Troubleshooting: Installation failed with error 0x8007007e**  
@@ -54,12 +56,12 @@ Enable the "Windows Subsystem for Linux" optional feature and reboot.
 
 
     
-5. Create your UNIX username and password.  This user account can be different from, and has no relationship to, your Windows username and password. [Read more](user-support.md).
+5. Create your LINUX username and password.  This user account has no relationship to your Windows username and password and hence can be different. [Read more](user-support.md).
 
 You're done!  Now you can use your Linux environment.
 
 ### For Anniversary Update and Creators Update: Install using lxrun
-lxrun installs Ubuntu user-mode by default on top of the Windows subsystem for Linux.  
+lxrun installs Ubuntu user-mode by default on top of the Windows Subsystem for Linux.  
 
 > Since moving to the store, we have stopped keeping this user-mode image up to date.  When you're done, run `apt-get update`.
 
@@ -81,7 +83,7 @@ lxrun installs Ubuntu user-mode by default on top of the Windows subsystem for L
 
 4. Create a UNIX user
     
-    The first time you install the Windows subsystem for Linux, you will be prompted to create a UNIX username and password.  
+    The first time you install the Windows Subsystem for Linux, you will be prompted to create a UNIX username and password.  
     ![](media/new-user.png)
     
     This UNIX username and password can be different from, and has no relationship to, your Windows username and password. [Learn more about your UNIX account.](user-support.md).