diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
index 28b726bb22..6a83d1c7bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
@@ -16,6 +16,8 @@ import org.hibernate.resource.jdbc.spi.StatementInspector;
  * Allows creation of a new {@link Session} with specific options.
  * 
  * @author Steve Ebersole
+ *
+ * @see SessionFactory#withOptions()
  */
 public interface SessionBuilder {
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
index 0ad4a62dc2..79d5233bb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
@@ -16,6 +16,8 @@ import java.util.TimeZone;
  * Specialized {@link SessionBuilder} with access to stuff from another session.
  *
  * @author Steve Ebersole
+ *
+ * @see Session#sessionWithOptions()
  */
 public interface SharedSessionBuilder extends SessionBuilder {
 
diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
index a67aa1b05d..449d2d793c 100644
--- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
@@ -14,6 +14,8 @@ import org.hibernate.resource.jdbc.spi.StatementInspector;
  * Allows creation of a new {@link StatelessSession} with specific options.
  *
  * @author Steve Ebersole
+ *
+ * @see SessionFactory#withStatelessOptions()
  */
 public interface StatelessSessionBuilder {
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
index 4b659ba6f1..bdbc6e3d0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
@@ -27,12 +27,14 @@ import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.type.format.FormatMapper;
 
 /**
- * The contract for building a {@link SessionFactory} given a number of options.
+ * The contract for building a {@link SessionFactory} given a specified set of options.
  *
  * @author Steve Ebersole
  * @author Gail Badner
  *
  * @since 5.0
+ *
+ * @see Metadata#getSessionFactoryBuilder()
  */
 public interface SessionFactoryBuilder {
 	/**
@@ -256,6 +258,12 @@ public interface SessionFactoryBuilder {
 	 */
 	SessionFactoryBuilder applyLazyInitializationOutsideTransaction(boolean enabled);
 
+	/**
+	 * Specifies how temporary tables should be created or dropped with respect
+	 * to transaction handling.
+	 *
+	 * @see TempTableDdlTransactionHandling
+	 */
 	SessionFactoryBuilder applyTempTableDdlTransactionHandling(TempTableDdlTransactionHandling handling);
 
 	/**
@@ -360,11 +368,18 @@ public interface SessionFactoryBuilder {
 	SessionFactoryBuilder applyOrderingOfUpdates(boolean enabled);
 
 	/**
-	 * Specifies whether multi-tenancy is enabled
+	 * Specifies whether multitenancy is enabled via use of a
+	 * {@link org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider}.
+	 * <p>
+	 * Note that this setting does not affect
+	 * {@linkplain org.hibernate.annotations.TenantId discriminator-based}
+	 * multitenancy.
 	 *
-	 * @param enabled True if multi-tenancy in use through a {@link org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider}.
+	 * @param enabled True if multi-tenancy in use via a {@code MultiTenantConnectionProvider}.
 	 *
 	 * @return {@code this}, for method chaining
+	 *
+	 * @see org.hibernate.cfg.AvailableSettings#MULTI_TENANT_CONNECTION_PROVIDER
 	 */
 	SessionFactoryBuilder applyMultiTenancy(boolean enabled);