Merge branch 'master' into self-hosted

philwareham · philwareham · commit 82207374bb64 · 2021-02-16T21:09:53.000Z
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -56,7 +56,7 @@ <h4 class="accessibility">Host details</h4>
             <a href="https://textpattern.com/contact">Contact us</a>.
             <a href="https://textpattern.com/privacy">Privacy</a>.
             <a rel="external" href="https://textpattern.com/humans.txt">Colophon</a>.
-            Textpattern is both free and open source. <a rel="external" href="https://github.com/textpattern/textpattern.github.io/blob/master/LICENSE.txt">GPLv2 license</a>.
+            Textpattern is both free and open source. <a rel="external" href="https://textpattern.com/license">GPLv2 license</a>.
         </p>
     </footer>
 </div>
diff --git a/administration/diagnostics-panel.md b/administration/diagnostics-panel.md
@@ -101,7 +101,7 @@ Active plugins
 Admin-side theme
 : The name and version number of the active administration side theme. The default is 'Hive'.
 
-The installation and server data is followed by the contents of your `.htaccess` file (from the installation directory). For purposes here we show the [file contents from the current version code](https://github.com/textpattern/textpattern/blob/master/.htaccess) below:
+The installation and server data is followed by the contents of your `.htaccess` file (from the installation directory). For purposes here we show the [file contents from the current version code](https://github.com/textpattern/textpattern/blob/main/.htaccess) below:
 
 ~~~ apacheconf
 # BEGIN Textpattern
diff --git a/development/contributing.md b/development/contributing.md
@@ -18,7 +18,7 @@ Anyone can contribute. You do not have to ask for permission.
 
 ### Help with translations
 
-To make corrections to existing translations, or to add new ones, [please follow these instructions](https://github.com/textpattern/textpacks/blob/master/README.md).
+To make corrections to existing translations, or to add new ones, [please follow these instructions](https://github.com/textpattern/textpacks/blob/main/README.md).
 
 ### Write documentation
 
@@ -28,7 +28,7 @@ The page you're reading now is part of the documentation project. Spot any error
 
 Core developers and project maintainers accept Pull Requests. The [main code repository](https://github.com/textpattern/textpattern) uses [Git](https://www.sitepoint.com/git-for-beginners/) for its version control and is split into at least three branches:
 
-* `master`: for stable releases only. Core devs only ever merge production-ready code here at release time.
+* `main`: for stable releases only. Core devs only ever merge production-ready code here at release time.
 * `maint-x.y.z`: for patching the most recent stable release.
 * `dev`: for development of the next major version.
 
@@ -86,7 +86,7 @@ Sure, we break our own rules sometimes. But, as a rule, we err on the side of si
 
 ## License
 
-[GNU General Public License, version 2](https://github.com/textpattern/textpattern/blob/master/LICENSE.txt). By contributing to the project, you agree to license your additions under the GPLv2 license.
+[GNU General Public License, version 2](https://github.com/textpattern/textpattern/blob/main/LICENSE.txt). By contributing to the project, you agree to license your additions under the GPLv2 license.
 
 ## Code of conduct
 
diff --git a/development/index.md b/development/index.md
@@ -342,7 +342,7 @@ Additional third-party reading you may find insightful. The information may be o
 
 [^2]: There's also the [Admin-side events and steps](/development/admin-side-events-and-steps) listing for admin-side plugins specifically. This would correspond with the various [admin-side callbacks](/development/core-callbacks-reference#admin-side-callbacks) in the **Core callbacks reference**, but it doesn't provide the explanatory details like the callbacks reference does.
 
-[^3]: As you learn about functions, be aware of the helper functions found in the [/lib](https://github.com/textpattern/textpattern/tree/master/textpattern/lib) folder. Some examples: The [txplib_db.php](https://github.com/textpattern/textpattern/blob/master/textpattern/lib/txplib_db.php) file for interacting with the Textpattern database; [txplib_forms.php](https://github.com/textpattern/textpattern/blob/master/textpattern/lib/txplib_forms.php) to help build different HTML form controls; [txplib_html.php](https://github.com/textpattern/textpattern/blob/master/textpattern/lib/txplib_html.php) to help build various other types of HTML elements; and [txplib_misc.php](https://github.com/textpattern/textpattern/blob/master/textpattern/lib/txplib_misc.php) to help build various 'miscellaneous' functions.
+[^3]: As you learn about functions, be aware of the helper functions found in the [/lib](https://github.com/textpattern/textpattern/tree/main/textpattern/lib) folder. Some examples: The [txplib_db.php](https://github.com/textpattern/textpattern/blob/main/textpattern/lib/txplib_db.php) file for interacting with the Textpattern database; [txplib_forms.php](https://github.com/textpattern/textpattern/blob/main/textpattern/lib/txplib_forms.php) to help build different HTML form controls; [txplib_html.php](https://github.com/textpattern/textpattern/blob/main/textpattern/lib/txplib_html.php) to help build various other types of HTML elements; and [txplib_misc.php](https://github.com/textpattern/textpattern/blob/main/textpattern/lib/txplib_misc.php) to help build various 'miscellaneous' functions.
 
 [^4]: Another function, `pluggable_ui()`, was introduced in 2009, which provides additional event/step hooks for the admin-side panels. But this is for the advanced Textpattern user and developer, not the beginner. This function is not needed 99.9% of the time. See [The pluggable_ui function](/development/the-pluggable-ui-function) page for more.
 
diff --git a/development/textpattern-source-code-repositories.md b/development/textpattern-source-code-repositories.md
@@ -21,7 +21,7 @@ The current stable release, the latest bleeding-edge development code, and the o
 
 ### Production release
 
-The production release - or *latest stable release* - is for the average user who wants the most secure version of Textpattern available. They are terminal branches (or 'snapshots') from the master repo at particular development milestones. When new production releases are available, the previous release becomes obsolete in terms of developer support, so always update your Textpattern installations to the latest stable release when they're available.
+The production release - or *latest stable release* - is for the average user who wants the most secure version of Textpattern available. They are terminal branches (or 'snapshots') from the main repo at particular development milestones. When new production releases are available, the previous release becomes obsolete in terms of developer support, so always update your Textpattern installations to the latest stable release when they're available.
 
 * [Zip file download](https://textpattern.com/latest.zip) (an immediate .zip package download from textpattern.com, no messing around)
 * [Zip package options](https://textpattern.com/start) (choose either `.zip` or `.tar.gz`, as you prefer)
@@ -52,7 +52,7 @@ Where any of the `.zip` and `.tar.gz` packages are concerned, you won't need to
 
 When working with a repo in GitHub, you need to decide if you're going to *clone* it or *fork* it:
 
-**Clone:** When cloning a repo, you've made the decision to contribute back to the dev repo branch, or whatever repo you may have cloned from. Cloning puts a copy of the repo on your local drive, where you can work on code (or copy, like this page, for example) on your own time and at your own pace. When ready to share back, you make a *pull request*, which is basically a request to the branch manager to merge your edits to the master repo's code. The branch manager can choose not to if your code is sketchy, but generally the intent is to collaborate harmoniously toward the good of all things.
+**Clone:** When cloning a repo, you've made the decision to contribute back to the dev repo branch, or whatever repo you may have cloned from. Cloning puts a copy of the repo on your local drive, where you can work on code (or copy, like this page, for example) on your own time and at your own pace. When ready to share back, you make a *pull request*, which is basically a request to the branch manager to merge your edits to the main repo's code. The branch manager can choose not to if your code is sketchy, but generally the intent is to collaborate harmoniously toward the good of all things.
 
 **Fork:** When forking a repo, you've essentially made the decision to run rogue with the code. You can change code however you want, but it won't get merged back to the repo you forked from. You're on your own.
 
diff --git a/installation/index.md b/installation/index.md
@@ -8,7 +8,7 @@ description: These are detailed instructions for installing Textpattern.
 
 # Installing Textpattern
 
-These are detailed instructions for installing Textpattern. The instructions follow a process of using an (S)FTP application, which you presumably have ([Transmit](https://www.panic.com/transmit/) is a popular choice for Mac, and [WinSCP](https://winscp.net/eng/index.php/) is for Windows). If you're familiar with installing CMS software and prefer the quick notes, see the [README.txt](https://github.com/textpattern/textpattern/blob/master/README.txt) file that's included in the install package. If you're more of a command line jockey, the bits in [working with the development branch](/development/textpattern-source-code-repositories) should suit you.
+These are detailed instructions for installing Textpattern. The instructions follow a process of using an (S)FTP application, which you presumably have ([Transmit](https://www.panic.com/transmit/) is a popular choice for Mac, and [WinSCP](https://winscp.net/eng/index.php/) is for Windows). If you're familiar with installing CMS software and prefer the quick notes, see the [README.txt](https://github.com/textpattern/textpattern/blob/main/README.txt) file that's included in the install package. If you're more of a command line jockey, the bits in [working with the development branch](/development/textpattern-source-code-repositories) should suit you.
 
 On this page:
 
diff --git a/setup/troubleshooting-diagnostics.md b/setup/troubleshooting-diagnostics.md
@@ -223,7 +223,7 @@ Active plugins
 Admin-side theme
 : The name and version number of the active administration side theme. The default is 'Hive'.
 
-The installation and server data is followed by the contents of your .htaccess file (from the installation directory). For purposes here we show the [file contents from the current version code](https://github.com/textpattern/textpattern/blob/master/.htaccess) below:
+The installation and server data is followed by the contents of your .htaccess file (from the installation directory). For purposes here we show the [file contents from the current version code](https://github.com/textpattern/textpattern/blob/main/.htaccess) below:
 
 ~~~ apacheconf
 # BEGIN Textpattern
diff --git a/tags/text.md b/tags/text.md
@@ -23,7 +23,7 @@ tags:
 
 The **text** tag is a *single* tag which is primarily used to return localized language strings from the `txp_lang` database table.
 
-Note: only language strings designated with a type of [`common`](https://github.com/textpattern/textpacks/blob/master/lang/en.ini#L265) or [`public`](https://github.com/textpattern/textpacks/blob/master/lang/en.ini#L776) are available to use. All other language string types are reserved for use within the Textpattern system itself.
+Note: only language strings designated with a type of [`common`](https://github.com/textpattern/textpacks/blob/main/lang/en.ini#L265) or [`public`](https://github.com/textpattern/textpacks/blob/main/lang/en.ini#L776) are available to use. All other language string types are reserved for use within the Textpattern system itself.
 {: .alert-block .information}
 
 ## Attributes
