Merge pull request #6239 from bndtools/chrisrueger-fix-doc-links

Fix some links in 920-faq.md

docs/_chapters/920-faq.md

@@ -1,5 +1,5 @@
 ---
-title: Frequently Asked Questions
+title: FAQ - Frequently Asked Questions
 layout: default
 ---
 
@@ -141,10 +141,10 @@ to not use the bundle version for a package with:
 No. It creates unnecessary complexity, it is slower, and it is not necessary. It will also not be compatible with techniques like [PojoSR](https://code.google.com/archive/p/pojosr/), something that the OSGi is looking into standardizing.
 
 ## What should I use instead of the Bundle-ClassPath? <a name="bundleclasspath2"/>
-Just use Private-Package and Export-Package, know what goes into your JAR. If you really need to wrap one or more JARs, use the Include-Resource instruction, it has an option to unroll a JAR resource (see [@ option](?#include-resource). This will copy all its contents in the target JAR. The -exportcontents can then be used to export selected packages. Even better is of course to know 
+Just use Private-Package and Export-Package, know what goes into your JAR. If you really need to wrap one or more JARs, use the Include-Resource instruction, it has an option to unroll a JAR resource (see [@ option](/instructions/includeresource.html#rolling). This will copy all its contents in the target JAR. The -exportcontents can then be used to export selected packages. Even better is of course to know 
 
 ## Sharing CNF Folder and BNDTools Projects <a name="workspaceSharing"/>
-The [Best Practices section[1] provides some good tips about how you setup workspaces that share some information. 
+The [Best Practices section](/chapters/140-best-practices.html) provides some good tips about how you setup workspaces that share some information. 
 
 -----