8 files changed, 45 insertions, 160 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..932de35
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+,*
+/website/site
diff --git a/pages/gnu/gnu-toolchain-fund.txt b/pages/gnu/gnu-toolchain-fund.txt
new file mode 100644
index 0000000..616ac09
--- /dev/null
+++ b/pages/gnu/gnu-toolchain-fund.txt
@@ -0,0 +1,22 @@
+~~NOTOC~~
+<markdown>
+# The GNU Toolchain Fund
+
+The GNU Toolchain fund was created in 2016 to support the GNU Toolchain.
+The fund provides support for community driven strategic toolchain related
+projects including support for the annual GNU Tools Cauldron, and student
+subsidies to attend the event.
+
+The GNU Toolchain fund is a part of the [FSF's Working Together For Free Software Fund.](https://www.fsf.org/working-together/fund)
+
+You can [donate directly to the GNU Toolchain fund.](https://my.fsf.org/civicrm/contribute/transact?reset=1&id=57)
+
+The fund's current trustees are:
+
+  * Joel Brobecker
+  * David Edelsohn
+  * [Carlos O'Donell](people:codonell)
+
+Please feel free to contact any of the trustees to discuss potential projects.
+
+</markdown>
diff --git a/pages/gnu/social-contract-endorsement.txt b/pages/gnu/social-contract-endorsement.txt
index 8681b69..cdf5f27 100644
--- a/pages/gnu/social-contract-endorsement.txt
+++ b/pages/gnu/social-contract-endorsement.txt
@@ -48,14 +48,14 @@ Social Contract, version 1.0:
     [starts](https://lists.gnu.org/archive/html/gnu-misc-discuss/2019-10/threads.html#00055).
   - *January 26th, 2020*.  All 400 GNU maintainers and uploaders
     [emailed with a call for feedback and a
-    timeline](https://wiki.gnu.tools/git/gnu-tools-wiki/tree/code/sc-email.txt).
+    timeline](https://git.gnu.tools/git/gnu-tools-wiki/tree/code/sc-email.txt).
   - *February 10th, 2020*.  End of the previously-announced feedback
     period.  A group of maintainers goes through the feedback received,
     [publishes anonymized feedback and
     resolutions](gnu:gsc-feedback), leading to
     [version 1.0 of the GNU Social
     Contract](gnu:social-contract) (see [commit
-    history](https://wiki.gnu.tools/git/gnu-tools-wiki/commit/?id=678b044fc8d5bacc148b76559bc0e15c5329a391)).
+    history](https://git.gnu.tools/git/gnu-tools-wiki/commit/?id=678b044fc8d5bacc148b76559bc0e15c5329a391)).
   - *February 11th, 2020*.  This page is created.
   - *February 24th, 2020*.  End of endorsement period.
 
diff --git a/pages/gnu/social-contract.txt b/pages/gnu/social-contract.txt
index e663361..e1d89fd 100644
--- a/pages/gnu/social-contract.txt
+++ b/pages/gnu/social-contract.txt
@@ -1,52 +1,3 @@
-~~NOTOC~~
-<markdown>
-# GNU Social Contract 1.0
----
+~~GOTO>https://gnu.tools/en/documents/social-contract/?1~~
 
-These are the core commitments of the GNU Project, which creates and
-distributes a software system that respects users' freedoms.
-
-## The GNU Project respects users' freedoms
-
-The GNU Project provides software that guarantees to all users the
-_Four Essential Freedoms_, without compromise:
-  0. The freedom to run the program as they wish, for any purpose.
-  1. The freedom to study how the program works, and change it so it does
-     their computing as they wish.
-  2. The freedom to redistribute copies so they can help others.
-  3. The freedom to distribute copies of their modified versions to others.
-
-The GNU Project adopts policies that encourage and enable developers
-to actively defend user freedom.  These policies include using
-_copyleft licenses_, designed to ensure that users’ freedoms cannot be
-stripped off, when appropriate.
-
-Besides upholding the Four Essential Freedoms, the GNU Project pays
-attention to new threats to users' freedom, and responds to them as they
-arise.
-
-
-## The GNU Project provides a consistent system
-
-The GNU Project develops an operating system, the _GNU System_, as well as
-a set of applications.  Each software component developed by the GNU Project
-is referred to as a _GNU package_.  GNU package developers work together to
-ensure consistency across packages.
-
-
-## The GNU Project collaborates with the broader free software community
-
-The GNU Project works together with other free software projects to
-advance its goals, and aims to extend the reach of the project beyond
-the GNU System.
-
-
-## The GNU Project welcomes contributions from all and everyone
-
-The GNU Project commits to providing a harassment-free
-experience for all contributors.  It wants to give everyone the
-opportunity of contributing to its efforts on any of the many tasks that
-require work.  It welcomes all contributors, regardless of their gender,
-ethnicity, sexual orientation, level of experience, or any other
-personal characteristics.
-</markdown>
+https://gnu.tools/en/documents/social-contract/
diff --git a/pages/people/codonell.txt b/pages/people/codonell.txt
index a19f676..75404fa 100644
--- a/pages/people/codonell.txt
+++ b/pages/people/codonell.txt
@@ -7,3 +7,14 @@ other parts of the GNU Tooolchain.
 Carlos is a trustee of the GNU Toolchain fund, a fund which
 is part of the FSF's 
 [[https://www.fsf.org/working-together/fund|Working Together For Free Software Fund]].
+
+FSF Copyright Assignment status:
+
+  * GDB - Assigns past and future changes.
+  * GCC - Assigns past and future changes.
+  * GLIBC - Assigns past and future changes.
+  * BINUTILS - Assigns past and future changes.
+
+FSF Copyright Assignment status covered by Red Hat, Inc.:
+
+  * ANY - Assigns past and future changes.
diff --git a/pages/start.txt b/pages/start.txt
index e22e368..a94feb3 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -2,7 +2,7 @@
 
 The wiki is entirely driven by a git backend.
 
-See the [[https://wiki.gnu.tools/git/gnu-tools-wiki|cgit page]] for instructions to clone the wiki contents.
+See the [[https://git.gnu.tools/git/gnu-tools-wiki|cgit page]] for instructions to clone the wiki contents.
 
 To register for the wiki please email <wiki@gnu.tools> and interact with a human. 
 
diff --git a/pages/wiki/admin.txt b/pages/wiki/admin.txt
index 913d92f..7aabc4d 100644
--- a/pages/wiki/admin.txt
+++ b/pages/wiki/admin.txt
@@ -1,22 +1,3 @@
-<markdown>
-# gnu.tools administration
+~~GOTO>https://gnu.tools/en/documents/roles/?1~~
 
-## wiki admin
-
-The current wiki admin is Carlos O'Donell who can be contacted at
-<wiki@gnu.tools> to get access to this wiki through git.
-
-## machine sysadmins
-
-The current sysadmins are Andy Wingo, Carlos O'Donell and Mark
-Wielaard who can be contacted at <sysadmins@gnu.tools> for any other
-technical issues.
-
-## CoC complaint review committee
-
-The current [Code of Conduct](wiki:code-of-conduct) review committee
-are Andreas Enge, Carlos O'Donell, Mark Wielaard, Ludovic Courtès
-and Andy Wingo who can be contacted at <code-of-conduct@gnu.tools>.
-The gnu.tools community currently has only one public space,
-https://wiki.gnu.tools/, covered by the code of conduct.
-</markdown>
+https://gnu.tools/en/documents/roles/
diff --git a/pages/wiki/code-of-conduct.txt b/pages/wiki/code-of-conduct.txt
index 4c7284d..82963e2 100644
--- a/pages/wiki/code-of-conduct.txt
+++ b/pages/wiki/code-of-conduct.txt
@@ -1,86 +1,3 @@
-<markdown>
-# Contributor Covenant Code of Conduct
+~~GOTO>https://gnu.tools/en/documents/code-of-conduct/?1~~
 
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the [community leaders responsible for enforcement](wiki:admin) at <code-of-conduct@gnu.tools>. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.
-</markdown>
+https://gnu.tools/en/documents/code-of-conduct/