This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit c42d67903efc1ca7cfb5ac56fa1b7edc89e2a070
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Mon Apr 10 18:59:36 2017 +0200
Updating README files
Modify statement about FY18 budget
Fix header coding
---
FY15/README.adoc | 3 +--
FY16/README.adoc | 3 +--
FY17/README.adoc | 18 ++++++------------
FY18/README.adoc | 22 ++++++++--------------
4 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/FY15/README.adoc b/FY15/README.adoc
index b1a5125..6e8ea4a 100644
--- a/FY15/README.adoc
+++ b/FY15/README.adoc
@@ -1,4 +1,3 @@
-FY15 Archive Data
-=================
+= FY15 Archive Data
Fiscal Year 2015 is from before the new ledger system was implemented. There are archive
files from that year available in the
link:https://pagure.io/fedora-budget/blob/master/f/FY15[FY 15 Folder] of the
link:https://pagure.io/fedora-budget/[Budget Pagure Repository].
diff --git a/FY16/README.adoc b/FY16/README.adoc
index 03bde23..cb223d9 100644
--- a/FY16/README.adoc
+++ b/FY16/README.adoc
@@ -1,4 +1,3 @@
-FY16 Archive Data
-=================
+= FY16 Archive Data
Fiscal Year 2016 is from before the new ledger system was implemented. There are archive
files from that year available in the
link:https://pagure.io/fedora-budget/blob/master/f/FY16[FY 16 Folder] of the
link:https://pagure.io/fedora-budget/[Budget Pagure Repository].
diff --git a/FY17/README.adoc b/FY17/README.adoc
index f744952..446d979 100644
--- a/FY17/README.adoc
+++ b/FY17/README.adoc
@@ -1,5 +1,4 @@
-FY17 Budget Data
-================
+= FY17 Budget Data
Fiscal Year 2017 was the first year where the new
link:http://ledger-cli.org/[ledger
accounting tool] was used. The conversion occurred near the end of Quarter 3. Data was
converted as best as was possible from the existing records.
@@ -7,39 +6,34 @@ Any files from before the new ledger system was implemented, available
in the li
This year has closed and these numbers are as close to final as we will get.
-Personnel
-=========
+== Personnel
include::FY17/people.adoc[]
During FY17, the following people worked on the budget team.
-APAC Region
------------
+=== APAC Region
- Treasurer: mailto:{apac_treasurer_email}[{apac_treasurer_name}]
- Logitistican: mailto:{apac_logistician_email}[{apac_logistician_name}]
- Story Teller: mailto:{apac_storyteller_email}[{apac_storyteller_name}]
- Card Holder: mailto:{apac_cc_email}[{apac_cc_name}]
-EMEA Region
------------
+=== EMEA Region
- Treasurer: mailto:{emea_treasurer_email}[{emea_treasurer_name}]
- Logitistican: mailto:{emea_logistician_email}[{emea_logistician_name}]
- Story Teller: mailto:{emea_storyteller_email}[{emea_storyteller_name}]
- Card Holder: mailto:{emea_cc_email}[{emea_cc_name}]
-LATAM Region
-------------
+=== LATAM Region
- Treasurer: mailto:{latam_treasurer_email}[{latam_treasurer_name}]
- Logitistican: mailto:{latam_logistician_email}[{latam_logistician_name}]
- Story Teller: mailto:{latam_storyteller_email}[{latam_storyteller_name}]
- Card Holder: mailto:{latam_cc_email}[{latam_cc_name}]
-NA Region
----------
+=== NA Region
- Treasurer: mailto:{na_treasurer_email}[{na_treasurer_name}]
- Logitistican: mailto:{na_logistician_email}[{na_logistician_name}]
diff --git a/FY18/README.adoc b/FY18/README.adoc
index 5ca4bb7..fd98fe4 100644
--- a/FY18/README.adoc
+++ b/FY18/README.adoc
@@ -1,45 +1,39 @@
-FY18 Budget Data
-================
+= FY18 Budget Data
-The 2017/2018 Fiscal Year runs from 1 March 2017 to 28 February 2018. The Fiscal year
has started however a final budget is not yet available.
+The 2017/2018 Fiscal Year runs from 1 March 2017 to 28 February 2018.
-On 1 March 2017 the Fedora Council authorized a temporary spending budget for the
Ambassador regions. Regions are authorized to spend up to 10% of their FY17 budgets.
Additional spending requires approval from the Fedora Council. Details can be found in
the
link:https://lists.fedoraproject.org/archives/list/ambassadors@lists.fedo....
+On 10 April 2017 the Fedora Council authorized some
link:https://lists.fedoraproject.org/archives/list/council-discuss@lists....
1 budgets] . These replaced the previously authorized
link:https://lists.fedoraproject.org/archives/list/ambassadors@lists.fedo...
spending budget] for the Ambassador regions. Additional spending requires approval from
the Fedora Council.
This year is in progress and is the current year.
-Personnel
-=========
+== Personnel
include::FY18/people.adoc[]
During FY18, the following people are working on the budget team.
-APAC Region
------------
+=== APAC Region
- Treasurer: mailto:{apac_treasurer_email}[{apac_treasurer_name}]
- Logitistican: mailto:{apac_logistician_email}[{apac_logistician_name}]
- Story Teller: mailto:{apac_storyteller_email}[{apac_storyteller_name}]
- Card Holder: mailto:{apac_cc_email}[{apac_cc_name}]
-EMEA Region
------------
+=== EMEA Region
- Treasurer: mailto:{emea_treasurer_email}[{emea_treasurer_name}]
- Logitistican: mailto:{emea_logistician_email}[{emea_logistician_name}]
- Story Teller: mailto:{emea_storyteller_email}[{emea_storyteller_name}]
- Card Holder: mailto:{emea_cc_email}[{emea_cc_name}]
-LATAM Region
-------------
+=== LATAM Region
- Treasurer: mailto:{latam_treasurer_email}[{latam_treasurer_name}]
- Logitistican: mailto:{latam_logistician_email}[{latam_logistician_name}]
- Story Teller: mailto:{latam_storyteller_email}[{latam_storyteller_name}]
- Card Holder: mailto:{latam_cc_email}[{latam_cc_name}]
-NA Region
----------
+=== NA Region
- Treasurer: mailto:{na_treasurer_email}[{na_treasurer_name}]
- Logitistican: mailto:{na_logistician_email}[{na_logistician_name}]
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.