4 files changed, 18 insertions, 19 deletions

diff --git a/documentation/content/en/articles/building-products/_index.adoc b/documentation/content/en/articles/building-products/_index.adoc
index 7f6007aa0a..30c7355e55 100644
--- a/documentation/content/en/articles/building-products/_index.adoc
+++ b/documentation/content/en/articles/building-products/_index.adoc
@@ -106,14 +106,14 @@ The rest of the article is structured as follows:
 FreeBSD makes an excellent foundation on which to build products:
 
 * FreeBSD source code is distributed under a liberal BSD license facilitating
-  its adoption in commercial products crossref:building-products[Mon2005] with minimum hassle.
+  its adoption in commercial products crossref:building-products[Mon2005,"Why you should use a BSD style license for your Open Source Project"] with minimum hassle.
 * The FreeBSD project has excellent engineering practices that can be leveraged.
 * The project offers exceptional transparency into its workings, allowing organizations using its code to plan effectively for the future.
 * The culture of the FreeBSD project, carried over from the Computer Science
   Research Group at The University of California, Berkeley
-  crossref:building-products[McKu1999-1], fosters high-quality work. Some features in FreeBSD define the state of the art.
+  crossref:building-products[McKu1999-1,"Why you should use a BSD style license for your Open Source Project"], fosters high-quality work. Some features in FreeBSD define the state of the art.
 
-crossref:building-products[GoldGab2005] examines the business reasons for using open-source in greater detail.
+crossref:building-products[GoldGab2005,"Innovation Happens Elsewhere: Open Source as Business Strategy"] examines the business reasons for using open-source in greater detail.
 For organizations, the benefits of using FreeBSD components in their products include a shorter time to market, lower development costs and lower development risks. 
 
 === Building with FreeBSD
@@ -163,7 +163,7 @@ FreeBSD's in-kernel Netgraph (man:netgraph[4]) framework allows kernel networkin
 +
 FreeBSD supports a number of filesystems, and its native UFS2 filesystem
 supports soft updates, snapshots and very large filesystem sizes (16TB per
-		filesystem) crossref:building-products[McKu1999].
+		filesystem) crossref:building-products[McKu1999,"Why you should use a BSD style license for your Open Source Project"].
 +
 FreeBSD's in-kernel GEOM (man:geom[4]) framework allows kernel storage modules to be composed in flexible ways.
 * Over {numports} ported applications, both commercial and open-source, managed via the FreeBSD ports collection.
@@ -186,10 +186,10 @@ Conflict resolution is performed by a nine member "Core Team" that is elected fr
 FreeBSD does not have "corporate" committers.
 Individual committers are required to take responsibility for the changes they introduce to the code.
 The extref:{committers-guide}[FreeBSD Committer's guide]
-crossref:building-products[ComGuide] documents the rules and responsibilities for committers.
+crossref:building-products[ComGuide,"Committer's Guide"] documents the rules and responsibilities for committers.
 
 FreeBSD's project model is examined in detail in
-crossref:building-products[Nik2005].
+crossref:building-products[Nik2005,"A project model for the FreeBSD Project"].
 
 === FreeBSD Release Engineering Processes
 
@@ -214,7 +214,7 @@ The release engineering team publishes a link:https://www.FreeBSD.org/releng/[ro
 The dates laid down in the road map are not deadlines; FreeBSD is released when its code and documentation are ready.
 
 FreeBSD's release engineering processes are described in
-crossref:building-products[RelEngDoc].
+crossref:building-products[RelEngDoc,"FreeBSD Release Engineering"].
 
 [[freebsd-collaboration]]
 == Collaborating with FreeBSD
@@ -227,7 +227,8 @@ Using open-source code is best viewed not as a one-off activity, but as an __ong
 The best projects to collaborate with are the ones that are __live__; i.e., with an active community, clear goals and a transparent working style.
 
 * FreeBSD has an active developer community around it. At the time of writing there are many thousands of contributors from every populated continent in the world and over 300 individuals with write access to the project's source repositories.
-* The goals of the FreeBSD project are crossref:building-products[Hub1994]:
+* The goals of the FreeBSD project are
+  crossref:building-products[Hub1994,"Contributing to the FreeBSD Project"]:
 
 ** To develop a high-quality operating system for popular computer hardware, and,
 ** To make our work available to all under a liberal license.
@@ -246,11 +247,11 @@ A common mistake that companies make when venturing into the open-source world i
 monetary rewards entering the picture. The factors that motivate individuals are
 complex, ranging from altruism, to an interest in solving the kinds of problems
 that FreeBSD attempts to solve. In this environment, "elegance is never
-optional"crossref:building-products[Nor1993].
+optional"crossref:building-products[Nor1993,"Tutorial on Good Lisp Programming Style"].
 
 *The Long Term View.* FreeBSD traces its roots back nearly twenty years to the work of the Computer Science Research Group at the University of California Berkeley.footnote:[FreeBSD's source repository contains a history of the project since its inception, and there are CDROMs available that contain earlier code from the CSRG.] A number of the original CSRG developers remain associated with the project.
 
-The project values long-term perspectives crossref:building-products[Nor2001]. A frequent acronym encountered in the project is DTRT, which stands for "Do The Right Thing".
+The project values long-term perspectives crossref:building-products[Nor2001,"Teach Yourself Programming in Ten Years"]. A frequent acronym encountered in the project is DTRT, which stands for "Do The Right Thing".
 
 *Development Processes.* Computer programs are tools for communication: at one level programmers communicate their intentions using a precise notation to a tool (a compiler) that translates their instructions to executable code.
 At another level, the same notation is used for communication of intent between two programmers.
@@ -259,7 +260,7 @@ Formal specifications and design documents are seldom used in the project.
 Clear and well-written code and well-written change logs
 (crossref:building-products[fig-change-log, A sample change log entry]) are used in their place.
 FreeBSD development happens by "rough consensus and running
-code"crossref:building-products[Carp1996].
+code"crossref:building-products[Carp1996,"The Architectural Principles of the Internet"].
 
 [.programlisting]
 ....
@@ -297,10 +298,8 @@ For example:
 +
 *Track FreeBSD source code.* The project makes it easy to mirror its SVN repository using extref:{committers-guide}[svnsync, svn-advanced-use-setting-up-svnsync]. Having the complete history of the source is useful when debugging complex problems and offers valuable insight into the intentions of the original developers. Use a capable source control system that allows you to easily merge changes between the upstream FreeBSD code base and your own in-house code.
 +
-crossref:building-products[fig-svn-blame, An annotated source listing generated
-using `svn blame`] shows a portion of an annotated listing of the file
-referenced by the change log in crossref:building-products[fig-change-log, A
-sample change log entry].
+crossref:building-products[fig-svn-blame, An annotated source listing generated using `svn blame`] shows a portion of an annotated listing of the file
+referenced by the change log in crossref:building-products[fig-change-log, A sample change log entry].
 The ancestry of each line of the source is clearly visible.
 Annotated listings showing the history of every file that is part of FreeBSD are https://svnweb.freebsd.org/[available on the web].
 +
@@ -345,7 +344,7 @@ The http://www.bsdcertification.org/[BSD Certification Group] offers certificati
 +
 For less critical needs, you can ask for help on the link:https://lists.freebsd.org/[project mailing lists].
 A useful guide to follow when asking for help is given in
-crossref:building-products[Ray2004].
+crossref:building-products[Ray2004,"How to ask questions the smart way"].
 Publicize your involvement::
 You are not required to publicize your use of FreeBSD, but doing so helps both your effort as well as that of the project.
 +
diff --git a/documentation/content/en/articles/ipsec-must/_index.adoc b/documentation/content/en/articles/ipsec-must/_index.adoc
index 361b6c007c..dbca759c6e 100644
--- a/documentation/content/en/articles/ipsec-must/_index.adoc
+++ b/documentation/content/en/articles/ipsec-must/_index.adoc
@@ -80,7 +80,7 @@ crossref::ipsec-must[code, Maurer's Universal Statistical Test (for block size8
 
 We also need a way to capture the raw network data.
 A program called man:tcpdump[1] lets you do this, if you have enabled the
-_Berkeley Packet Filter_ interface in your crossref::ipsec-must[kernel].
+_Berkeley Packet Filter_ interface in your crossref::ipsec-must[kernel,src/sys/i386/conf/KERNELNAME].
 
 The command:
 
diff --git a/documentation/content/en/articles/ldap-auth/_index.adoc b/documentation/content/en/articles/ldap-auth/_index.adoc
index edffbd10ea..7fc7543484 100644
--- a/documentation/content/en/articles/ldap-auth/_index.adoc
+++ b/documentation/content/en/articles/ldap-auth/_index.adoc
@@ -319,7 +319,7 @@ If it does, your database is properly configured to be used as an LDAP authentic
 == Client Configuration
 
 The client should already have OpenLDAP libraries from
-crossref:ldap-auth[ldap-connect-client], but if you are installing several client machines you will need to install package:net/openldap26-client[] on each of them.
+crossref:ldap-auth[ldap-connect-client,Configuring the Client], but if you are installing several client machines you will need to install package:net/openldap26-client[] on each of them.
 
 FreeBSD requires two ports to be installed to authenticate against an LDAP server, package:security/pam_ldap[] and package:net/nss_ldap[].
 
diff --git a/documentation/content/en/articles/pam/_index.adoc b/documentation/content/en/articles/pam/_index.adoc
index 307690be04..7f6ffe249b 100644
--- a/documentation/content/en/articles/pam/_index.adoc
+++ b/documentation/content/en/articles/pam/_index.adoc
@@ -411,7 +411,7 @@ It is essential to understand that PAM's configuration system is centered on cha
 [[pam-config-breakdown]]
 === Breakdown of a Configuration Line
 
-As explained in crossref:pam[pam-config-file], each line in [.filename]#/etc/pam.conf# consists of four or more fields: the service name, the facility name, the control flag, the module name, and zero or more module arguments.
+As explained in crossref:pam[pam-config-file, PAM Policy Files], each line in [.filename]#/etc/pam.conf# consists of four or more fields: the service name, the facility name, the control flag, the module name, and zero or more module arguments.
 
 The service name is generally (though not always) the name of the application the statement applies to.
 If you are unsure, refer to the individual application's documentation to determine what service name it uses.