[OGM-1579] Replace problematic words

Author: DavideD

CONTRIBUTING.md

@@ -40,10 +40,10 @@ You can base your test case on the test cases already existing in the repository
 
 Create a "topic" branch on which you will work.  The convention is to name the branch
 using the JIRA issue key.  If there is not already a JIRA issue covering the work you
-want to do, create one.  Assuming you will be working from the master branch and working
+want to do, create one.  Assuming you will be working from the main branch and working
 on the JIRA OGM-1234 :
 
-     git checkout -b OGM-1234 master
+     git checkout -b OGM-1234 main
 
 
 ## Code
@@ -82,9 +82,9 @@ Add the original Hibernate OGM repository as a remote repository called upstream
 git remote add upstream https://github.com/hibernate/hibernate-ogm.git
 ```
 
-If you want to rebase your branch on top of the master branch, you can use the following git command:
+If you want to rebase your branch on top of the main branch, you can use the following git command:
 ```shell
-git pull --rebase upstream master
+git pull --rebase upstream main
 ```
 
 ## Submit

documentation/manual/src/main/asciidoc/modules/configuration.asciidoc

@@ -596,7 +596,7 @@ If you are using the Hibernate OGM Infinispan feature packs, you don't have to w
 === Integration with WildFly NoSQL
 
 _WildFly NoSQL_ project allows to configure a NoSQL datastore client within a WildFly subsystem.
-See https://github.com/wildfly/wildfly-nosql/tree/master/doc[WildFly NoSQL Documentation].
+See https://github.com/wildfly/wildfly-nosql/tree/1.0.2.Final/doc[WildFly NoSQL Documentation].
 In a nutshell it provides the analogous concept of a _SQL DataSource_ for a NoSQL datastore.
 
 It is possible to configure Hibernate OGM to use the connections provided by WildFly NoSQL,

documentation/manual/src/main/asciidoc/modules/how-to-contribute.asciidoc

@@ -95,7 +95,7 @@ run it from the [filename]`hibernate-ogm-documentation/manual` subdirectory.
 The best way to share code is to fork the Hibernate OGM repository on GitHub,
 create a branch and open a pull request when you are ready.
 Make sure to rebase your pull request
-on the latest version of the master branch before offering it.
+on the latest version of the main branch before offering it.
 
 Here are a couple of approaches the team follows:
 

documentation/manual/src/main/asciidoc/modules/infinispan.asciidoc

@@ -624,7 +624,7 @@ It should also define three cache names:
 |===============
 
 This configuration is not going to scale well on write operations:
-to do that you should read about the master/slave and sharding options in Hibernate Search.
+to do that you should read about the controller/worker and sharding options in Hibernate Search.
 The complete explanation and configuration options can be found in the
 https://docs.jboss.org/hibernate/search/{hibernate-search-major-minor-version}/reference/en-US/html_single/#infinispan-directories[Hibernate Search Reference Guide]