2021-05-20 00:27 UTC Viktor Szakats ([email protected])

  * .appveyor.yml
  * contrib/hbdoc/_html.prg
  * ChangeLog.txt
  * contrib/hbyaml/tests/test.yml
  * doc/howtovcs.txt
  * docs/_config.yml
  * docs/_includes/header.html
  * docs/contribs.md
  * docs/index.html
  * docs/logo.md
  * package/mpkg_win_ci.sh
  * package/mpkg_win_dl.sh
  * package/mpkg_win.sh
  * package/RELNOTES.md
  * README.md
    * rename 'master' branch to 'main' for the Harbour source repo

.appveyor.yml

@@ -1,7 +1,7 @@
 version: 3.4.{build}
 branches:
   only:
-  - master
+  - main
   - prod
   - /prod-mingw.*/
   - /prod-clang.*/
@@ -76,11 +76,11 @@ deploy:
     description: 'Binaries generated after each commit.
 
 
-      Read [`RELNOTES.md`](../../blob/master/package/RELNOTES.md) in package root for release details and **Getting Started** instructions.'
+      Read [`RELNOTES.md`](../../blob/main/package/RELNOTES.md) in package root for release details and **Getting Started** instructions.'
     artifact: pkg-win
     draft: false
     prerelease: true
     force_update: true
     on:
-      branch: master
+      branch: main
       appveyor_repo_tag: false

ChangeLog.txt

@@ -3,6 +3,24 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2021-05-20 00:27 UTC Viktor Szakats ([email protected])
+  * .appveyor.yml
+  * contrib/hbdoc/_html.prg
+  * ChangeLog.txt
+  * contrib/hbyaml/tests/test.yml
+  * doc/howtovcs.txt
+  * docs/_config.yml
+  * docs/_includes/header.html
+  * docs/contribs.md
+  * docs/index.html
+  * docs/logo.md
+  * package/mpkg_win_ci.sh
+  * package/mpkg_win_dl.sh
+  * package/mpkg_win.sh
+  * package/RELNOTES.md
+  * README.md
+    * rename 'master' branch to 'main' for the Harbour source repo
+
 2021-05-20 00:17 UTC Viktor Szakats ([email protected])
   * package/upd_doc.sh
     + generalize branch names
@@ -6397,7 +6415,7 @@
         curl/libcurl package is listed on the official curl download page
         as well.
       More info here:
-        https://github.com/vszakats/hb/blob/master/contrib/hbtip/WARNING.txt
+        https://github.com/vszakats/hb/blob/main/contrib/hbtip/WARNING.txt
 
       UPDATE: One correction: libcurl doesn't officially support storing
       32-bit and 64-bit .dlls in the same directory (they have the same
@@ -17001,7 +17019,7 @@
   ; Please submit Pull Requests instead of misplacing 3.4
     bug reports on mainline-specific forums. Thank you.
        https://github.com/vszakats/hb/pulls
-       https://github.com/vszakats/hb/blob/master/CONTRIBUTING.md#how-to-participate
+       https://github.com/vszakats/hb/blob/main/CONTRIBUTING.md#how-to-participate
     or donate to support allocating time for dealing with Issues
        https://github.com/vszakats/hb#how-to-donate
     Currently win/mingw*, linux/gcc/clang, darwin/clang are

README.md

@@ -2,7 +2,7 @@
 [![License](https://img.shields.io/badge/license-GPLv2%20%2B%20Library%20Exception-blue.svg)](LICENSE.txt "License")
 [![Download](https://img.shields.io/badge/download-snapshot_binary_(3.4)-blue.svg)](https://github.com/vszakats/hb/releases "Download snapshot release")
 <br>
-[![Build status](https://ci.appveyor.com/api/projects/status/4rd806hk73q83qo4/branch/master?svg=true)](https://ci.appveyor.com/project/vsz/hb/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/4rd806hk73q83qo4/branch/main?svg=true)](https://ci.appveyor.com/project/vsz/hb/branch/main)
 [![Coverity Status](https://scan.coverity.com/projects/3208/badge.svg)](https://scan.coverity.com/projects/3208)
 
 Harbour is the open/free software implementation of a cross-platform,
@@ -51,7 +51,7 @@ and a collection of libraries and bindings for popular APIs.
 > [For](https://groups.google.com/forum/#!msg/harbour-users/2fwUzdKwpKA/32nI4WhZLfYJ)
 > [users](https://groups.google.com/forum/#!msg/harbour-users/Ro99f8S6my0/KvfjhCx_jE4J)
 > [contributing](CONTRIBUTING.md) to development, it's recommended to follow
-> [commits](https://github.com/vszakats/hb/commits/master) and reading
+> [commits](https://github.com/vszakats/hb/commits/main) and reading
 > [ChangeLog.txt](ChangeLog.txt?raw=true).
 
 ### Harbour live source repository
@@ -70,8 +70,8 @@ You can get subsequent updates using this command:
 
 Download source archive from any of these URLs and unpack:
 
-* <https://github.com/vszakats/hb/archive/master.zip>
-* <https://github.com/vszakats/hb/archive/master.tar.gz>
+* <https://github.com/vszakats/hb/archive/main.zip>
+* <https://github.com/vszakats/hb/archive/main.tar.gz>
 
 ### Harbour unstable binaries (updated after each commit)
 
@@ -81,12 +81,12 @@ Download source archive from any of these URLs and unpack:
 
 #### Mac (using Homebrew)
 
-    brew install https://raw.githubusercontent.com/vszakats/hb/master/package/hb-vszakats.rb --HEAD
+    brew install https://raw.githubusercontent.com/vszakats/hb/main/package/hb-vszakats.rb --HEAD
 
 ### Follow commits using:
 
-* [Web browser](https://github.com/vszakats/hb/commits/master)
-* [RSS feed](https://github.com/vszakats/hb/commits/master.atom)
+* [Web browser](https://github.com/vszakats/hb/commits/main)
+* [RSS feed](https://github.com/vszakats/hb/commits/main.atom)
 * Any compatible mobile/desktop client app
 
 # How to Build

contrib/hbdoc/_html.prg

@@ -115,7 +115,7 @@ CREATE CLASS GenerateHTML INHERIT TPLGenerate
    VAR hLinkAssetCache INIT { => }
 
    VAR cURLBase INIT hb_Version( HB_VERSION_URL_BASE )
-   VAR cBranch  INIT "master"
+   VAR cBranch  INIT "main"
 
    CLASS VAR lCreateStyleDocument AS LOGICAL INIT .T.
    VAR TargetFilename AS STRING INIT ""

contrib/hbyaml/tests/test.yml

@@ -2,7 +2,7 @@
 # yamllint disable rule:line-length
 branches:
   only:
-    - master
+    - main
     - prod
 notifications:
   email: false
@@ -181,5 +181,5 @@ deploy:
   overwrite: true
   !!str on:
     tag: true
-    branch: master
+    branch: main
     condition: "${CC} = mingw-clang"

doc/howtovcs.txt

@@ -40,7 +40,7 @@ by Viktor Szakats
  9. Save and exit in editor
 10. Git is now committing
 11. Do a 'git push' to publish your changes online to the
-    master repository
+    public repository
 
 NOTE:
    - Run once 'git config --global core.autocrlf true' on Windows

docs/_config.yml

@@ -3,8 +3,8 @@
 fork: true
 repo_slug: vszakats/hb
 site_slug: vszakats/hb
-repo_branch: master
-site_branch: master
+repo_branch: main
+site_branch: main
 site_root: docs/
 dl_url: https://github.com/vszakats/hb/releases
 short_version: "3.4"

docs/_includes/header.html

@@ -76,7 +76,7 @@
         <a href="https://github.com/{{ site.repo_slug }}/commits">Commits</a>
         <a href="https://github.com/{{ site.repo_slug }}/issues">Report an Issue</a>
 {%- if site.fork %}
-        <a href="https://github.com/vszakats/hb/blob/master/CONTRIBUTING.md">How to contribute</a>
+        <a href="https://github.com/vszakats/hb/blob/main/CONTRIBUTING.md">How to contribute</a>
         <a href="{{ site.baseurl }}/mailing{{ site.ilink_suffix }}">Community</a>
 {%- endif %}
         <hr>

docs/contribs.md

@@ -225,7 +225,7 @@ more) modules.
 
 Regression test framework
 
-## hbtip ([deprecated](https://github.com/vszakats/hb/blob/master/contrib/hbtip/WARNING.txt), use `hbcurl` instead)
+## hbtip ([deprecated](https://github.com/vszakats/hb/blob/main/contrib/hbtip/WARNING.txt), use `hbcurl` instead)
 
 Object-oriented internet protocol library, written in Harbour. Supports HTTP,
 HTTPS, SMTP, SMTPS, POP3, FTP and more.

docs/index.html

@@ -38,7 +38,7 @@ <h1>Why use it?</h1>
     <h1 id="project-status">Project Status</h1>
     <p>
 {%- if site.fork %}
-      <a href="https://ci.appveyor.com/project/vsz/hb/branch/master"><img src="https://ci.appveyor.com/api/projects/status/4rd806hk73q83qo4/branch/master?svg=true" height="20" alt="Build Status"></a>
+      <a href="https://ci.appveyor.com/project/vsz/hb/branch/main"><img src="https://ci.appveyor.com/api/projects/status/4rd806hk73q83qo4/branch/main?svg=true" height="20" alt="Build Status"></a>
 {%- endif %}
       <br>
       Latest stable:&nbsp;

docs/logo.md

@@ -7,8 +7,8 @@ title: "Logo"
 <a href="{{ site.baseurl }}/art/harbour-logo-2016.zip"><img src="{{ site.baseurl }}/images/harbour.svg" alt="icon" height="256"></a>
 
 App icons for
-[Windows](https://raw.githubusercontent.com/vszakats/hb/master/package/harbour.ico) and
-[Apple](https://raw.githubusercontent.com/vszakats/hb/master/package/harbour.icns).<br>
+[Windows](https://raw.githubusercontent.com/vszakats/hb/main/package/harbour.ico) and
+[Apple](https://raw.githubusercontent.com/vszakats/hb/main/package/harbour.icns).<br>
 
 # Former versions
 

package/RELNOTES.md

@@ -13,7 +13,7 @@ Source archives and Windows binaries are available for download:
 * Static and dynamic libraries of `libcurl`, `openssl`, `libssh2`, `nghttp2`
   for 32-bit and 64-bit apps
 * Example and test sources
-* [`getsrc.sh`](https://github.com/vszakats/hb/blob/master/package/getsrc.sh)
+* [`getsrc.sh`](https://github.com/vszakats/hb/blob/main/package/getsrc.sh)
   script to download source code
 * `BUILD*.txt` with build details in Harbour root directory
 

package/mpkg_win.sh

@@ -49,7 +49,7 @@ HB_ABSROOT="${HB_RT}/${HB_DR}"
 
 _BRANCH="${APPVEYOR_REPO_BRANCH}${CI_BUILD_REF_NAME}${GIT_BRANCH}"
 [ -n "${_BRANCH}" ] || _BRANCH="$(git symbolic-ref --short --quiet HEAD)"
-[ -n "${_BRANCH}" ] || _BRANCH='master'
+[ -n "${_BRANCH}" ] || _BRANCH='main'
 [ -n "${CC}" ] || CC="${_BRANCH}"
 [ -n "${HB_CC_TO_RELEASE}" ] || HB_CC_TO_RELEASE="${CC}"
 

package/mpkg_win_ci.sh

@@ -21,7 +21,7 @@ esac
 
 _BRANCH="${APPVEYOR_REPO_BRANCH}${CI_BUILD_REF_NAME}${GIT_BRANCH}"
 [ -n "${_BRANCH}" ] || _BRANCH="$(git symbolic-ref --short --quiet HEAD)"
-[ -n "${_BRANCH}" ] || _BRANCH='master'
+[ -n "${_BRANCH}" ] || _BRANCH='main'
 [ -n "${CC}" ] || CC="${_BRANCH}"
 [ -n "${HB_CC_TO_RELEASE}" ] || HB_CC_TO_RELEASE="${CC}"
 CC4="$(echo "${CC}" | cut -c -4)"
@@ -391,7 +391,7 @@ fi
 
 # documentation
 
-if [ "${_BRANCH#*master*}" != "${_BRANCH}" ] && \
+if [ "${_BRANCH#*main*}" != "${_BRANCH}" ] && \
    [ "${CC}" = "${HB_CC_TO_RELEASE}" ]; then
   "$(dirname "$0")/upd_doc.sh"
 fi

package/mpkg_win_dl.sh

@@ -18,7 +18,7 @@ esac
 
 _BRANCH="${APPVEYOR_REPO_BRANCH}${CI_BUILD_REF_NAME}${GIT_BRANCH}"
 [ -n "${_BRANCH}" ] || _BRANCH="$(git symbolic-ref --short --quiet HEAD)"
-[ -n "${_BRANCH}" ] || _BRANCH='master'
+[ -n "${_BRANCH}" ] || _BRANCH='main'
 [ -n "${CC}" ] || CC="${_BRANCH}"
 CC4="$(echo "${CC}" | cut -c -4)"