-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Volunteer landing page reworked #21
Open
comradekingu
wants to merge
4
commits into
FOSDEM:master
Choose a base branch
from
comradekingu:patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,16 +3,16 @@ | |
| <div id="intro"> | ||
| <h2 class="intro"><span>FOSDEM</span><br/>Volunteering</h2> | ||
|
|
||
| <p class="intro">This is a site that brings all the volunteers together. | ||
| Find all the cool tasks that you are interested in.</p> | ||
| <p class="intro">This site brings all volunteers together. | ||
| Find cool tasks you are interested in.</p> | ||
|
|
||
| <p id="xtra-info">Problems? For bugs you can report an issue at | ||
| <a href="https://github.com/FOSDEM/volunteers/issues">Github</a>.</p> | ||
| <p id="xtra-info">Problems? Fix or report bugs as issues at | ||
| <a href="https://github.com/FOSDEM/volunteers/issues">GitHub</a>.</p> | ||
| </div><!-- /intro--> | ||
|
|
||
| <ul class="features"> | ||
| <li><h3>FOSDEM</h3> | ||
| <p><a href="https://www.fosdem.org">FOSDEM</a> is a free event that offers open source | ||
| <p><a href="https://www.fosdem.org">FOSDEM</a> is a gratis event that offers libre software | ||
| communities a place to meet, share ideas and collaborate.</p> | ||
| </li> | ||
|
|
||
|
|
@@ -21,21 +21,21 @@ <h2 class="intro"><span>FOSDEM</span><br/>Volunteering</h2> | |
| </li> | ||
|
|
||
| <li><h3>Volunteering</h3> | ||
| <p>FOSDEM needs you! Every year, the FOSDEM team is assisted by an enthusiastic team of volunteers | ||
| to help out with various tasks and make the event a fun and safe place for all our visitors.</p> | ||
| <p>FOSDEM needs you! Every year. Enthusiastic volunteers assist the FOSDEM team, | ||
| making this fun event also safe for all.</p> | ||
| </li> | ||
| </ul> | ||
|
|
||
| <ul class="features"> | ||
| <li><h3>Mailing List</h3> | ||
| <p>You can subscribe to receive updates from the <a href="https://lists.fosdem.org/listinfo/volunteers">mailing list</a></p> | ||
| <p>You can post a message to all the members, send email to <a href="mailto:[email protected]">[email protected]</a></p> | ||
| <p>Subscribe to receive updates from the <a href="https://lists.fosdem.org/listinfo/volunteers">mailing list</a></p> | ||
| <p>Post a message to all by e-mailing <a href="mailto:[email protected]">[email protected]</a></p> | ||
| </li> | ||
|
|
||
| <li><h3>Chat</h3> | ||
| <p>Real time chat is bridged between matrix and irc: | ||
| <p>Real-time chat is bridged between Matrix and IRC: | ||
| <ul> | ||
| <li><a href='matrix://#fosdem-volunteers:matrix.org'>#fosdem-volunteers</a> on matrix (<a href='https://chat.fosdem.org/#/room/#fosdem-volunteers:matrix.org'>webchat</a>)</li> | ||
| <li><a href='matrix://#fosdem-volunteers:matrix.org'>#fosdem-volunteers</a> on Matrix (<a href='https://chat.fosdem.org/#/room/#fosdem-volunteers:matrix.org'>webchat</a>)</li> | ||
| <li><a href="irc://chat.freenode.net/fosdem-volunteers">#fosdem-volunteers</a> (<a href="http://webchat.freenode.net/?channels=fosdem-volunteers">webchat</a>) on <a href="http://freenode.net/">freenode</a> | ||
| </ul> | ||
| </p> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi! Thanks so much for the patch, we very rarely review this text so it's great to have another pair of eyes on it. Could we just use the language from https://fosdem.org ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather change it in in both places, seeing as that isn't how one writes "Open Source", and the "free" of "free software" is invoked in a different meaning (being gratis) in the sentence just before that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh gosh, changing the front page 😅 . I could bring it up with the staff mailing list but people are pretty busy 2 weeks before the conf and that sentence has likely been there for who knows how many years, so there might be a pretty significant delay and it's not guaranteed to pass.
Pre-empting one argument which will undoubtedly arise, do you think all the international visitors will understand gratis and libre? Gratis maybe, though it's a bit quaint, but libre is used really rarely nowadays outside core FSF communications. People write FOSS if they explicitly want to include both Free and Open Source, or mostly just write the entire phrase.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well it isn't as if anyone spent any effort right there. I can guarantee the current situation is confusing. FOSS makes less than zero sense to me if it is "free and open …". "Libre" is untainted by FSF and OSI communication. I remember the bar door question was "What does FOSDEM stand for?", and there were many blank stares from even seasoned visitors. The connection to the academic term is maybe less important, and a lost cause making for a cool resulting name. Will put in a PR.
Edit: FOSDEM/website#107
For the uninitiated, "libre" means something to do with liberty, whereas FOSS is a non-sequitur.