Fix links

Author: NotTheDr01ds

.vuepress/configs/sidebar/en.ts

@@ -74,7 +74,7 @@ export const sidebarEn: SidebarConfig = {
         '/book/configuration.md',
         '/book/environment.md',
         '/book/stdout_stderr_exit_codes.md',
-        '/book/escaping.md',
+        '/book/running_externals.md',
         '/book/3rdpartyprompts.md',
         '/book/directory_stack.md',
         '/book/line_editor.md',

book/configuration.md

@@ -16,11 +16,7 @@ Check where Nushell is reading these config files from by calling `$nu.env-path`
 
 _(You can think of the Nushell config loading sequence as executing two [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop) lines on startup: `source /path/to/env.nu` and `source /path/to/config.nu`. Therefore, using `env.nu` for environment and `config.nu` for other config is just a convention.)_
 
-<<<<<<< HEAD
 When you launch Nushell without these files set up, Nushell will prompt you to download the [default config files](https://github.com/nushell/nushell/tree/main/crates/nu-utils/src/default_files).
-=======
-When you launch Nushell without these files set up, Nushell will prompt you to download the [`default env.nu`](https://github.com/nushell/nushell/blob/main/crates/nu-utils/src/sample_config/default_env.nu) and [`default config.nu`](https://github.com/nushell/nushell/blob/main/crates/nu-utils/src/sample_config/default_config.nu).
->>>>>>> 5111c917 (Moved upgrade info to blog)
 
 ::: tip
 The default config files aren't required. If you prefer to start with an empty `env.nu` and `config.nu` then Nu applies identical defaults in internal Rust code. You can still browse the default files for default values of environment variables and a list of all configurable settings using the [`config`](#configurations-with-built-in-commands) commands:
@@ -167,7 +163,7 @@ alias nu-open = open
 alias open = ^open
 ```
 
-The `^` symbol _escapes_ the Nushell `open` command, which invokes the operating system's `open` command.
+The `^` symbol escapes the Nushell `open` command, which invokes the operating system's `open` command.
 For more about escape and `^` see the [chapter about escapes](./running_externals.md).
 
 ## PATH configuration

book/nu_as_a_shell.md

@@ -12,7 +12,7 @@ A big feature of any shell are [environment variables](environment.md).
 In Nushell, environment variables are scoped and can have any type supported by Nushell.
 This brings in some additional design considerations so please refer to the linked section for more details.
 
-The other sections explain how to work with [stdout, stderr and exit codes](stdout_stderr_exit_codes.md), how to [escape a command call to the external command call](escaping.md), and how to [configure 3rd party prompts](3rdpartyprompts.md) to work with Nushell.
+The other sections explain how to work with [stdout, stderr and exit codes](stdout_stderr_exit_codes.md), how to [run an external command when there is a built-in with the same name](./running_externals.md), and how to [configure 3rd party prompts](3rdpartyprompts.md) to work with Nushell.
 
 An interesting feature of Nushell is the [Directory Stack](directory_stack.md) which let you work in multiple directories simultaneously.
 

book/running_externals.md

@@ -14,7 +14,11 @@ External command (typically `/usr/bin/ls`):
 ^ls
 ```
 
-## Windows Note
+::: note
+On Windows, `ls` is a PowerShell _alias_ by default, so `^ls` will not find a matching system _command_.
+:::
+
+## Additional Windows Notes
 
 When running an external command on Windows,
 Nushell forwards some `CMD.EXE` internal commands to cmd instead of attempting to run external commands.

book/table_of_contents.md

@@ -25,7 +25,7 @@
 - [Metadata](metadata.md) - An explanation of Nu's metadata system
 - [Creating your own errors](creating_errors.md) - Creating your own error messages
 - [Directory Stack](directory_stack.md) - Working with multiple locations
-- [Escaping commands](escaping.md) - Escaping to native commands of the same name
+- [Running External (System) Commands](./running_externals.md) - Running external commands with a naming conflict
 - [Plugins](plugins.md) - Enhancing Nushell with more features using plugins
 - [Parallelism](parallelism.md) - Running your code in parallel
 - [Line editor](line_editor.md) - Nushell's line editor