diff --git a/Documentation/Association/BudgetOwnersGuide.rst b/Documentation/Association/BudgetOwnersGuide.rst index 8558247..689e1d9 100644 --- a/Documentation/Association/BudgetOwnersGuide.rst +++ b/Documentation/Association/BudgetOwnersGuide.rst @@ -33,10 +33,10 @@ There are two types of budgets: Process ======= -* Budget Idas are discussed by the Budget Committee, publicly by the Community and then rated by the Members via Memberpoll. +* Budget Ideas are discussed by the Budget Committee, publicly by the Community and then rated by the Members via member poll. * The Board decides about the final budget application and then grants the application fully or partly. * The Budget owner will receive a formal budget agreement (via mail). The agreement must be confirmed by answering the mail. -* The Budget will be set up in the `reimbursement tool `__. **The budget is accepted by the Budget owner automatically, once the first reimbursement is done.** +* The Budget will be set up in the `reimbursement tool `__. **The budget is accepted by the Budget owner automatically, once the first reimbursement is done.** .. _budget-owner-application: @@ -60,7 +60,7 @@ Tips for budget planning: ------------------------- * Try to organize sprints. Gather many people at the same time and/or location. -* Announce sprints at typo3.org and social media, to get more people involved. +* Announce sprints at `typo3.community ` and social media, to get more people involved. * Public reports are essential! Write about your work in order to make it visible and entice more people to your team or project. * You are allowed to use your budget to attend events, if you use this event to make your project public and invite people to contribute. * Report early to the Budget Team, if you need less or more budget. @@ -72,7 +72,7 @@ Change a granted budget during the running year If the scope of a budget changes during the project / budget period, the budget owner can apply to adapt the budget. -1. Create an updated dudget application (pdf) and describe the changes of your budget and send it to “budget(at)typo3.org” +1. Create an updated budget application (pdf) and describe the changes of your budget and send it to “budget(at)typo3.org” 2. The BCC will review your demand and decide about your request and inform you. If your request is accepted by the BCC, they will upload the document to “Documents” section of your budget @@ -96,6 +96,6 @@ The TYPO3 Association wants to support the TYPO3 project, TYPO3 CMS and it's com * Budget Ideas must be aligned with our `five goals `__ * We don’t want to freelance people * Invested money, must create a value towards our members. project or product -* Working time in a budget should **not** exeed 50% +* Working time in a budget should **not** exceed 50% * Regular work / tasks should be done by the TYPO3 company * Development of Extensions is not the focus of TYPO3 Association diff --git a/Documentation/Association/PolicyForTeamsAndCommittees.rst b/Documentation/Association/PolicyForTeamsAndCommittees.rst index 5a5dcab..a658e1e 100644 --- a/Documentation/Association/PolicyForTeamsAndCommittees.rst +++ b/Documentation/Association/PolicyForTeamsAndCommittees.rst @@ -47,7 +47,7 @@ Benefits for Official Teams --------------------------- * The leader and any other active team member can receive a typo3.org e-mail address. The address will be retained until the role ends (12 months of no activity in any team). -* A team can maintain a team page at typo3.org. +* A team can maintain a team page at `the typo3.community Teams pages `. * A team member is allowed to call himself “Member of the TYPO3 [team name] Team“ as long as the member is active in the team. * A team can be assigned a budget (funding) by the Association or TYPO3 GmbH. @@ -61,10 +61,10 @@ What is Expected of an Official Team? * The founding of a new team must be announced to the Team Leader Group * To become an official team, a team must have existed for longer than 6 months and fulfill all the requirements. This list makes up the requirements: * A mission statement is required: What are the team’s general tasks, what do we want to achieve, which services do we offer, maintain, or answer for. - * Four reports per year (news article at typo3.org) about what was achieved and what is planned. + * Four reports per year about what was achieved and what is planned. * An annual written report must be given at the General Assembly, containing an overview of the team’s activities during the last 12 months and plans for the coming year. * A clear definition of the team's tasks, responsibilities, and goals. - * The team decides whether or not to allow new members. Entry requirements should exist in writing and be publicly available at typo3.org (community section) . New team members should be brought in based on a fair and equal process. + * The team decides whether or not to allow new members. Entry requirements should exist in writing and be publicly available at `the typo3.community Teams pages `. New team members should be brought in based on a fair and equal process. * The Leader of the Team (or a representative) should attend Team Leader Meeting regularly. * The team defines itself and the roles within it. * In case of a dysfunctional team, any team member can escalate the topic to the TYPO3 Association or the Team Leader Group via an ombudsperson or through an official request to one of the board members.