Rename 'master' branch to 'main'

.ci/jobs/defaults.yml

@@ -15,7 +15,7 @@
     parameters:
     - string:
         name: branch_specifier
-        default: refs/heads/master
+        default: refs/heads/main
         description: the Git branch specifier to build (<branchName>, <tagName>,
           <commitId>, etc.)
     properties:

.ci/jobs/elastic+eland+master.yml

@@ -1,13 +1,13 @@
 ---
 - job:
-    name: elastic+eland+master
+    name: elastic+eland+main
-    display-name: 'elastic / eland # master'
+    display-name: 'elastic / eland # main'
     description: Eland is a data science client with a Pandas-like interface
     junit_results: "*-junit.xml"
     parameters:
       - string:
           name: branch_specifier
-          default: refs/heads/master
+          default: refs/heads/main
           description: The Git branch specifier to build
     triggers:
       - github

CONTRIBUTING.md

@@ -94,7 +94,7 @@ Once your changes and tests are ready to submit for review:
 3. Rebase your changes
 
     Update your local repository with the most recent code from the main
-    eland repository, and rebase your branch on top of the latest master
+    eland repository, and rebase your branch on top of the latest main
     branch. We prefer your initial changes to be squashed into a single
     commit. Later, if we ask you to make changes, add them as separate
     commits. This makes them easier to review. As a final step before
@@ -119,8 +119,8 @@ Please adhere to the general guideline that you should never force push
 to a publicly shared branch. Once you have opened your pull request, you
 should consider your branch publicly shared. Instead of force pushing
 you can just add incremental commits; this is generally easier on your
-reviewers. If you need to pick up changes from master, you can merge
+reviewers. If you need to pick up changes from main, you can merge
-master into your branch. A reviewer might ask you to rebase a
+main into your branch. A reviewer might ask you to rebase a
 long-running pull request in which case force pushing is okay for that
 request. Note that squashing at the end of the review process should
 also not be done, that can be done when the pull request is [integrated

README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <a href="https://github.com/elastic/eland">
-    <img src="https://raw.githubusercontent.com/elastic/eland/master/docs/sphinx/logo/eland.png" width="30%"
+    <img src="https://raw.githubusercontent.com/elastic/eland/main/docs/sphinx/logo/eland.png" width="30%"
       alt="Eland" />
   </a>
 </div>
@@ -12,9 +12,9 @@
   <a href="https://pepy.tech/project/eland"><img src="https://pepy.tech/badge/eland" alt="Downloads"></a>
   <a href="https://pypi.org/project/eland"><img src="https://img.shields.io/pypi/status/eland.svg"
       alt="Package Status"></a>
-  <a href="https://clients-ci.elastic.co/job/elastic+eland+master"><img
+  <a href="https://clients-ci.elastic.co/job/elastic+eland+main"><img
-      src="https://clients-ci.elastic.co/buildStatus/icon?job=elastic%2Beland%2Bmaster" alt="Build Status"></a>
+      src="https://clients-ci.elastic.co/buildStatus/icon?job=elastic%2Beland%2Bmain" alt="Build Status"></a>
-  <a href="https://github.com/elastic/eland/blob/master/LICENSE.txt"><img src="https://img.shields.io/pypi/l/eland.svg"
+  <a href="https://github.com/elastic/eland/blob/main/LICENSE.txt"><img src="https://img.shields.io/pypi/l/eland.svg"
       alt="License"></a>
   <a href="https://eland.readthedocs.io"><img
       src="https://readthedocs.org/projects/eland/badge/?version=latest" alt="Documentation Status"></a>
@@ -55,7 +55,7 @@ $ conda install -c conda-forge eland
 ### Connecting to Elasticsearch 
 
 Eland uses the [Elasticsearch low level client](https://elasticsearch-py.readthedocs.io) to connect to Elasticsearch. 
-This client supports a range of [connection options and authentication options](https://elasticsearch-py.readthedocs.io/en/master/api.html#elasticsearch). 
+This client supports a range of [connection options and authentication options](https://elasticsearch-py.readthedocs.io/en/stable/api.html#elasticsearch). 
 
 You can pass either an instance of `elasticsearch.Elasticsearch` to Eland APIs
 or a string containing the host to connect to:

docs/sphinx/development/contributing.rst

@@ -101,7 +101,7 @@ Once your changes and tests are ready to submit for review:
 3. Rebase your changes
 
    Update your local repository with the most recent code from the main
-   eland repository, and rebase your branch on top of the latest master
+   eland repository, and rebase your branch on top of the latest main
    branch. We prefer your initial changes to be squashed into a single
    commit. Later, if we ask you to make changes, add them as separate
    commits. This makes them easier to review. As a final step before
@@ -126,8 +126,8 @@ Please adhere to the general guideline that you should never force push
 to a publicly shared branch. Once you have opened your pull request, you
 should consider your branch publicly shared. Instead of force pushing
 you can just add incremental commits; this is generally easier on your
-reviewers. If you need to pick up changes from master, you can merge
+reviewers. If you need to pick up changes from main, you can merge
-master into your branch. A reviewer might ask you to rebase a
+main into your branch. A reviewer might ask you to rebase a
 long-running pull request in which case force pushing is okay for that
 request. Note that squashing at the end of the review process should
 also not be done, that can be done when the pull request is `integrated

eland/ml/ml_model.py

@@ -56,7 +56,7 @@ if TYPE_CHECKING:
 class MLModel:
     """
     A machine learning model managed by Elasticsearch.
-    (See https://www.elastic.co/guide/en/elasticsearch/reference/master/put-inference.html)
+    (See https://www.elastic.co/guide/en/elasticsearch/reference/current/put-inference.html)
 
     These models can be created by Elastic ML, or transformed from supported Python formats
     such as scikit-learn or xgboost and imported into Elasticsearch.