Merge branch 'master' into patch-3

enkidevs · Mar 14, 2022 · 7b596f5 · 7b596f5
2 parents 9c4f069 + 63297f4
commit 7b596f5
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,37 @@ Types of change:
 
 ### Fixed
 
+## March 4th 2022
+
+### Fixed
+- [Linux - User Mod Recipies - Move Single Line Command in PQ Back To A Single Line](https://github.com/enkidevs/curriculum/pull/3051)
+
+## March 2nd 2022
+
+### Changed
+- [SQL - AVG Clause - Remove LIMIT as it has no effect on the provided queries](https://github.com/enkidevs/curriculum/pull/3050)
+
+## February 28th 2022
+
+### Fixed
+- [Python - Chain Comparison Operators - Replace outdated link](https://github.com/enkidevs/curriculum/pull/3049)
+- [Data Analysis - Sorting And Filtering - Add missing L to calculations word in note](https://github.com/enkidevs/curriculum/pull/3047)
+
+## February 15th 2022
+
+### Fixed
+- [Spreadsheets - What Are Formulas - fix markdown table not rendering correctly in PQ](https://github.com/enkidevs/curriculum/pull/3043)
+
+## February 14th 2022
+
+### Changed
+- [Web - Anchor Links - Make RQ clearer](https://github.com/enkidevs/curriculum/pull/3041) 
+- [Web - Nested Lists - Remove type in the gap as it has no value](https://github.com/enkidevs/curriculum/pull/3040)
+- [Python - Python Packages - Remove whitespace from a one liner code that spanned two lines](https://github.com/enkidevs/curriculum/pull/3042) 
+
+### Fixed
+- [SQL - The Roles That Joins Play - Replace wrong output table with the correct one](https://github.com/enkidevs/curriculum/pull/3044)
+
 ## February 7th 2022
 
 ### Fixed

diff --git a/...is/data-analysis-core/data-analysis-using-spreadsheets/sorting-and-filtering.md b/...is/data-analysis-core/data-analysis-using-spreadsheets/sorting-and-filtering.md
@@ -33,7 +33,7 @@ Another great way to spot trends or to explore your data is to use **filters**.
 
 Filtering is the process of choosing a smaller part of your data and using that subset for viewing or analysis. 
 
-> 💡 Filtering is generally temporary – the original data is kept, but only part of it is used for calcuations.
+> 💡 Filtering is generally temporary – the original data is kept, but only part of it is used for calculations.
 
 You can click on this icon to turn every column into a filter. From here you can then manipulate each column to display the desired information. 
 

diff --git a/javascript/ecmascript-2015/classes-modules/classes-and-constructor.md b/javascript/ecmascript-2015/classes-modules/classes-and-constructor.md
@@ -107,7 +107,7 @@ console.log(myRec.length)
 
 ## Revision
 
-How would you assign a variable `volume` passed to the constructor to a class?
+How would you assign a variable `volume` passed to the constructor to a class member variable?
 
 ```javascript
 class Sphere() {

diff --git a/linux/user-and-file-management/user-management/usermod-recipes.md b/linux/user-and-file-management/user-management/usermod-recipes.md
@@ -84,8 +84,7 @@ As you've already seen, there are multiple ways to achieve the same result. It's
 Add the user `user` to the group `root`:
 
 ```bash
-??? ??? ???
-      root user
+??? ??? ??? root user
 ```
 
 - `usermod`

diff --git a/...-and-file-management/user-permissions/changing-group-membership-with-usermod.md b/...-and-file-management/user-permissions/changing-group-membership-with-usermod.md
@@ -45,8 +45,7 @@ sudo gpasswd -d jesse new-group
 Add `john` to the `enki` group:
 
 ```plain-text
-sudo ??? ??? ???
-       ??? ???
+sudo ??? ??? ??? ??? ???
 ```
 
 - `usermod`
@@ -65,8 +64,7 @@ sudo ??? ??? ???
 Make `john` a member of the `enki` group, and of this group only:
 
 ```plain-text
-sudo ??? ??? 
-       ??? ???
+sudo ??? ??? ??? ???
 ```
 
 - `usermod`

diff --git a/python/python-core/control-flow-ii/chain-comparison-operators.md b/python/python-core/control-flow-ii/chain-comparison-operators.md
@@ -8,7 +8,7 @@ tags:
   - operators
 links:
   - >-
-    [stackoverflow.com](http://stackoverflow.com/questions/101268/hidden-features-of-python){website}
+    [Chaining Comparison Operators](https://mathspp.com/blog/pydonts/chaining-comparison-operators){website}
 practiceQuestion:
   formats:
     - fill-in-the-gap

diff --git a/python/python-core/intro-to-modules/python-packages.md b/python/python-core/intro-to-modules/python-packages.md
@@ -52,8 +52,7 @@ Now that we have these files defined in our **Hotel package**, we can use them i
 ```python
 # rooms_update.py
 
-from Hotel 
-import available_rooms, total_rooms
+from Hotel import available_rooms, total_rooms
 
 available_rooms.available(10)
 # 10 rooms are available.

diff --git a/.../spreadsheets-introduction/intro-to-functions-and-formulas/what-are-formulas.md b/.../spreadsheets-introduction/intro-to-functions-and-formulas/what-are-formulas.md
@@ -42,7 +42,8 @@ Now, every time you update the data in one of the cells found in the formula (`B
 ## Practice
 
 Consider the following spreadsheet:
-| ‏‏‎ ‎ | A    | B        |
+
+| &#160; | A    | B        |
 |---|------|----------|
 | 1 | Week | Spending |
 | 2 | 1    | 23       |

diff --git a/sql/dql/aggregate-queries/avg-clause.md b/sql/dql/aggregate-queries/avg-clause.md
@@ -35,12 +35,11 @@ Using the following segment of the `experience` **table**:
 | 2  | 2     | 10         | 1              |
 | 3  | 3     | 33         | 1              |
 
-Let's see what the first five values of the `experience` **column** look like:
+Let's see what the values of the `experience` **column** look like:
 
 ```sql
 SELECT experience
 FROM experience
-LIMIT 5;
 ```
 
 Output:
@@ -53,12 +52,11 @@ Output:
 | 80         |
 | 156        |
 
-Using the `AVG` function, you can find the average of the first five values:
+Using the `AVG` function, you can find the average of the values in a select column:
 
 ```sql
 SELECT AVG(experience) as Result
 FROM experience
-LIMIT 5;
 ```
 
 Output:

diff --git a/sql/dql/aggregate-queries/sum-clause.md b/sql/dql/aggregate-queries/sum-clause.md
@@ -86,7 +86,7 @@ FROM
 
 ## Revision
 
-We have a table called `items` that contains the name and cost of every item in Pokeland. We want to know how much it would cost to buy all items...
+We have a table called `item` that contains the name and cost of every item in Pokeland. We want to know how much it would cost to buy all items...
 
 | id | cost | name        |
 | -- | ---- | ----------- |

diff --git a/sql/dql/intro-joins/joins-role.md b/sql/dql/intro-joins/joins-role.md
@@ -60,13 +60,13 @@ FROM pokemon JOIN attack
 Notice that the query makes references to both tables and then also states the **joining condition**[1] (`pokemon.id = attack.id`). 
 This query returns the following:
 
-| name       | route |
-| ---------- | ----- |
-| venusaur   | NULL  |
-| charmeleon | 4     |
-| pikachu    | 4     |
-| squirtle   | 25    |
-| magikarp   | 6     |
+| name       | type1    |
+|------------|----------|
+| venusaur   | grass    |
+| charmeleon | fire     |
+| pikachu    | electric |
+| squirtle   | water    |
+| magikarp   | water    |
 
 > 💡 There are many different types of joins, with different implementations and different results. These are covered in the following few workouts.
 

diff --git a/web/html/links/anchor-links.md b/web/html/links/anchor-links.md
@@ -79,7 +79,7 @@ Link to the
 
 ## Revision
 
-What denotes an anchor link?
+Create an anchor link that navigates to the HTML element with the `contact` id:
 
 ```html
 <a href="???contact">

diff --git a/web/html/lists/nested-lists.md b/web/html/lists/nested-lists.md
@@ -19,7 +19,6 @@ practiceQuestion:
 revisionQuestion:
   formats:
     - fill-in-the-gap
-    - type-in-the-gap
   context: standalone
 ---