Re: Proofreading DebConf fundraising material
victory wrote:
> Justin B Rye wrote:
>> I can check them out, but (unsurprisingly) it doesn't let me do a "git
>> push", and I don't understand git well enough to extract a diff, so
>> I'll just have to attach my modified version of brochure.en.tex.
>
> * suggests using gitk or something like that;
> * you can use GUI select commits and compare them in its history-window
> * it can also write a commit to a file
> * all you may need to remember is "git reset --hard [branch]"
> which reverts all changes in all version-controlled files
> (not-version-controlled files are kept as is)
Gitk *shows* the diff, but I don't see how to save it out to a file.
Still, at least it tells me that the branch is called "master" - okay;
so I can go back to the commandline and try
git reset --hard master
But no, it just replies:
HEAD is now at af448d8 mostly s/isation/ization/
and "git diff" still gives me nothing.
> * you can also use other VCS locally, to which you are familiar
> * you can also use tools like cgit or gitweb
As ever, xkcd 1597 is the best solution. Diff attached!
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
diff --git a/fundraising/brochure/brochure.en.tex b/fundraising/brochure/brochure.en.tex
index cfac45f..ac03771 100644
--- a/fundraising/brochure/brochure.en.tex
+++ b/fundraising/brochure/brochure.en.tex
@@ -248,7 +248,7 @@ opportunities for DebConf17. We are also standing by at
\end{titlepage}
\newpage
-\section{Hello from the organisers!}
+\section{Hello from the organizers!}
Thank you for your interest in DebConf, the annual conference of the Debian
Project!
@@ -264,10 +264,10 @@ our participants and in the media. On page \pageref{benefits}, we describe
the benefits associated with each of these levels, as well as giving
a few ideas about the additional exposure that's possible through sponsoring
individual components of our conference, including the possibility of
-advertising your job openings and engaging in direct dialogue with our
+advertizing your job openings and engaging in direct dialogue with our
participants.
-DebConf is organised on a non-profit basis, and all the organisers work as volunteers without
+DebConf is organized on a non-profit basis, and all the organizers work as volunteers without
compensation. Your contribution makes it possible for us to bring together
a large number of Debian contributors from all over the globe to work
together, help each other, learn from each other, and forge friendships that
@@ -329,7 +329,7 @@ spare time. Outside of DebConf, most communication takes place on the Internet
in mailing-lists and IRC chat-rooms.
Unlike all other Linux distributions of similar size, \textbf{Debian is an
-independent non-profit organisation} not under the influence of a commercial
+independent non-profit organization} not under the influence of a commercial
entity. Debian's dedication to Free Software, its non-profit nature, and its
open development model make it unique among Free Software distributions.
@@ -340,14 +340,14 @@ a preferred choice for derivative works. Currently, \textbf{over 120 actively
developed operating systems build on Debian},
% http://distrowatch.com/search.php?ostype=All&category=All&origin=All&basedon=Debian¬basedon=None&desktop=All&architecture=All&status=Active
including the widely popular Ubuntu and Linux Mint distributions, LiMuX, and
-Knoppix. More specialised derivatives range from grml (optimised for system
-administrators) to Tails (optimised for privacy). Debian runs in hundreds of
+Knoppix. More specialized derivatives range from grml (optimized for system
+administrators) to Tails (optimized for privacy). Debian runs in hundreds of
schools thanks to SkoleLinux, powers gaming platforms with SteamOS, and has
been deployed by public institutions such as the cities of Munich and Vienna,
and the German Federal Office for Information Security (BSI).
The Debian Project takes pride in being built upon by others, and we work actively with
-the teams behind derivative distributions to maximise the gains for all.
+the teams behind derivative distributions to maximize the gains for all.
\newpage
\section{DebConf}
@@ -376,7 +376,7 @@ countries.
Thanks to our sponsors, \textbf{participation, accommodation, and
meals are free of charge} for qualifying Debian developers and contributors who apply for bursaries.
In addition, a limited amount of travel cost subsidies are available, to bring contributors who would not otherwise be able to attend.
-\textbf{The organisation of DebConf itself is entirely volunteer-based}.
+\textbf{The organization of DebConf itself is entirely volunteer-based}.
DebConf17 will take place in August 2017 in Montreal, Canada. The venue,
``Collège de Maisonneuve'' is situated in the Hochelaga-Maisonneuve neighborhood,
@@ -416,7 +416,7 @@ during the week before DebConf.
\subsection{A Democratic Project}
Debian is a special project and has kept on going for more than two decades now.
-One of the reason behing this success is that Debian is more than just a
+One of the reason behind this success is that Debian is more than just a
software project:
\DCquote{
@@ -432,7 +432,7 @@ software project:
}{Bradley M. Kuhn, Software Freedom Conservancy}
%\ Asked Bradley's permission on August 20th 2016, received it on August 23rd 2016
-\subsection{Creating Fruitfull Relations}
+\subsection{Creating Fruitful Relations}
DebConf helps share the knowledge and experience of developers
with the entire community. It also helps individuals to put a face
@@ -453,7 +453,7 @@ of why it exists.}
\subsection{Project Synergy}
-DebConf gives contributors a chance to meet face to face, socialise,
+DebConf gives contributors a chance to meet face to face, socialize,
and brainstorm new ideas. As a result people leave DebConf with a
renewed sense of enthusiasm for Debian and its goals. \textbf{New
ideas and systems that Debian implements often originate in an
@@ -526,7 +526,7 @@ a Platinum, Gold, or Silver sponsor, you can use this opportunity to
\textbf{present yourself as an employer and engage in direct dialogue with
potential job candidates.}
-Sponsors that participated of the job fair in previous years have said that this
+Sponsors that participated in the job fair in previous years have said that this
was a unique opportunity to engage with the community, some of them finding
engineers for their open positions that are hard to find elsewhere.
@@ -547,7 +547,7 @@ Debian and Free Software.
In addition to your logo on the attendees' conference bags, we also invite you
to \textbf{distribute marketing materials and other goods} in the bags if you
support us at Bronze level or above.\footnote{\label{fn-content}All
-sponsor-provided content and initiatives must be coordinated with our organising
+sponsor-provided content and initiatives must be coordinated with our organizing
team.}
If you have smaller quantities of \textbf{hardware to give away} or you want to
@@ -632,7 +632,7 @@ DebConf has evolved from its humble beginnings in Bordeaux, France (2000) with
accommodate more than 250 attendees with budgets in the lower six-digit
figures.
-The conference is still \textbf{organised entirely by volunteers without
+The conference is still \textbf{organized entirely by volunteers without
compensation}. The Debian Project does not engage in commercial activities and
depends solely on donations from users and benefactors.
@@ -640,12 +640,12 @@ DebConf draws much of its strength from the diversity of its participants, and
the Free Software community is a globally active and very diverse crowd of
people, spanning many cultures and all levels of social status. Perhaps the
most important aspect of DebConf is that \textbf{we want to give as many
-people the opportunity to attend — not just those that are nearby and can
+people as possible the opportunity to attend — not just those that are nearby and can
afford it — because it benefits the conference, every attendee, and ultimately
Debian and the Free Software community}.
We expect 350 attendees in Montreal, in part because of its world-renowned Latin vibe
-owing to its French influence and of the strong Debian community in North America. But we
+owing to its French influence and because of the strong Debian community in North America. But we
also trust that our sponsors will help us achieve this goal and enable
attendees from all over the world to be a part of this event.
Reply to: