From a828383f26dfa85bad9ad62bbf2fbbc139e20c42 Mon Sep 17 00:00:00 2001 From: George Kulakowski <kulakowski@google.com> Date: Fri, 11 Aug 2017 10:40:24 -0700 Subject: [PATCH] Remove stale references to magenta vs fuchsia shell Change-Id: I7e6e6062ceb23d9fcb45914f2582dddc3240f0b8 --- debugging.md | 2 +- getting_started.md | 7 +------ multi_device.md | 13 +++---------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/debugging.md b/debugging.md index 02bbf952a79..dbe08543792 100644 --- a/debugging.md +++ b/debugging.md @@ -14,7 +14,7 @@ program crashes and prints a backtrace of the crashing thread. Example: ``` -magenta$ /boot/test/debugger-test segfault +$ /boot/test/debugger-test segfault [00029.042] 01093.01133> <== fatal exception: process [6354] thread [6403] [00029.042] 01093.01133> <== fatal page fault, PC at 0x1001df9 [00029.044] 01093.01133> CS: 0 RIP: 0x1001df9 EFL: 0x207 CR2: 0x2a diff --git a/getting_started.md b/getting_started.md index 0e6f90dd62e..192ba3c028e 100644 --- a/getting_started.md +++ b/getting_started.md @@ -182,14 +182,9 @@ highlighted in yellow at the top of the screen. You can switch to the next tab using Alt-Tab on the keyboard. - Tab zero is the console and displays the boot and application log. -- Tabs 1, 2 and 3 contain Fuchsia shells. +- Tabs 1, 2 and 3 contain shells. - Tabs 4 and higher contain applications you've launched. -Fuchsia has two shells. The Magenta shell talks directly to Magenta and has the -prompt "magenta$". The Fuchsia shell supports additional features like the -Application Manager. The prompt for the Fuchsia shell is just "$". You should -use the Fuchsia shell for the examples below. - Note: to select tabs, you may need to enter "console mode". See the next section for details. ### Launch a graphical application diff --git a/multi_device.md b/multi_device.md index d611071cdf6..38f30c7e0dd 100644 --- a/multi_device.md +++ b/multi_device.md @@ -51,17 +51,10 @@ to: ## Run Stories -### Magenta Vs. Fuchsia Prompt. +### Virtual consoles. -A booted Fuchsia system has shells running in two different environments. The -Magenta shell (`magenta$` prompt) runs in an empty environment at the root -of the environment tree. The Fuchsia shell (`$` prompt) runs further down -the environment tree and has access to many more resources including the -graphics server. For more information see -[Fuchsia Boot Sequence](boot_sequence.md). - -The systems boots up with three Fuchsia shells and one Magenta shell. Alt-F1 -through Alt-F4 can be used to switch between virtual consoles. +The systems boots up with three virtual consoles. Alt-F1 through +Alt-F3 can be used to switch between virtual consoles. ### Wipe Data -- GitLab