From 798d32c3827cb2d3a3045752b5e4f40ad29ea354 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 23 Sep 2017 12:52:56 +0200 Subject: [PATCH 1/2] Fix docstring on default port in launcher --- evennia/server/evennia_launcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index b72dd5c8c0..9ccf664410 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -95,7 +95,7 @@ CREATED_NEW_GAMEDIR = \ Make sure to create a superuser when asked for it (the email can be blank if you want). You should now be able to (by default) connect to your server on 'localhost', port 4000 using a - telnet/mud client or http://localhost:8000 using your web browser. + telnet/mud client or http://localhost:4001 using your web browser. If things don't work, check so those ports are open. """ From f13c7a9c7e63cb8b48b22b15e8e4f51350122985 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 23 Sep 2017 14:26:37 +0200 Subject: [PATCH 2/2] Update github contribute instructions for new branch layout --- .github/CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 353140b4d7..a4d41c6bbf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -19,6 +19,10 @@ happens to be named "command"! A PR allows you to request that your custom fixes/additions/changes be pulled into the main Evennia repository. To make a PR you must first [fork Evennia on GitHub][8]. Read the [Contribution][3] page for more help. +If you are working to solve an Issue in the issue tracker, note which branch you should make the PR +against (`master` or `develop`). If you are making a PR for a new feature or contrib, do so against +the `develop' branch. + - All contributions should abide by Evennia's [style guide](https://github.com/evennia/evennia/blob/master/CODING_STYLE.md). - For your own sanity and ours, separate unrelated contributions into their own branches and make a new PR for each. You can still update the branch after the PR is up - the PR will update automatically.