Users using the Tequila login are invited to migrate to gitlab.epfl.ch. This instance will close for Tequila users by May 2020.

Commit be658e3e authored by Joachim Desroches's avatar Joachim Desroches

Correct displayed text in a generally grammar nazi way.

parent e8d7eb10
......@@ -2,7 +2,7 @@
<h1>Member administration</h1>
<p>
This is the administration page for committee members. Normal members are redirected on the
This is the administration page for committee members. Normal members are redirected on their
<a href="member/<% session.username %>">member page</a>
after login.
</p>
......@@ -15,23 +15,23 @@
<h2>Subscription management</h2>
<p>
The cashier use the
The cashier can use the
<a href="subscriptions">subscriptions page</a>
to register subscription payment. This automatically calculate the
expiration date of the accounts.
to register subscription payment. This automatically calculates and stores
the new expiration date of the accounts.
</p>
<p>
As stated on the member page, an account expire the 1st March of a given year
unless the subscription has been payed after the 1st October of the previous
year.
As stated on the member page, an account expires the 1st March of a given
year unless the subscription has been payed after the 1st October of the
previous year.
</p>
<h2>New member</h2>
<p>
Any committee member (but in preference the cashier) can
Any committee member (but preferredly the cashier) can
<a href="new_member">create an account</a>
for a new member. The account must be created when (or after) the new
member payed his subscription.
member has payed his subscription.
</p>
<h2>Members</h2>
......@@ -49,14 +49,14 @@
<h2>Access rights</h2>
<p>
The IT responsible manages the right to login and use sudo on specific hosts
by adding or removing account names from the LDAP groups
hostname-login and hostname-sudoers.
The IT manager controls the right to login and use sudo on specific hosts by
adding or removing account names from the LDAP groups `hostname`-login and
`hostname`-sudoers.
</p>
<p>
He can perform those operations by using <code>shelldap</code> or
<code>ldapmodify</code>. In case he is fed up with those tool he could add a
page to this webapp to simplify the operation.
He/She can perform those operations by using <code>shelldap</code> or
<code>ldapmodify</code>. In case s/he is fed up with these tools he could add
a page to this webapp to simplify the operation.
</p>
<p>
It is possible to create a link that would enable an user to reset his password from <a href="passwords">this page</a>
......@@ -67,7 +67,7 @@
<a href="member/<% session.username %>">My member page</a>
</p>
<p>
Authorized persons may use the member page of someone else by editing the
username in the URL. It may be useful if something goes wrong; however the members are
supposed to change their respective information by themselves.
Authorized people may use the member page of someone else by editing the
username in the URL. It may be useful if something goes wrong; however the
members are supposed to change their respective information by themselves.
</p>
......@@ -2,9 +2,9 @@
<form method="POST">
<p>
If you have trouble login in, please contact the
If you have trouble logging in, please contact the
<a href="https://gnugeneration.epfl.ch/association/accueil#comite">
IT responsible
IT manager
</a>.
</p>
<table class="firstalignright">
......
......@@ -7,7 +7,7 @@
<% end %>
<p>
<% members.size %> entrie<% if members.size > 1 %>s<% end %>
<% members.size %> entr<% if members.size > 1 %>ies<% else %>y<% end %>
in the list.
</p>
......
......@@ -35,7 +35,7 @@
<input type="text" name="username" value="<% username %>"/>
<p class="description">
The username must match the gaspar username otherwise some of our
services won't work (or worse someone else might be able to access
services won't work (or worse, someone else might be able to access
your data).
</p>
</td>
......@@ -69,10 +69,9 @@
<td>
<input type="text" name="mobile" value="<% mobile %>"/>
<p class="description">
Your phone number can only be viewed by committee member.
This allows you to be contacted in case of emergency.
You must specify the full number, including country code. Example:
+41791234567
Your phone number can only be viewed by a committee member. This
allows you to be contacted in case of emergency. You must specify
the full number, including country code. Example: +41791234567
</p>
</td>
</tr>
......
......@@ -2,12 +2,12 @@
<form method="POST">
<p>
You can set a new password for <em><% username %></em> usign the form bellow.
You can set a new password for <em><% username %></em> using the form below.
</p>
<p>
If you have trouble setting your password, please contact the
<a href="https://gnugeneration.epfl.ch/association/accueil#comite">
IT responsible
IT manager
</a>.
</p>
<table class="firstalignright">
......
......@@ -3,7 +3,7 @@ Hello new member,
You can set your password using the link bellow:
<% password_link %>
Then, if you haven't done it already after setting you password, read and
Then, if you haven't done it already, after setting your password, read and
indicate whether you accept the documents concerning the use of IT resources at
EPFL and the use of GNU Generation services:
<% member_link %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment