Minor FAQ tweaks

docs/FAQ.md

@@ -1,8 +1,6 @@
 # Frequently Asked Questions
 
-## Basics
-
-### How do I choose between the `windows` and `windows-sys` crates?
+## How do I choose between the `windows` and `windows-sys` crates?
 
 `windows-sys` provides raw, zero-overhead bindings to the Windows API, while `windows` provides a more idiomatic, and when possible, safer alternative. Listed below are a few reasons why you may choose one over the other.
 
@@ -12,36 +10,21 @@
 | You need COM or WinRT support | ✅ | |
 | You would prefer to use APIs that feel idiomatic to Rust | ✅ | |
 
-### Where can I find the API I need?
+## Where can I find the API I need?
 
-You can find documentation for the `windows` crate [here](https://microsoft.github.io/windows-docs-rs) and for `windows-sys` [here](https://docs.rs/windows-sys). You can search for the API you need from the search bar. The documentation will also list which namespace the API lives in, so you can build the correct `use` statement.
+You can find documentation for the `windows` crate [here](https://microsoft.github.io/windows-docs-rs) and for `windows-sys` [here](https://docs.rs/windows-sys). You can search for the API you need from the search bar. The documentation will also list which namespace the API lives in, so you can pick the right features and build the correct `use` statement.
 
-### Why is the API I need missing?
+## Why is the API I need missing?
 
-The `windows` and `windows-sys` crates are generated from metadata such as the [Win32 Metadata project](https://github.com/microsoft/win32metadata). If you cannot find the API you need in the documentation, it's very possible the API is missing from metadata. In that case, the best thing to do is to [file an issue](https://github.com/microsoft/win32metadata/issues/new).
+The `windows` and `windows-sys` crates are generated from [metadata](https://github.com/microsoft/windows-rs/tree/master/crates/libs/metadata/default). If you cannot find the API you need in the documentation, it's very possible the API is missing from metadata. In that case, the best thing to do is to [create an issue here](https://github.com/microsoft/win32metadata/issues/new).
 
-### Why are some equivalents to C/C++ macros from the Windows SDK missing?
+## Why are some equivalents to C/C++ macros from the Windows SDK missing?
 
 The `windows` and `windows-sys` crates are generated from metadata such as the [Win32 Metadata project](https://github.com/microsoft/win32metadata). This metadata only includes type definitions and function signatures, not macros, header-only functions, or function bodies. You may find some equivalents of common C/C++ helper macros and functions in the `windows` crate.
 
-TODO: list equivalent of some common macros
-
-### Is the nightly compiler needed for some features?
-
-Currently, the `interface` and `implementation` proc macros (used to define and implement COM interfaces) require some nightly features. However, those features are in the process of being stabilized and so the `interface` and `implementation` macros should soon be available on stable Rust. See [this issue](https://github.com/microsoft/windows-rs/issues/1523) for more information.
-
-If you run into the following errors, it is likely because you are trying to use these features from a stable compiler:
-
-```
-error[E0658]: trait bounds other than `Sized` on const fn parameters are unstable
-error[E0658]: function pointer casts are not allowed in constant functions
-```
-
-## COM
-
-### How do I query for a specific COM interface?
+## How do I query for a specific COM interface?
 
-While raw COM uses the `QueryInterface` method for querying for an interface, the `windows` crate provides the safe `cast` method as an alternative.
+While raw COM uses the `QueryInterface` method for querying for an interface, the `windows` crate provides the safe `cast` method, provided by the `Interface` trait, as an alternative.
 
 ```rust
  // Assume `a: IStringable`
@@ -50,7 +33,7 @@ While raw COM uses the `QueryInterface` method for querying for an interface, th
 
 The cast method returns a Rust `Result` type allowing you to handle calls to `cast` just like you would any other fallible Rust function.
 
-### How do I declare a new COM interface?
+## How do I declare a new COM interface?
 
 The `windows` crate comes with definitions for all the interfaces you're likely to encounter when using the Windows SDK, but you might still have the need to define an interface yourself.
 
@@ -60,7 +43,7 @@ To do so, you'll need to use the `interface` feature which (like any Cargo featu
 windows = { version = "..", features = ["interface"] }
 ```
 
-Then inside your project you define the interface in much the same way you define a Rust crate just with the `#[windows::interface]` annotation above the trait definition.
+Then inside your project you define the interface in much the same way you define a Rust trait just with the `#[windows::interface]` annotation above the trait definition.
 
 ```rust
 /// My interface
@@ -70,15 +53,15 @@ unsafe trait IMyInterface: IUnknown {
 }
 ```
 
-### How do I implement an existing COM interface?
+## How do I implement an existing COM interface?
 
 If you need to implement a COM interface for a type, you'll need to add the `implement` feature which (like any Cargo feature) can be enabled in your project's Cargo.toml file.
 
 ```toml
 windows = { version = "..", features = ["implement"] }
 ```
 
-Then you'll need to declare that your type implements a particular interface by adding the `#[implement]` proc macro to your type and then writing an `impl` block for the interface. For a trait called `IMyTrait` you will need to implement the `IMyTrait_Impl` trait (note the trailing `_Impl` in the name).
+Then you'll need to declare that your type implements a particular interface by adding the `#[implement]` proc macro to your type and then writing an `impl` block for the interface. For an interface called `IMyInterface` you will need to implement the `IMyInterface_Impl` trait (note the trailing `_Impl` in the name).
 
 ```rust
 #[windows::core::implement(IMyInterface)]