Disclaimer: The two sections A simple "reproducible research" emacs configuration and A stub of replicable article explain how to set up -emacs/org-mode for this MOOC. These sections are illustrated in two -out of the three video tutorials of this sequence, and which you +emacs/org-mode for this MOOC. These are very important sections in the +context of this MOOC. These sections are illustrated in two +out of the three video tutorials of this sequence, and which you really should follow carefully. Otherwise, you may have trouble doing the exercises later on. Likewise, I strongly encourage you to watch -the "emacs and git" video tutorial available at the same place. +the "emacs and git" video tutorial available at the same place.
The next section provides information on how to install emacs.
-We provide here only instructions for debian-based distributions. Feel free to contribute to this document to provide up-to-date information @@ -124,9 +125,9 @@ which is now deprecated.
Option 1: Install the .dmg file from Vincent Goulet:
@@ -159,9 +160,9 @@ brew install wget
Install the .exe file from Vincent Goulet:
https://vigou3.github.io/emacs-modified-windows/. It ships with recent
@@ -175,12 +176,13 @@ versions:
-This section is illustrated in a video tutorial (in French). Watching -it before following the instructions given in this section may help. +This section is illustrated in a video tutorial ("Mise en place +Emacs/Orgmode" in French). Watching it before following the +instructions given in this section may help.
@@ -195,9 +197,9 @@ adding a few org-mode specific configurations.
The procedure we propose will wipe your already existing custom emacs configuration if you already have one. You should thus beforehand make @@ -218,9 +220,9 @@ rr_org/journal.org
Create an org/ directory in the top of your home:
Copy rr_org/init.el in your ~/.emacs.d/ directory.
emacs -q -l rr_org/init.el
Open a new instance of Emacs and open a
In step 1, you were told to create an journal in
-This section is illustrated in a video tutorial (in French). Watching
-it before following the instructions given in this section may help.
+This section is illustrated in a video tutorial ("Écrire un article
+réplicable avec Emacs/Orgmode" in French). Watching it before
+following the instructions given in this section may help.
@@ -362,22 +365,22 @@ chunk of code when exporting.
Learning emacs and org-mode can be difficult as there is an inordinate
amount of shortcuts. Many people have thus come up with
cheat-sheats. Here is a selection in case it helps:
For those of you who prefer video explanations, here is a Youtube
channel with many step by step emacs tutorials.
Company-mode is a text completion framework for Emacs. It allows to
have smart completion in emacs for the most common languages. If you
@@ -421,12 +424,13 @@ official Web page: http://company-mode.
Magit is an emacs interface for Git. Its usage is briefly illustrated
-in the context of this MOOC in a video tutorial (in French).
+in the context of this MOOC in a video tutorial ("Utilisation
+Emacs/git" in French).
@@ -440,9 +444,9 @@ invoke magit by using
@@ -56,13 +56,13 @@ installed on your machine and how to handle authentication. Please
read these instructions carefully.
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
@@ -78,9 +78,9 @@ Run (as root):
There are two ways of authenticating and synchronizing your local
repository with GitLab: through HTTPS or through SSH. The first one
@@ -113,22 +113,22 @@ never asks me for any password anymore and I don't have to remember
anything).
-In this video tutorial (in French), I explain how to change your
+In this video tutorial (in French), I explain how to change your
password on our GitLab.
My GitLab id is
My preferred (although more technical) solution is to install SSH, to
create a pair or private/public keys, and to upload your SSH public
@@ -178,13 +178,13 @@ key on GitLab. This section provides with information on how to do
this.
You do not have anything to do as it is installed by default.
You should install the Putty client. Once it is installed, look for
the section on generating an SSH key.
@@ -217,9 +217,9 @@ the section on generati
Here are all the official explanations on how to set up your SSH key
on GitLab. Alternatively, you may also want to have a look at this
diff --git a/module2/ressources/rstudio.html b/module2/ressources/rstudio.html
index 585c926c70331c77bfeb0555929b750e89e9a873..4a178ba8d1b6126e50dc01d394ded56ceab3a260 100644
--- a/module2/ressources/rstudio.html
+++ b/module2/ressources/rstudio.html
@@ -4,15 +4,15 @@
If you have never used git with Rstudio, we strongly advise that you
-follow our tutorial on using git from Rstudio (in French). Before
-proceeding, make sure you also have followed the "git/GitLab
+follow our tutorial on using git from Rstudio ("Rstudio et Gitlab" in French). Before
+proceeding, make sure you also have followed the "git/GitLab
configuration" tutorial (in French).
We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information
@@ -88,9 +88,9 @@ for upgrading…
Beforehand, you need to install the R language and convenient packages
by running (as root):
@@ -123,9 +123,9 @@ to run (as root):
Rstudio is unfortunately not packaged within debian so the easiest is
to download the corresponding debian package on the Rstudio webpage
@@ -143,9 +143,9 @@ sudo apt-get update ; sudo apt-get -f install
-
Some instructions on installing R and knitr must be missing. This
foo.org file. Copy the
following lines in this file:
@@ -284,9 +286,9 @@ is demonstrated in the
-Step 4: Open and play with your journal:
-Step 4: Open and play with your journal:
+~org/journal.org. First you probably want to make sure this file is
@@ -297,12 +299,13 @@ forums.
A stub of replicable article
-A stub of replicable article
+Emacs Tips and tricks
-Emacs Tips and tricks
+Cheat-sheets
-Cheat-sheets
+Emacs
-Emacs
+
Org-mode
-Org-mode
+
Video tutorials
-Video tutorials
+Additional useful emacs packages
-Additional useful emacs packages
+Company-mode
-Company-mode
+Magit
-Magit
+C-x g.
Other resources
-Other resources
+
Table of Contents
-
Installing Git
-Installing Git
+Linux (debian, ubuntu)
-Linux (debian, ubuntu)
+Mac OSX and Windows
-Mac OSX and Windows
+
Authenticating on GitLab
-Authenticating on GitLab
+Option 1: HTTPS
-Option 1: HTTPS
+Configuring your GitLab password
-Configuring your GitLab password
+Making sure git remembers your password
-Making sure git remembers your password
+3211ac4f2fb71deaeff9252764c368e7. Say I've configured
my password to be tototutu (what a weak password…) and I want to
@@ -168,9 +168,9 @@ cached in memory and they will not be asked again before an hour.
Option 2: SSH
-Option 2: SSH
+Installing SSH
-Installing SSH
+
-
-
-
+
-
+Setting up SSH on GitLab
-Setting up SSH on GitLab
+Table of Contents
Installing Rstudio
-Installing Rstudio
+Linux (debian, ubuntu)
-Linux (debian, ubuntu)
+Installing R
-Installing R
+Installing rstudio
-Installing rstudio
+Mac OSX and Windows
-Mac OSX and Windows
+