Skip to content

Commit 2684b19

Browse files
Merge branch 'production' into main
2 parents 1ae4e64 + c4c13dd commit 2684b19

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

source/jupyter.md

+10
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ the same. We are currently working on producing new Python-based images and exam
3939
for this chapter.
4040
```
4141

42+
```{note}
43+
This book was originally written for the R programming language, and
44+
has been edited to focus instead on Python. This chapter on Jupyter notebooks
45+
has not yet been fully updated to focus on Python; it has images and examples from
46+
the R version of the book. But the concepts related to Jupyter notebooks are generally
47+
the same. We are currently working on producing new Python-based images and examples
48+
for this chapter.
49+
```
50+
4251
## Chapter learning objectives
4352

4453
By the end of the chapter, readers will be able to do the following:
@@ -80,6 +89,7 @@ A screenshot of a Jupyter Notebook.
8089
```{index} JupyterHub
8190
```
8291

92+
8393
One of the easiest ways to start working with Jupyter is to use a
8494
web-based platform called JupyterHub. JupyterHubs often have Jupyter, Python, a number of Python
8595
packages, and collaboration tools installed, configured and ready to use.

source/version-control.md

+10-3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ the same. We are currently working on producing new Python-based images and exam
4949
for this chapter.
5050
```
5151

52+
```{note}
53+
This book was originally written for the R programming language, and
54+
has been edited to focus instead on Python. This chapter on version control
55+
has not yet been fully updated to focus on Python; it has images and examples from
56+
the R version of the book. But the concepts related to version control are generally
57+
the same. We are currently working on producing new Python-based images and examples
58+
for this chapter.
59+
```
60+
5261
## Chapter learning objectives
5362

5463
By the end of the chapter, readers will be able to do the following:
@@ -284,7 +293,6 @@ Committing the modified files in the staging area to the local repository histor
284293
```
285294

286295

287-
288296
### Pushing changes to a remote repository
289297

290298
```{index} git;push
@@ -306,7 +314,6 @@ name: vc5-push
306314
Pushing the commit to send the changes to the remote repository on GitHub.
307315
```
308316

309-
310317
### Pulling changes from a remote repository
311318

312319
If you are working on a project with collaborators, they will also be making changes to files
@@ -776,7 +783,7 @@ and click on the blue "Commit" button ({numref}`git-commit-01`).
776783
It is highly recommended to write useful and meaningful messages about what
777784
was changed. These commit messages, and the datetime stamp for a given
778785
commit, are the primary means to navigate through the project's history in the
779-
event that you need to view or retrieve a past version of a file, or
786+
event that you need to view or retrieve a past version of a file, or
780787
revert your project to an earlier state.
781788
When you click the "Commit" button for the first time, you will be prompted to
782789
enter your name and email. This only needs to be done once for each machine

0 commit comments

Comments
 (0)