More improvements based on feedback from Lukas and Jie.

- Explain that we had pre-Free Software Movement scenario, to give
  more context.

- Mention the term "proprietary".

- New section "A bit about licenses", with stuff about copyleft and
  permissive.

- Un-texttt "GNU".

- New section "More than just code", with a preparation for the
  "upstream" section.

- Mention Matrix and Rocket.chat.

free-sw-rh-interns.tex

@@ -37,18 +37,31 @@
 \begin{frame}{Agenda}
   \begin{itemize}
     \item{What is Free Software?}
-    \item{GNU and Linux}
+    \item{A bit about licenses}
+    \item{GNU}
+    \item{Linux}
+    \item{More than just code}
     \item{Upstream}
     \item{Downstream}
     \item{Tips and Tricks}
   \end{itemize}
 \end{frame}
 
-
 \section{What's Free Software?}
 \begin{frame}{What's Free Software?}
+  \begin{itemize}
+    \item{In the beginning (until the '70s), we had \emph{public
+        domain} code, and everything was shared.}
+    \item{Infamous \emph{``Open Letter to Hobbyists''}, from Bill
+      Gates, in 1976.}
+    \item{\textbf{Richard M. Stallman} started the \textbf{Free
+        Software Movement} in 1983.}
+  \end{itemize}
+\end{frame}
 
+\begin{frame}{What's Free Software?$^2$}
   \centering
+
   Has anybody said \textbf{four freedoms}?
   \newline
   \pause
@@ -71,17 +84,17 @@
   \end{enumerate}
 \end{frame}
 
-\begin{frame}{What's Free Software?$^2$}
+\begin{frame}{What's Free Software?$^3$}
   \textbf{Free Software} means software that respects users' freedom
   and community.  The users have the \textbf{freedom to run, copy,
   distribute, study, change and improve} the software.
   \newline
   \newline
   When a program fails to give any of these freedoms to the user, we
-  say it is \textbf{non-free}.
+  say it is \textbf{non-free} or \textbf{proprietary}.
 \end{frame}
 
-\begin{frame}{What's Free Software?$^3$}
+\begin{frame}{What's Free Software?$^4$}
   The \textbf{copyleft} concept was the smartest hack that Stallman
   has created.  It exploits how the copyright works, and turns it back
   against itself.
@@ -92,8 +105,34 @@
   be respected by everyone.
 \end{frame}
 
+\section{A bit about licenses}
+\begin{frame}{A bit about licenses}
+  In a nutshell, when we talk about Free Software licenses, we have
+  two main types:
+  \newline
+  \begin{itemize}
+    \item{\textbf{Copyleft} licenses: \emph{Share-alike} licenses,
+      which guarantee that the work will be redistributed (modified or
+      not) under the same terms as the original license.
+      \textbf{GPLv3} is the main license in this field.}
+    \item{\textbf{Permissive} licenses: Allow redistribution under
+      other terms, \textbf{even non-free!}  Main licenses here are
+      \textbf{Apache 2.0} and \textbf{MIT/Expat}.}
+  \end{itemize}
+\end{frame}
+
+\begin{frame}{A bit about licenses$^2$}
+  A more opinionated version?
+  \newline
+  \begin{itemize}
+    \item{\textbf{Copyleft} licenses: Focus on \textbf{user freedom}.}
+    \item{\textbf{Permissive} licenses: Focus on \textbf{developer
+        freedom}.}
+  \end{itemize}
+\end{frame}
+
 \section{The G from GNU}
-\begin{frame}{The \texttt{G} from \texttt{GNU}}
+\begin{frame}{The \texttt{G} from GNU}
   \begin{itemize}
     \item{Created by \textbf{Richard M. Stallman} on 27 September
       1983.}
@@ -112,7 +151,7 @@
   \end{itemize}
 \end{frame}
 
-\begin{frame}{The \texttt{G} from \texttt{GNU}$^2$}
+\begin{frame}{The \texttt{G} from GNU$^2$}
   But of course, we are not in a contest.  I choose to call the system
   \textbf{GNU/Linux} not only because I think it is the right thing to
   do, but mainly to \textbf{raise awareness}.
@@ -126,13 +165,26 @@
       Free and Open Source software collaboration.}
     \item{Unfortunately, is not entirely Free Software (binary blobs
       are/were shipped with the kernel; reason for the
-      \textbf{Linux-libre} fork by the \texttt{GNU} project).}
+      \textbf{Linux-libre} fork by the GNU project).}
     \item{Personal opinion: main community tends to be toxic,
       reflecting the behaviour of Linus himself.}
   \end{itemize}
 \end{frame}
 
-\section{All that goes upstream...}
+\section{More than just code}
+\begin{frame}{More than just code}
+  We've been talking about \textbf{software projects}, which are
+  basically \emph{source code} (actually, it's more than that!).
+  But...  how are these projects organized?
+  \pause
+  \newline
+  \newline
+  Ultimately, the project's source code is the \textbf{product} that
+  is generated by a community of people.  And as such, we need
+  \textbf{tools} and \textbf{procedures} in order to better organize
+  our efforts.
+\end{frame}
+
 \begin{frame}{All that goes upstream...}
   \textbf{Upstream} is the name we give to the actual Free Software
   projects that develop the programs.  For example, Linux,
@@ -150,8 +202,8 @@
         \item{\textbf{Source-code repository}: \textbf{git} is the
           most used nowadays.}
         \item{\textbf{IRC channel}: Where we communicate (mostly) in
-          real time (some teams are migrating to \textbf{Mattermost}
+          real time (some teams are migrating to \textbf{Mattermost},
-          or \textbf{Slack} (non-free, argh)).}
+          \textbf{Matrix} or \textbf{Slack} (non-free, argh)).}
       \end{itemize}
   \end{itemize}
 \end{frame}