diff --git a/docs/1.0-dev/.buildinfo b/docs/1.0-dev/.buildinfo index dae70bbdd9..05faceca31 100644 --- a/docs/1.0-dev/.buildinfo +++ b/docs/1.0-dev/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 9f788ce2f814f82df393217eb5d928d5 +config: 030a87eef1a6f87dd60b89c7f0bd5880 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/1.0-dev/Coding/Changelog.html b/docs/1.0-dev/Coding/Changelog.html index 8a52fde046..556939a0be 100644 --- a/docs/1.0-dev/Coding/Changelog.html +++ b/docs/1.0-dev/Coding/Changelog.html @@ -164,10 +164,9 @@
-+Not released yet -2019-2022 develop branch (WIP)
-
2019-2022 develop branch
+Changed to using main branch to follow github standard. Old master branch remains
+for now but will not be used anymore, so as to not break installs during transition.
Increase requirements: Django 4.1+, Twisted 22.10+ Python 3.10, 3.11. PostgreSQL 11+.
New drop:holds() lock default to limit dropping nonsensical things. Access check
diff --git a/docs/1.0-dev/Coding/Version-Control.html b/docs/1.0-dev/Coding/Version-Control.html
index be88ffd9e9..c6cb42f724 100644
--- a/docs/1.0-dev/Coding/Version-Control.html
+++ b/docs/1.0-dev/Coding/Version-Control.html
@@ -257,7 +257,7 @@ git ls # log with pretty formatting
git branch, checkout and merge¶Git allows you to work with branches. These are separate development paths your code may take, completely separate from each other. You can later merge the code from a branch back into another branch. Evennia’s master and develop branches are examples of this.
Git allows you to work with branches. These are separate development paths your code may take, completely separate from each other. You can later merge the code from a branch back into another branch. Evennia’s main and develop branches are examples of this.
git branch -b branchaname
So far your code is only located on your private machine. A good idea is to back it up online. The easiest way to do this is to git push it to your own remote repository on GitHub. So for this you need a (free) Github account.
If you don’t want your code to be publicly visible, Github also allows you set up a private repository, only visible to you.
-Note
-Github’s defaults have changed to calling the primary branch ‘main’ rather than ‘master’. While Evennia still uses ‘master’ branch (and this is what we refer to below), you can use either name for your personal primary branch - they are equivalent.
-Create a new, empty repository on Github. Github explains how here . Don’t allow it to add a README, license etc, that will just clash with what we upload later.