Trim down the FAQ
Remove duplicated information, move versioning FAQ to Versioning.
PiperOrigin-RevId: 480350675
Change-Id: I3e9d4ea8e894fa795baf1daeea838cb2c5d59216
diff --git a/docs/faq.md b/docs/faq.md
index b4ea4da..d6eebe2 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -16,6 +16,27 @@
simplify and unify platform features, and other new features that target
developer pain points.
+### How are `androidx` and AndroidX related to Jetpack?
+
+They are effectively the same thing!
+
+**Jetpack** is the external branding for the set of components, tools, and
+guidance that improve the developer experience on Android.
+
+Libraries within Jetpack use the **`androidx`** Java package and Maven group ID.
+Developers expect these libraries to follow a consistent set of API design
+guidelines, conform to SemVer and alpha/beta revision cycles, and use the public
+Android issue tracker for bugs and feature requests.
+
+**AndroidX** is the open-source project where the majority\* of Jetpack
+libraries are developed. The project's tooling and infrastructure enforce the
+policies associated with Jetback branding and `androidx` packaging, allowing
+library developers to focus on writing and releasing high-quality code.
+
+<sup>* Except a small number of libraries that were historically developed using
+a different workflow, such as ExoPlayer/Media or AndroidX Test, and have built
+up equivalent policies and processes.
+
### Why did we move to `androidx`?
Please read our
@@ -27,7 +48,7 @@
As part of the Jetpack effort to improve developer experience on Android, the
Support Library team undertook a massive refactoring project. Over the course of
2017 and 2018, we streamlined and enforced consistency in our packaging,
-developed new policies around vesioning and releasing, and developed tools to
+developed new policies around versioning and releasing, and developed tools to
make it easy for developers to migrate.
### Will there be any more updates to Support Library?
@@ -37,59 +58,7 @@
There will be no further releases under Support Library packaging and they
should be considered deprecated.
-### How are `androidx` and AndroidX related to Jetpack?
-
-They are effectively the same thing! In a sentence, `androidx` is the packaging
-and AndroidX is the development workflow for most components in Jetpack. Jetpack
-is the external branding for libraries within the `androidx` package.
-
-In more detail, Jetpack is the external branding for the set of components,
-tools, and guidance that improve the developer experience on Android. AndroidX
-is the open-source development project that defines the workflow, versioning,
-and release policies for ALL libraries included in Jetpack. All libraries within
-the `androidx` Java package follow a consistent set of API design guidelines,
-conform to SemVer and alpha/beta revision cycles, and use the Android issue
-tracker for bugs and feature requests.
-
### What library versions have been officially released?
You can see all publicly released versions on the interactive
-[Google Maven page](https://dl.google.com/dl/android/maven2/index.html).
-
-### How do I jetify something?
-
-The Standalone Jetifier documentation and download link can be found
-[here](https://developer.android.com/studio/command-line/jetifier), under the
-Android Studio DAC.
-
-### How do I update my library version?
-
-See the steps specified on the version page
-[here](versioning.md#how-to-update-your-version).
-
-## Version FAQ {#version}
-
-### When does an alpha ship?
-
-For public releases, an alpha ships when the library lead believes it is ready.
-Generally, these occur during the batched bi-weekly (every 2 weeks) release
-because all tip-of-tree dependencies will need to be released too.
-
-### Are there restrictions on when or how often an alpha can ship?
-
-Nope.
-
-### Can alpha work (ex. for the next Minor release) occur in the primary development branch during beta API lockdown?
-
-No. This is by design. Focus should be spent on improving the Beta version and
-adding documentation/samples/blog posts for usage!
-
-### Is there an API freeze window between alpha and beta while API surface is reviewed and tests are added, but before the beta is released?
-
-Yes. If any new APIs are added in this window, the beta release will be blocked
-until API review is complete and addressed.
-
-### How often can a beta release?
-
-As often as needed, however, releases outside of the bi-weekly (every 2 weeks)
-release will need to get approval from the TPM (nickanthony@).
+[Google Maven page](https://maven.google.com).
diff --git a/docs/versioning.md b/docs/versioning.md
index a55952f..b7b5a1a 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -380,3 +380,30 @@
If your `androidx.foo:foo-bar` module was in version `1.0.0-alpha06`, then the
Kotlin extension module would start in version `1.0.0-alpha06`.
+
+## FAQ
+
+### When does an alpha ship?
+
+For public releases, an alpha ships when the library lead believes it is ready.
+Generally, these occur during the batched bi-weekly (every 2 weeks) release
+because all tip-of-tree dependencies will need to be released too.
+
+### Are there restrictions on when or how often an alpha can ship?
+
+Nope.
+
+### Can alpha work (ex. for the next Minor release) occur in the primary development branch during beta API lockdown?
+
+No. This is by design. Focus should be spent on improving the Beta version and
+adding documentation/samples/blog posts for usage!
+
+### Is there an API freeze window between alpha and beta while API surface is reviewed and tests are added, but before the beta is released?
+
+Yes. If any new APIs are added in this window, the beta release will be blocked
+until API review is complete and addressed.
+
+### How often can a beta release?
+
+As often as needed, however, releases outside of the bi-weekly (every 2 weeks)
+release will need to get approval from the TPM (natnaelbelay@).
