Skip to content

Commit

Permalink
Mention Git instead of SVN
Browse files Browse the repository at this point in the history
  • Loading branch information
Olav Vitters committed Jul 18, 2009
1 parent a33c726 commit eb43f06
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/FIELDS
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Conventional modules to hold maintainers:

LDAP Name Maintainership
----------------------------------------------
any_module SVN Maintainer of gnome module
any_module Git Maintainer of gnome module
translation_language Language coordinator of an GTP language
mango_ftp_access Maintainer for ftp management
mango_web_access Maintainer for web management
Expand Down
4 changes: 2 additions & 2 deletions templates/maintainer_approval.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ IMPORTANT NOTE:
1. When rejecting accounts, please email an explanation to the person
requesting the account.
2. Approving above account request means you are responsible for whatever
this person does on GNOME SVN. This sounds worse than it is in practice,
this person does on GNOME Git. This sounds worse than it is in practice,
but do try to follow the initial commits and guide the person in the
beginning.
3. Although Mango verified that this request came from the email address
Expand All @@ -48,7 +48,7 @@ account in the name of someone else.

ABOUT THE PROCESS:
A request could need the approval of multiple persons. For example, if
an account is requested for the SVN module gtk+ and for Bugzilla shell
an account is requested for the Git module gtk+ and for Bugzilla shell
access, it will require two approvals. After all required approvals have
been given, the request will be forwarded to the GNOME Accounts team.

Expand Down
22 changes: 10 additions & 12 deletions templates/user_instructions.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
test="boolean(change[@id='joined-group' and @cn='gnomecvs']) or
(boolean(change[@id='newuser']) and
boolean(user/group[@cn='gnomecvs']))"><xsl:call-template
name="svnintro"/></xsl:if><xsl:if
name="vcsintro"/></xsl:if><xsl:if
test="boolean(change[@id='joined-group' and @cn='ftpadmin']) or
(boolean(change[@id='newuser']) and
boolean(user/group[@cn='ftpadmin']))"><xsl:call-template
Expand All @@ -33,30 +33,28 @@ For any other issues, please contact '[email protected]'.
--
The GNOME Accounts Team
&lt;[email protected]&gt;</xsl:if>
</xsl:template><xsl:template name="svnintro">
Your GNOME SVN account will be ready for use in about 1 hour.
</xsl:template><xsl:template name="vcsintro">
Your GNOME Git account will be ready for use in about 1 hour.

Please make sure you have read for information and guidelines about how
to use your SSH key.

http://sysadmin.gnome.org/users/security.html

For information on using GNOME SVN, please see:
For information on using GNOME Git, please see:

http://developer.gnome.org/tools/svn.html
http://live.gnome.org/SubversionFAQ
http://live.gnome.org/Subversion
http://live.gnome.org/Git

When working on modules in SVN, please be sure you have read and
understood the README.svn or HACKING files if they exist. If they do not
When working on modules in Git, please be sure you have read and
understood the README.git or HACKING files if they exist. If they do not
exist, send submit patches in Bugzilla first and contact the module
maintainer(s) with the relevant ticket numbers to get approval before
committing.

An '<xsl:value-of select="user/uid"/>@svn.gnome.org' e-mail alias has been set up to forward e-mail
An '<xsl:value-of select="user/uid"/>@src.gnome.org' e-mail alias has been set up to forward e-mail
to your '<xsl:value-of select="user/mail"/>' address. Similar aliases exist for everyone with
SVN access. We recommend that you use these aliases in ChangeLog entries
and/or SVN commit log messages.
Git access. We recommend that you use these aliases in ChangeLog entries
and/or Git commit log messages.
</xsl:template><xsl:template name="plug-foundation">
You might also want to become a member of the GNOME Foundation. For more
information on the GNOME Foundation, see:
Expand Down
4 changes: 2 additions & 2 deletions www/new_account.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<xsl:attribute name="checked"/>
</xsl:if>
</input>
<label for="gnomecvs">Access to Subversion</label>
<label for="gnomecvs">Access to Git</label>
</div>
<div>
<input onclick="on_ability_click()" type="checkbox" name="ftpadmin" id="ftpadmin">
Expand Down Expand Up @@ -188,7 +188,7 @@
Vouchers
</th>
<td>
For GNOME SVN and the ability to install new modules,
For GNOME Git and the ability to install new modules,
please select who can vouch for you:
<div><label for="vouch_dev">GNOME module: </label>
<select name="vouch_dev" id="vouch_dev">
Expand Down
2 changes: 1 addition & 1 deletion www/new_user.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<xsl:attribute name="checked"/>
</xsl:if>
</input>
<label for="group-gnomecvs">SVN account</label>
<label for="group-gnomecvs">Git account</label>
</div>
<div>
<input type="checkbox" name="group-ftpadmin" id="group-ftpadmin">
Expand Down
2 changes: 1 addition & 1 deletion www/update_user.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<xsl:attribute name="checked"/>
</xsl:if>
</input>
<label for="group-gnomecvs">SVN account</label>
<label for="group-gnomecvs">Git account</label>
</div>
<div>
<input type="checkbox" name="group-ftpadmin" id="group-ftpadmin">
Expand Down

0 comments on commit eb43f06

Please sign in to comment.