From acebe149bb942a49a7776bf19eb52fd3d34ccc58 Mon Sep 17 00:00:00 2001 From: Arnaud Legrand Date: Fri, 27 Jul 2018 15:52:57 +0200 Subject: [PATCH] Use long-lived URLs --- module2/ressources/emacs_orgmode.org | 20 ++++++++++++-------- module2/ressources/gitlab.org | 4 ++-- module2/ressources/rstudio.org | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/module2/ressources/emacs_orgmode.org b/module2/ressources/emacs_orgmode.org index 9cb55ad..dce4e48 100644 --- a/module2/ressources/emacs_orgmode.org +++ b/module2/ressources/emacs_orgmode.org @@ -8,11 +8,12 @@ *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 [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/aefd774dcd2342c6aa769c87e2d0993a/3][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 [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/9cfc7500f0ef46d288d2317ec7b037b4][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 [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/aefd774dcd2342c6aa769c87e2d0993a/3]["emacs and git" video tutorial available at the same place]]. +the [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/9cfc7500f0ef46d288d2317ec7b037b4]["emacs and git" video tutorial available at the same place]]. The next section provides information on how to install emacs. @@ -82,8 +83,9 @@ versions: - Org-mode 9.1.13 - ESS 17.11 * A simple "/reproducible research/" emacs configuration -This section is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/aefd774dcd2342c6aa769c87e2d0993a/3][video tutorial]] (in French). Watching -it before following the instructions given in this section may help. +This section is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/9cfc7500f0ef46d288d2317ec7b037b4][video tutorial]] (/"Mise en place +Emacs/Orgmode"/ in French). Watching it before following the +instructions given in this section may help. Emacs comes with very basic default configuration and it appears like everyone has its own taste. You will for example find [[https://www.emacswiki.org/emacs/StarterKits][here]] several @@ -158,8 +160,9 @@ backed up in a revision control system like git. We leave it up to set this up but if you have any trouble, feel free to ask on the FUN forums. * A stub of replicable article -This section is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/aefd774dcd2342c6aa769c87e2d0993a/3][video tutorial]] (in French). Watching -it before following the instructions given in this section may help. +This section is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/9cfc7500f0ef46d288d2317ec7b037b4][video tutorial]] (/"Écrire un article +réplicable avec Emacs/Orgmode"/ in French). Watching it before +following the instructions given in this section may help. Remember, you need a working LaTeX and R environment. If you can't open a terminal and run the commands =R=, =pdflatex=, and =python=, you will not be @@ -229,7 +232,8 @@ feel this is needed, you should follow the instructions from the official Web page: http://company-mode.github.io/ *** Magit [[https://magit.vc/][Magit]] is an emacs interface for Git. Its usage is briefly illustrated -in the context of this MOOC in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/aefd774dcd2342c6aa769c87e2d0993a/3][video tutorial]] (in French). +in the context of this MOOC in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/9cfc7500f0ef46d288d2317ec7b037b4][video tutorial]] (/"Utilisation +Emacs/git"/ in French). It is very powerful and we use it on a daily basis but you should definitely understand what git does behind the scene beforehand. If diff --git a/module2/ressources/gitlab.org b/module2/ressources/gitlab.org index a74f17e..c76e525 100644 --- a/module2/ressources/gitlab.org +++ b/module2/ressources/gitlab.org @@ -19,7 +19,7 @@ is very convenient but in most cases, you will want to have your own local copy of the repository and you will have to synchronize your local copy with the remote GitLab one. To propagate your modifications, you will obviously have to authenticate yourself on -GitLab. How to do this is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2][video tutorial]] (in French). +GitLab. How to do this is illustrated in a [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/7508aece244548349424dfd61ee3ba85][video tutorial]] (in French). This document describes the software you need to have installed on your machine and how to handle authentication. Please @@ -54,7 +54,7 @@ never asks me for any password anymore and I don't have to remember anything). ** Option 1: HTTPS *** Configuring your GitLab password -In this [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2][video tutorial]] (in French), I explain how to change your +In this [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/7508aece244548349424dfd61ee3ba85][video tutorial]] (in French), I explain how to change your password on our GitLab. *** Making sure git remembers your password My GitLab id is =3211ac4f2fb71deaeff9252764c368e7=. Say I've configured diff --git a/module2/ressources/rstudio.org b/module2/ressources/rstudio.org index e4671e2..d0b687c 100644 --- a/module2/ressources/rstudio.org +++ b/module2/ressources/rstudio.org @@ -8,8 +8,8 @@ This document provides information on how to install Rstudio. If you have never used git with Rstudio, *we strongly advise that you -follow [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/d6b5dbe8add046e4bde324ed3fc936fa/3][our tutorial on using git from Rstudio]]* (in French). Before -proceeding, make sure you also have followed the *[[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/courseware/66bc811404b8481da5f794de54681c5e/f6580ad8e997400faeffe9af4fd37063/2]["git/GitLab +follow [[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/d132a854b0464ad29085cedaded23136][our tutorial on using git from Rstudio]]* (/"Rstudio et Gitlab"/ in French). Before +proceeding, make sure you also have followed the *[[https://www.fun-mooc.fr/courses/course-v1:inria+41016+session01bis/jump_to_id/7508aece244548349424dfd61ee3ba85]["git/GitLab configuration" tutorial]]* (in French). Alternatively, you may want to watch [[https://www.youtube.com/embed/uHYcDQDbMY8][this video]] (in English). If you -- 2.18.1