diff options
Diffstat (limited to 'templates/main/info/jams.html')
| -rw-r--r-- | templates/main/info/jams.html | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/templates/main/info/jams.html b/templates/main/info/jams.html index f4de813c..8abc5d8f 100644 --- a/templates/main/info/jams.html +++ b/templates/main/info/jams.html @@ -18,9 +18,9 @@ </p> <p> - Every two months or so, we aim to host a server-wide code jam, suitable for all members of the server. In + Every three months or so, we aim to host a server-wide code jam, suitable for all members of the server. In these, we announce a theme and date in advance, and users may sign up via a link provided in the - announcements channel on the server. Once the sign-up period is over, users are paired off into + announcements channel on the server. Once the sign-up period is over, users are grouped into teams. On the day of the code jam, we announce a task - each team will then work on a solution to this task. </p> @@ -49,22 +49,23 @@ <ul> <li> Projects must be strongly Python-oriented. + <ul> <li>You may mix in other languages, but the project must be Python-based.</li> </ul> </li> <li>You may not write any code in advance.</li> <li>You may not write any code after the deadline.</li> - <li>Both team members must contribute to the project in some way.</li> <li>The work must be your own - don't copy another team's work.</li> </ul> <p> Additionally, the following suggestions could be helpful for all teams. </p> <ul> + <li>All team members should contribute to the project in some way. Work together!</li> <li>Open your pull request early - that way, you know it'll be there by the deadline.</li> <li>Lint your code - we lint each pull request using Flake8, and your code should validate.</li> - <li>Communicate with your teammate - Add them as a friend, start a DM, and work together on the problem.</li> + <li>Communicate with your teammates - Add them as a friend, start a group DM, and work together on the problem.</li> </ul> <h2 class="uk-article-title hover-title" id="getting-started"> @@ -86,7 +87,7 @@ <p> Once the challenge task has been announced, head to the link provided to reach the challenge repository. In order to work on the task, you will need to fork the repository - this will create a copy of the - repository under your account, which you will be able to work on with your teammate. To do so, + repository under your account, which you will be able to work on with your teammates. To do so, log into GitHub and click on the "Fork" button on the repository page. Select your username from the dialogue, and it will be forked to your account. </p> @@ -96,9 +97,9 @@ </figure> <p> Once this has been done, you should find yourself looking at your new copy of the repository. Next - up, you'll need to give your teammate access to it! Click on the "Settings" tab, click on - "Collaborators", enter your password if you're prompted for it, and add your teammate as a - collaborator. + up, you'll need to give your teammates access to it! Click on the "Settings" tab, click on + "Collaborators", enter your password if you're prompted for it, and add your teammates as + collaborators. </p> <figure> <img src="{{ static_file('images/jams/jams_3.png') }}" class="uk-align-center uk-border-rounded" /> @@ -110,7 +111,7 @@ install Git using your system's package manager. Windows users can install <a href="https://git-scm.com/download/win">Git for Windows</a>, and Mac users can install Git using <a href="https://brew.sh">Homebrew</a>. Once you're all installed, open up a terminal - (or open Git Bash if you're on Windows). For the purpose of illustration, we will be working on + (or open Git Bash if you're on Windows). For the purpose of illustration we will be working on Windows, but this will work on any platform. </p> <p> |