diff --git a/development/source_code/README.md b/development/source_code/README.md index 1162eba956f274933b4ddb5c120709b8b0ff695c..9c8e49c24b8b640d1795b44eb46367c003200cf1 100644 --- a/development/source_code/README.md +++ b/development/source_code/README.md @@ -12,9 +12,12 @@ For how to build, see Fuchsia's [Getting Started](/getting_started.md) doc. The bootstrap procedure requires that you have Go 1.6 or newer and Git installed and on your PATH. -First, select the [layer](layers.md) of the system you wish to build. (If you're -unsure, select `topaz`, which contains the lower layers). Then, run the -following command: +First, select the [layer](layers.md) of the system you wish to build. If you're +unsure, select `topaz`, which contains the lower layers. If you change your mind +later, you can use `fx set-layer <layer>` to [pick another +layer](/development/workflows/multilayer_changes.md#switching-between-layers). + +Then, run the following command: ``` curl -s "https://fuchsia.googlesource.com/scripts/+/master/bootstrap?format=TEXT" | base64 --decode | bash -s <layer> @@ -24,10 +27,21 @@ This script will bootstrap a development environment for the given layer by first creating directories `fuchsia`, then downloading repositories for `<layer>` as well as dependent repositories required in building `<layer>`. -Upon success, the script should print a message -recommending that you add the `.jiri_root/bin` directory to your PATH. Adding -**jiri** to your PATH is strongly recommended and is assumed by other parts of the -Fuchsia toolchain. + +### Setting up environment variables + +Upon success, the bootstrap script should print a message recommending that you +add the `.jiri_root/bin` directory to your PATH. This will add `jiri` to your +PATH, which is strongly recommended and is assumed by other parts of the Fuchsia +toolchain. + +Another tool in `.jiri_root/bin` is `fx`, which helps configuring, building, +running and debugging Fuchsia. See `fx help` for all available commands. + +We also suggest sourcing `scripts/fx-env.sh`. It defines a few environment +variables that are commonly used in the documentation, such as `$FUCHSIA_DIR`, +and provides useful shell functions, for instance `fd` to change directories +effectively. See comments in `scripts/fx-env.sh` for more details. ### Working without altering your PATH diff --git a/getting_started.md b/getting_started.md index 0a8136ae3b2682fd80718a75b5f620227555fec4..33de9ca9d47db7fbe043e62767c726e755fe4d21 100644 --- a/getting_started.md +++ b/getting_started.md @@ -181,11 +181,19 @@ For example, to receive deep wisdom, run: fortune ``` +To shutdown or reboot Fuchsia, use the `dm` command: + +``` +dm help +dm shutdown +``` + ### Select a tab -Fuchsia shows multiple tabs after booting. The currently selected tab is -highlighted in yellow at the top of the screen. You can switch to the next -tab using Alt-Tab on the keyboard. +Fuchsia shows multiple tabs after booting [with graphics +enabled](#enabling-graphics). The currently selected tab is 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 shells.