Merge remote-tracking branch 'upstream/main' into wip/6.0

documentation/src/main/asciidoc/userguide/Bibliography.adoc

@@ -2,6 +2,6 @@
 
 [bibliography]
 - [[[PoEAA]]] Martin Fowler. https://www.martinfowler.com/books/eaa.html[Patterns of Enterprise Application Architecture].
-  Addison-Wesley Publishing Company. 2003.
+  Addison-Wesley Professional. 2002.
 - [[[JPwH]]] Christian Bauer & Gavin King. https://www.manning.com/books/java-persistence-with-hibernate-second-edition[Java Persistence with Hibernate, Second Edition]. Manning Publications Co. 2015.
 - [[[jdbc]]] https://download.oracle.com/otndocs/jcp/jdbc-4_2-mrel2-spec/[JDBC Specification - Version 4.2]

documentation/src/main/asciidoc/userguide/chapters/domain/naming.adoc

@@ -25,7 +25,7 @@ Also, the NamingStrategy contract was often not flexible enough to properly appl
 "rule", either because the API lacked the information to decide or because the API was honestly
 not well defined as it grew.
 
-Due to these limitation, `org.hibernate.cfg.NamingStrategy` has been deprecated
+Due to these limitations, `org.hibernate.cfg.NamingStrategy` has been deprecated
 in favor of ImplicitNamingStrategy and PhysicalNamingStrategy.
 ====
 
@@ -89,7 +89,7 @@ into the mapping via explicit names.
 
 While the purpose of an ImplicitNamingStrategy is to determine that an attribute named `accountNumber` maps to
 a logical column name of `accountNumber` when not explicitly specified, the purpose of a PhysicalNamingStrategy
-would be, for example, to say that the physical column name should instead be abbreviated `acct_num`.
+would be, for example, to say that the physical column name should instead be abbreviated to `acct_num`.
 
 [NOTE]
 ====

documentation/src/main/style/asciidoctor/js/toc.js

@@ -1,5 +1,6 @@
 var versions = {
     'current' : '/current/userguide/html_single/Hibernate_User_Guide.html',
+    '5.5' : '/5.5/userguide/html_single/Hibernate_User_Guide.html',
     '5.4' : '/5.4/userguide/html_single/Hibernate_User_Guide.html',
     '5.3' : '/5.3/userguide/html_single/Hibernate_User_Guide.html',
     '5.2' : '/5.2/userguide/html_single/Hibernate_User_Guide.html',

documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetUserType.java

@@ -26,7 +26,7 @@ import org.jboss.logging.Logger;
 //tag::basic-custom-type-BitSetUserType-example[]
 public class BitSetUserType implements UserType<Object> {
 
-	public static final BitSetUserType INSTANCE = new BitSetUserType();
+    public static final BitSetUserType INSTANCE = new BitSetUserType();
 
     private static final Logger log = Logger.getLogger( BitSetUserType.class );