diff --git a/about/faq.mdx b/about/faq.mdx
index dd5be8a9..fa5a4d0c 100644
--- a/about/faq.mdx
+++ b/about/faq.mdx
@@ -157,10 +157,6 @@ Bazel returns a non-zero exit code if the build or test invocation fails, and th
Further details on exit codes are in the [User Manual](/docs/user-manual).
-## What future features can we expect in Bazel?
-
-See our [Roadmaps](/about/roadmap).
-
## Can I use Bazel for my INSERT LANGUAGE HERE project?
Bazel is extensible. Anyone can add support for new languages. Many languages are supported: see the [build encyclopedia](/reference/be/overview) for a list of recommendations and [awesomebazel.com](https://awesomebazel.com/) for a more comprehensive list.
diff --git a/advanced/performance/memory.mdx b/advanced/performance/memory.mdx
index 017d9cb3..49d66765 100644
--- a/advanced/performance/memory.mdx
+++ b/advanced/performance/memory.mdx
@@ -59,11 +59,11 @@ changes to files outside of the working set will be disallowed, until you issue
`bazel clean` or restart the Bazel server.
If you want to specify an exact set of files or directories, use the
-`--experimental_active_directories` flag, like so:
+`--experimental_working_set` flag, like so:
```sh
bazel build //pkg:target --experimental_enable_skyfocus
---experimental_active_directories=path/to/another/dir,path/to/tests/dir
+--experimental_working_set=path/to/another/dir,path/to/tests/dir
```
You can also pass `--experimental_skyfocus_dump_post_gc_stats` to show the
@@ -72,7 +72,7 @@ memory reduction amount:
Putting it altogether, you should see something like this:
```none
-$ bazel test //pkg:target //tests/... --experimental_enable_skyfocus --experimental_active_directories=dir1,dir2,dir3/subdir --experimental_skyfocus_dump_post_gc_stats
+$ bazel test //pkg:target //tests/... --experimental_enable_skyfocus --experimental_working_set dir1,dir2,dir3/subdir --experimental_skyfocus_dump_post_gc_stats
INFO: --experimental_enable_skyfocus is enabled. Blaze will reclaim memory not needed to build the working set. Run 'blaze dump --skyframe=working_set' to show the working set, after this command.
WARNING: Changes outside of the working set will cause a build error.
INFO: Analyzed 149 targets (4533 packages loaded, 169438 targets configured).
diff --git a/reference/command-line-reference.mdx b/reference/command-line-reference.mdx
index 8940300f..172ed39a 100644
--- a/reference/command-line-reference.mdx
+++ b/reference/command-line-reference.mdx
@@ -1615,8 +1615,8 @@ Miscellaneous options, not otherwise categorized.:
`--curses=<yes, no or auto>` default: "auto"
: Use terminal cursor controls to minimize scrolling output.
-`--[no]disk_cache` default: see description
-: A path to a directory where Bazel can read and write actions and action outputs. If the directory does not exist, it will be created. Use --disk_cache with no value (or --disk_cache=true) to use a default location under the output user root (<outputUserRoot>/cache/disk). Use --nodisk_cache or --disk_cache=false to disable.
+`--disk_cache=<a path>` default: see description
+: A path to a directory where Bazel can read and write actions and action outputs. If the directory does not exist, it will be created.
`--[no]enable_platform_specific_config` default: "false"
: If true, Bazel picks up host-OS-specific config lines from bazelrc files. For example, if the host OS is Linux and you run bazel build, Bazel picks up lines starting with build:linux. Supported OS identifiers are linux, macos, windows, freebsd, and openbsd. Enabling this flag is equivalent to using --config=linux on Linux, --config=windows on Windows, etc.
@@ -3829,7 +3829,7 @@ Options that control build execution:
[`execution`](#effect_tag_EXECUTION)
`--strategy_regexp=<a '<RegexFilter>=value[,value]' assignment>` multiple uses are accumulated
-: Override which spawn strategy should be used to execute spawn actions that have descriptions matching a certain regex_filter. See --per_file_copt for details on regex_filter matching. The last regex_filter that matches the description is used. This option overrides other flags for specifying strategy. Example: --strategy_regexp=//foo.*.cc,-//foo/bar=local means to run actions using local strategy if their descriptions match //foo.*.cc but not //foo/bar. Example: --strategy_regexp='Compiling.\*/bar=local --strategy_regexp=Compiling=sandboxed will run 'Compiling //foo/bar/baz' with the 'local' strategy, but reversing the order would run it with 'sandboxed'.
+: Override which spawn strategy should be used to execute spawn actions that have descriptions matching a certain regex_filter. See --per_file_copt for details onregex_filter matching. The last regex_filter that matches the description is used. This option overrides other flags for specifying strategy. Example: --strategy_regexp=//foo.*.cc,-//foo/bar=local means to run actions using local strategy if their descriptions match //foo.*.cc but not //foo/bar. Example: --strategy_regexp='Compiling.\*/bar=local --strategy_regexp=Compiling=sandboxed will run 'Compiling //foo/bar/baz' with the 'local' strategy, but reversing the order would run it with 'sandboxed'.
Tags:
[`execution`](#effect_tag_EXECUTION)
@@ -4126,7 +4126,7 @@ Options that trigger optimizations of the build time:
[`host_machine_resource_optimizations`](#effect_tag_HOST_MACHINE_RESOURCE_OPTIMIZATIONS)
`--[no]experimental_cpu_load_scheduling` default: "false"
-: Enables the experimental local execution scheduling based on CPU load, not estimation of actions one by one. Experimental scheduling have showed the large benefit on a large local builds on a powerful machines with the large number of cores. Recommended to use with --local_resources=cpu=HOST_CPUS
+: Enables the experimental local execution scheduling based on CPU load, not estimation of actions one by one. Experimental scheduling have showed the large benefit on a large local builds on a powerful machines with the large number of cores. Reccommended to use with --local_resources=cpu=HOST_CPUS
Tags:
[`execution`](#effect_tag_EXECUTION)
@@ -4605,8 +4605,8 @@ Miscellaneous options, not otherwise categorized.:
`--[no]discard_analysis_cache` default: "false"
: Discard the analysis cache immediately after the analysis phase completes. Reduces memory usage by ~10%, but makes further incremental builds slower.
-`--[no]disk_cache` default: see description
-: A path to a directory where Bazel can read and write actions and action outputs. If the directory does not exist, it will be created. Use --disk_cache with no value (or --disk_cache=true) to use a default location under the output user root (<outputUserRoot>/cache/disk). Use --nodisk_cache or --disk_cache=false to disable.
+`--disk_cache=<a path>` default: see description
+: A path to a directory where Bazel can read and write actions and action outputs. If the directory does not exist, it will be created.
`--embed_label=<a one-line string>` default: ""
: Embed source control revision or release label in binary
diff --git a/remote/caching.mdx b/remote/caching.mdx
index 09774d21..a11953b2 100644
--- a/remote/caching.mdx
+++ b/remote/caching.mdx
@@ -298,11 +298,6 @@ Enable the disk cache as follows:
build --disk_cache=path/to/build/cache
```
-You can also run `build --disk_cache` with no value to use a default location
-under your [output user root](/reference/user-manual#output-user-root)
-(`/cache/disk`), alongside the repository cache. Use
-`build --nodisk_cache` to disable the disk cache explicitly.
-
You can pass a user-specific path to the `--disk_cache` flag using the `~` alias
(Bazel will substitute the current user's home directory). This comes in handy
when enabling the disk cache for all developers of a project via the project's
diff --git a/upstream b/upstream
index bcc6ff27..9e478d98 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit bcc6ff27ec70d29e49aeb6c88905b9e458bc64f5
+Subproject commit 9e478d98894acc52c00c0b07981aedfff422a780