From 3ae1af3b2e52914012ce23e6c0074daee37bfc61 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Mon, 8 Jul 2024 10:57:54 -0400
Subject: [PATCH 1/7] fixed links in advanced forms & project:flight booker
 lessons

---
 .../forms_advanced.md                              | 14 +++++++-------
 .../project_flight_booker.md                       |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
index 104bbcedf19..510c5c01d2a 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
@@ -145,7 +145,7 @@ You can also have your form destroy nested forms by first setting the `:allow_de
 
 ### Many-to-many relationships
 
-If you've got a `has_many :through` relationship, you'll likely need to go one additional step further by specifying that each side of your relationship is the inverse of the other.  It's detailed in [this blog post from ThoughtBot](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through).
+If you’ve got a `has_many :through` relationship, you’ll likely need to go one additional step further by [specifying that each side of your relationship is the inverse of the other](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through).
 
 ### Designing your own forms
 
@@ -159,7 +159,7 @@ Don't get discouraged if you get some real head-scratcher moments when building
 
 `simple_form` is a gem by Platformatec which can really make your life easier (if you aren't doing anything too crazy).  It provides lots of user-friendly features for building forms and is in wide use today.
 
-It's up to you to check out [the documentation](https://github.com/plataformatec/simple_form) and start using it in your own applications as desired.
+It's up to you to check out [the documentation for `simple_form`](https://github.com/plataformatec/simple_form) and start using it in your own applications as desired.
 
 ### Miscellania: blank submissions that mean delete
 
@@ -172,10 +172,10 @@ Sometimes Rails helper methods will do it for you, but make sure you know what y
 ### Assignment
 
 <div class="lesson-content__panel" markdown="1">
-  1. Read the [Rails Guide on Forms](https://guides.rubyonrails.org/form_helpers.html#choices-from-a-collection-of-arbitrary-objects) section 5, which covers populating a form with a collection of objects.
-  2. Read the [Same Rails Guide on Forms](http://guides.rubyonrails.org/form_helpers.html#building-complex-forms) section 10, which covers accepting nested form data.
-  3. Read the [Same Rails Guide on Forms](http://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions) section 8, which covers the parameter conventions for nested forms.
-  4. Read [this blog post from Peter Rhoades](https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html) on working with nested forms.  The example covers a lot of the things we've gone over so far, so follow along.  Also note how he does the allowing of nested attributes in Rails 4.
+  1. Read the Rails Guide on Forms section 5, which covers [populating a form with a collection of objects](https://guides.rubyonrails.org/form_helpers.html#choices-from-a-collection-of-arbitrary-objects).
+  2. Read the Same Rails Guide on Forms section 10, which covers [accepting nested form data](http://guides.rubyonrails.org/form_helpers.html#building-complex-forms).
+  3. Read the Same Rails Guide on Forms section 8, which covers the [parameter conventions for nested forms](http://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions).
+  4. Read this blog post from [Peter Rhoades on working with nested forms](https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html).The example covers a lot of the things we’ve gone over so far, so follow along. Also note how he does the allowing of nested attributes in Rails 4.
 </div>
 
 ### Conclusion
@@ -202,7 +202,7 @@ This section contains helpful links to related content. It isn’t required, so
 
 - [Simple Form Documentation on GitHub](https://github.com/plataformatec/simple_form)
 - [`accepts_nested_attributes_for` documentation](http://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html)
-- [Another example of a nested form on SO](http://stackoverflow.com/questions/15648396/rails-how-to-manage-nested-attributes-without-using-accepts-nested-attributes?rq=1)
+- [Another example of a nested form on Stack Overflow](http://stackoverflow.com/questions/15648396/rails-how-to-manage-nested-attributes-without-using-accepts-nested-attributes?rq=1)
 - [Using `inverse_of` to make `accepts_nested_attributes_for` work for `has_many :through` relationships](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through)
 - [Understanding Rails' form authenticity tokens](http://stackoverflow.com/questions/941594/understand-rails-authenticity-token)
 - [Why not to hardcode your application's secret token in production](http://daniel.fone.net.nz/blog/2013/05/20/a-better-way-to-manage-the-rails-secret-token/)
diff --git a/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md b/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
index b5331689679..58e1557a3e6 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
@@ -9,7 +9,7 @@ A typical airline booking flow:
 1. Enter passenger information for all passengers
 1. Enter billing information
 
-Step 4 would be done via integration of something like [Paypal](http://coding.smashingmagazine.com/2011/09/05/getting-started-with-the-paypal-api/), via [a gem](https://github.com/nov/paypal-express) or [an SDK](https://www.tommyblue.it/2013/07/02/paypal-express-checkout-with-ruby-on-rails-and-paypal-sdk-merchant/) or [Stripe](https://docs.stripe.com/checkout/quickstart).
+Step 4 would be done via integration of something like [the Paypal API](http://coding.smashingmagazine.com/2011/09/05/getting-started-with-the-paypal-api/), via [the paypal-express gem](https://github.com/nov/paypal-express), [the paypal-sdk-merchant SDK](https://www.tommyblue.it/2013/07/02/paypal-express-checkout-with-ruby-on-rails-and-paypal-sdk-merchant/), or [Stripe](https://stripe.com/docs/checkout/guides/rails).
 
 ### Assignment
 
@@ -34,7 +34,7 @@ For the first screen, you will be creating 4 dropdown menus that will allow user
 1. Seed your database with flights.
 1. You will search and view results in the same page.  Set up your FlightsController and routes to make the Index page (`/flights`) the root route.
 1. Create your search form on the `/flights` index page to submit using a GET (not POST) request back to the same URL.
-1. Add the four dropdown menus -- a list of departure airports, arrival airports, number of passengers (1-4), and a date dropdown for the flight date. The date dropdown should only include dates that have existing flights. Don't worry about restricting the contents of the airport dropdowns -- you'd normally use JavaScript -- so just allow the user to select any airport. See this [SO post on formatting date in dropdown lists](http://stackoverflow.com/questions/15720940/rails-format-date-in-drop-down-list-in-view), this [quickie SO post on selecting months/years](http://stackoverflow.com/questions/13001904/rails-drop-down-select-month-year) and the Rails [DateHelper API Docs](http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html) for some help with creating Date selects.
+1. Add the four dropdown menus -- a list of departure airports, arrival airports, number of passengers (1-4), and a date dropdown for the flight date. The date dropdown should only include dates that have existing flights. Don't worry about restricting the contents of the airport dropdowns -- you'd normally use JavaScript -- so just allow the user to select any airport. See this [Stack Overflow post on formatting dates in dropdown lists](http://stackoverflow.com/questions/15720940/rails-format-date-in-drop-down-list-in-view), this short [Stack Overflow post on selecting months/years](http://stackoverflow.com/questions/13001904/rails-drop-down-select-month-year) and the Rails [DateHelper API Docs](http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html) for some help with creating Date selects.
 
 #### Screen 2: pick a flight
 
@@ -56,9 +56,9 @@ Once the user has submitted their chosen flight, it's time to take their booking
 1. Set up your `#new` action, which should have received the flight ID and passenger number parameters, and use it to help render a form for a new booking which displays the currently chosen date, airports, flight ID and a set of fields to enter personal information for each passenger.  You'll want to create a new blank Passenger object in your controller for each passenger, and then use `#fields_for` in the view to set up the sub-forms.
 1. Try submitting the form and check out the parameters in your server.
 1. You'll need your `#create` action to create a new Booking (linking it to the appropriate Flight) but it will also need to accept the nested attributes for each of the Passenger objects and create a new Passenger from them.  Be mindful of allowing the nested parameters as well.
-1. Go to the Booking model and implement the `#accepts_nested_attributes_for` method.  See the [Rails API](http://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html) for examples and this [SO post on nested attributes and mass assignment](http://stackoverflow.com/questions/18540679/rails-4-accepts-nested-attributes-for-and-mass-assignment) for another.
+1. Go to the Booking model and implement the `#accepts_nested_attributes_for` method.  See the [Rails API](http://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html) for examples and this [Stack Overflow post on nested attributes and mass assignment](http://stackoverflow.com/questions/18540679/rails-4-accepts-nested-attributes-for-and-mass-assignment) for another.
 1. Once your form is successfully submitted, render the booking's `#show` page which displays the booking information (flight and passenger information).
-1. Make sure your ticketing flow is working properly.  Good work!
+1. Make sure your ticketing flow is working properly. Good work!
 
 </div>
 

From 8c78fe75bbc890d68309cd7a67a190bcebf41372 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Wed, 10 Jul 2024 10:03:17 -0400
Subject: [PATCH 2/7] fixed lint errors

---
 .../forms_advanced.md                         | 66 ++++++++++---------
 .../project_flight_booker.md                  |  1 +
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
index 510c5c01d2a..f3469cb6321 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
@@ -14,13 +14,13 @@ This section contains a general overview of topics that you will learn in this l
 - How to whitelist nested parameters.
 - How to delete records via form fields.
 
-### Prepopulating `select` tags with collections
+### Prepopulating select tags with collections
 
 Rails provides you with a few handy ways of making dropdown menus which already contain data when the form is loaded (otherwise they're not that useful).
 
 Let's say you want to build a New Post form for your blog but you want to be able to select who the author is from among your list of users.  You will need to make a dropdown which submits the user's ID as a part of your `params` hash.  So you might populate `@users` in your posts controller:
 
-~~~ruby
+```ruby
   # app/controllers/posts_controller.rb
   ...
   def new
@@ -28,11 +28,11 @@ Let's say you want to build a New Post form for your blog but you want to be abl
     @post = Post.new
   end
   ...
-~~~
+```
 
 The bare HTML way is to build a bunch of `<option>` tags (inside your `<select>` tag).  You could easily create these in your ERB code by just iterating over some collection, for instance if you'd like to select a post to view from a list of them.
 
-~~~html
+```html
   # app/views/posts/new.html.erb
   ...
   <select name="user_id">
@@ -41,7 +41,7 @@ The bare HTML way is to build a bunch of `<option>` tags (inside your `<select>`
     <% end %>
   </select>
   ...
-~~~
+```
 
 This creates a dropdown list with each user's name as an option.  Your `#create` action will receive an attribute called `user_id` and you can use it to match an author to that post.
 
@@ -49,7 +49,7 @@ But Rails provides some less verbose ways of doing the same thing, namely using
 
 <span id='options-for-select'>`#options_for_select` expects a very specific input -- an array of arrays which provide the text for the dropdown option and the value it represents.<span>  So `options_for_select([["choice1",1],["choice2",2]])` creates a couple of option tags, one for each choice.  This is great, because that's exactly what `#select_tag` expects for its second argument.  The only wrinkle here is that you need to convert your `@users` collection, which has full User objects, into an array with just `name` and `value`.  That's easy using `#map`:
 
-~~~ruby
+```ruby
   # app/controllers/posts_controller.rb
   ...
   def new
@@ -62,18 +62,18 @@ But Rails provides some less verbose ways of doing the same thing, namely using
   ...
   <%= select_tag(:author_id, options_for_select(@user_options)) %>
   ...
-~~~
+```
 
 So just pass `#select_tag` the name it should use for your chosen value and the collection and it will output the exact same thing!
 
 <span id='select-helper'>If you want to avoid the whole `options_for_select` thing altogether and your form is designed to build a model instance (e.g. a Post object), just use the more generic `#select` helper in your view:</span>
 
-~~~ruby
+```ruby
   # app/views/posts/new.html.erb
   ...
   <%= select(:post, :author_id, @user_options) %>
   ...
-~~~
+```
 
 You still need to pass it the `:post` parameter (which indicates that your form is building a Post object) so the `select` tag can get the `name` right... in this case, it will name the tag `<select name="post[author_id]" id="post_author_id">`.  That means (remember!) that the `author_id` attribute will show up in your `params` nested under the `post` hash.
 
@@ -81,12 +81,12 @@ The `:author_id` input to the `#select` helper above represents not just what th
 
 If you have a `#form_with` form scoped under the `f` variable, you don't need to pass the `:post` symbol above (it gets it from `f`), so could instead use:
 
-~~~ruby
+```ruby
   # app/views/posts/new.html.erb
   ...
     <%= f.select(:author_id, @user_options) %>
   ...
-~~~
+```
 
 It took a bit of time for us to get here, but hopefully you can now see how straightforward this method is for generating a potentially large dropdown.
 
@@ -104,22 +104,22 @@ As you can imagine, it's important to get the names and parameters properly list
 
 We'll do a broad overview of the process here:
 
-1. {: #accepts_nested_attributes_for}You will need to prepare the User model so that it knows to create one or more ShippingAddress objects if it receives their attributes when creating a normal User.  This is done by adding a method to your User model called `#accepts_nested_attributes_for` which accepts the name of an association, e.g:
+1. <span id="accepts-nested-attributes-for"> You will need to prepare the User model so that it knows to create one or more ShippingAddress objects if it receives their attributes when creating a normal User. This is done by adding a method to your User model called `#accepts_nested_attributes_for` which accepts the name of an association, e.g: </span>
 
-   ~~~ruby
+   ```ruby
      # app/models/user.rb
      class User < ActiveRecord::Base
        has_many :shipping_addresses
        accepts_nested_attributes_for :shipping_addresses
      end
-   ~~~
+   ```
 
-2. Make sure you've allowed your `params` to include the nested attributes by appropriately including them in your Strong Parameters controller method.  See the reading for examples of how to do this.
-3. Build the form in the view.  Use the `#fields_for` method to effectively create a `#form_with` inside your existing `#form_with` form.
+1. Make sure you've allowed your `params` to include the nested attributes by appropriately including them in your Strong Parameters controller method.  See the reading for examples of how to do this.
+1. Build the form in the view.  Use the `#fields_for` method to effectively create a `#form_with` inside your existing `#form_with` form.
 
 There are a couple new aspects to this process.  You saw `#fields_for` in the [Basic Forms lesson](/paths/full-stack-ruby-on-rails/courses/ruby-on-rails/lessons/form-basics) but it probably has new meaning to you now.  It's basically how you create a form within a form (which should make sense since it's actually used behind the scenes by `#form_with`).  In this example, we might create three "sub-forms" for ShippingAddress objects by using our association, e.g.
 
-~~~ruby
+```ruby
   <%= form_with model: @user do |f| %>
     ...
     <% 3.times do %>
@@ -131,7 +131,7 @@ There are a couple new aspects to this process.  You saw `#fields_for` in the [B
     <% end %>
     <%= f.submit %>
   <% end %>
-~~~
+```
 
 Note that we could (and should) also have built the new shipping_address objects in the controller instead of the view; it's just for demonstration purposes here.
 
@@ -145,7 +145,7 @@ You can also have your form destroy nested forms by first setting the `:allow_de
 
 ### Many-to-many relationships
 
-If you’ve got a `has_many :through` relationship, you’ll likely need to go one additional step further by [specifying that each side of your relationship is the inverse of the other](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through).
+If you've got a `has_many :through` relationship, you'll likely need to go one additional step further by [specifying that each side of your relationship is the inverse of the other](http://robots.thoughtbot.com/accepts-nested-attributes-for-with-has-many-through).
 
 ### Designing your own forms
 
@@ -172,13 +172,15 @@ Sometimes Rails helper methods will do it for you, but make sure you know what y
 ### Assignment
 
 <div class="lesson-content__panel" markdown="1">
+
   1. Read the Rails Guide on Forms section 5, which covers [populating a form with a collection of objects](https://guides.rubyonrails.org/form_helpers.html#choices-from-a-collection-of-arbitrary-objects).
-  2. Read the Same Rails Guide on Forms section 10, which covers [accepting nested form data](http://guides.rubyonrails.org/form_helpers.html#building-complex-forms).
-  3. Read the Same Rails Guide on Forms section 8, which covers the [parameter conventions for nested forms](http://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions).
-  4. Read this blog post from [Peter Rhoades on working with nested forms](https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html).The example covers a lot of the things we’ve gone over so far, so follow along. Also note how he does the allowing of nested attributes in Rails 4.
+  1. Read the Same Rails Guide on Forms section 10, which covers [accepting nested form data](http://guides.rubyonrails.org/form_helpers.html#building-complex-forms).
+  1. Read the Same Rails Guide on Forms section 8, which covers the [parameter conventions for nested forms](http://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions).
+  1. Read this blog post from [Peter Rhoades on working with nested forms](https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html). The example covers a lot of the things we've gone over so far, so follow along. Also note how he does the allowing of nested attributes in Rails 4.
+
 </div>
 
-### Conclusion
+#### Conclusion
 
 We've covered two of the more common use cases for complex forms -- pre-populating a form with objects and creating multiple objects with a single form.  At this point, even if you're uncomfortable, you should have all the tools you need to work through creating a form.  We'll get your hands dirty in the project, have no fear.
 
@@ -186,19 +188,19 @@ The best part?  This is more or less the most complicated conceptual stuff with
 
 ### Knowledge check
 
-This section contains questions for you to check your understanding of this lesson on your own. If you’re having trouble answering a question, click it and review the material it links to.
+The following questions are an opportunity to reflect on key topics in this lesson. If you can't answer a question, click on it to review the material, but keep in mind you are not expected to memorize or master this knowledge.
 
-- <a class="knowledge-check-link" href='#prepopulating-select-tags-with-collections'>What does the `#select_tag` helper do?</a>
-- <a class="knowledge-check-link" href='#options-for-select'>When using `#options_for_select`, what format does the array need to be in?</a>
-- <a class="knowledge-check-link" href='#select-helper'>When would you use the `#select` helper?</a>
-- <a class="knowledge-check-link" href='#nested-forms'>How can you prevent users from having to submit multiple forms?</a>
-- <a class="knowledge-check-link" href='#accepts_nested_attributes_for'>What do you add to the model that allows nested forms to create new objects?</a>
-- <a class="knowledge-check-link" href='https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html'>How do you allow the nested parameters in your controller?</a>
- - <a class="knowledge-check-link" href='#miscellania-blank-submissions-that-mean-delete'>How can you set up a dropdown or checkbox to delete a record that already exists?</a>
+- [What does the `#select_tag` helper do?](#prepopulating-select-tags-with-collections)
+- [When using `#options_for_select`, what format does the array need to be in?](#options-for-select)
+- [When would you use the `#select` helper?](#select-helper)
+- [How can you prevent users from having to submit multiple forms?](#nested-forms)
+- [What do you add to the model that allows nested forms to create new objects?](#accepts-nested-attributes-for)
+- [How do you allow the nested parameters in your controller?](https://www.createdbypete.com/2014/04/04/working-with-nested-forms-and-a-many-to-many-association-in-rails-4.html)
+- [How can you set up a dropdown or checkbox to delete a record that already exists?](#miscellania-blank-submissions-that-mean-delete)
 
 ### Additional resources
 
-This section contains helpful links to related content. It isn’t required, so consider it supplemental.
+This section contains helpful links to related content. It isn't required, so consider it supplemental.
 
 - [Simple Form Documentation on GitHub](https://github.com/plataformatec/simple_form)
 - [`accepts_nested_attributes_for` documentation](http://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html)
diff --git a/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md b/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
index 58e1557a3e6..334ebb397c6 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/project_flight_booker.md
@@ -18,6 +18,7 @@ We'll be creating a one-way flight booker.  You'll get lots of practice populati
 This project will require you to seed your database, so use your `db/seeds.rb` file to write the code necessary to populate Airports and Flights.  One trick for toy apps like this (don't do it for production!) is to use the `db:seed:replant` task for simultaneously clearing the database and running your seeds file.  That way, when you create a new model or change how you want your sample data set up, you can just update the `seeds.rb` file and run `$ rake db:seed:replant` to have a clean slate of data.
 
 <div class="lesson-content__panel" markdown="1">
+
 #### Setup
 
 1. Think through the data architecture required to bring this to life.

From 7affc57edc61ccd5ee397534ba7d7dd461fb0104 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Wed, 17 Jul 2024 14:51:25 -0400
Subject: [PATCH 3/7] changed patch version 3.3.0 to 3.3.4 and line 329

---
 ruby/introduction/installing_ruby.md             | 16 ++++++++--------
 .../managing_ruby_projects.md                    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruby/introduction/installing_ruby.md b/ruby/introduction/installing_ruby.md
index 5d11c462b6f..35d9ff74109 100644
--- a/ruby/introduction/installing_ruby.md
+++ b/ruby/introduction/installing_ruby.md
@@ -109,7 +109,7 @@ It's finally time to install Ruby using `rbenv`!
 Inside the terminal, run this command:
 
 ```bash
-rbenv install 3.3.0 --verbose
+rbenv install 3.3.4 --verbose
 ```
 
 This command will take 10-15 minutes to complete. The `--verbose` flag will show you what's going on so you can be sure it hasn't gotten stuck. While it installs, take this time to watch [funny jumping goats video](https://youtu.be/X2CYWg9-2N0) or to get a glass of water.
@@ -135,7 +135,7 @@ git -C "$(rbenv root)"/plugins/ruby-build pull
 Once Ruby is installed, you need to tell rbenv which version to use by default. Inside the terminal, type:
 
 ```bash
-rbenv global 3.3.0
+rbenv global 3.3.4
 ```
 
 Then,
@@ -147,7 +147,7 @@ ruby -v
 The above command should return something similar to this:
 
 ```bash
-ruby 3.3.0pxx (20xx-xx-xx revision xxxxx) [x86_64-linux]
+ruby 3.3.4pxx (20xx-xx-xx revision xxxxx) [x86_64-linux]
 ```
 
 where x represents the version available at the time you installed Ruby.
@@ -256,7 +256,7 @@ You'll notice nothing happened in the terminal. That's okay and is typical respo
 
 #### Step 2.3: Install Ruby
 
-We can now (finally) install Ruby! Our curriculum currently uses version 3.3.0, which will allow you to complete this path's materials and content without error. We upgrade the material to accommodate newer versions as necessary. Without further ado, let's get going!
+We can now (finally) install Ruby! Our curriculum currently uses version 3.3.4, which will allow you to complete this path's materials and content without error. We upgrade the material to accommodate newer versions as necessary. Without further ado, let's get going!
 
 First, let's upgrade `ruby-build`:
 
@@ -267,7 +267,7 @@ brew upgrade ruby-build
 Now we're ready to install our desired version of Ruby:
 
 ```bash
-rbenv install 3.3.0 --verbose
+rbenv install 3.3.4 --verbose
 ```
 
 This command will take 10-15 minutes to complete. The `--verbose` flag will show you what's going on so you can be sure it hasn't gotten stuck. While it installs, take this time to watch [funny jumping goats video](https://www.youtube.com/watch?v=X2CYWg9-2N0) or to get a glass of water.
@@ -275,14 +275,14 @@ This command will take 10-15 minutes to complete. The `--verbose` flag will show
 Once Ruby is installed, you need to tell rbenv which version to use by default. Inside the terminal, type:
 
 ```bash
-rbenv global 3.3.0
+rbenv global 3.3.4
 ```
 
-You can double check that this worked by typing `ruby -v` and checking that the output says version 3.3.0:
+You can double check that this worked by typing `ruby -v` and checking that the output says version 3.3.4:
 
 ```bash
 ruby -v
-ruby 3.3.0pxx (20xx-xx-xx revision xxxxx) [x86_64-darwin18]
+ruby 3.3.4pxx (20xx-xx-xx revision xxxxx) [x86_64-darwin18]
 ```
 
 If you don't see the output above, close and reopen the terminal window and then run the command again.
diff --git a/ruby/object_oriented_programming_basics/managing_ruby_projects.md b/ruby/object_oriented_programming_basics/managing_ruby_projects.md
index 8b67d1eba67..af78e549315 100644
--- a/ruby/object_oriented_programming_basics/managing_ruby_projects.md
+++ b/ruby/object_oriented_programming_basics/managing_ruby_projects.md
@@ -326,7 +326,7 @@ So, if people behind a gem maintain it in line with semantic versioning, you can
 
 ### .ruby-version
 
-There's another important thing to give to folks that will run your code: the target Ruby version of your project. You can do it easily by running `rbenv local 3.2.2` as it creates a `.ruby-version` file with the version declared.
+There's another important thing to give to folks that will run your code: the target Ruby version of your project. You can do it easily by running `rbenv local 3.2.2` as it creates a `.ruby-version` file with the version declared - 3.2.2. Test the command out by using one of your rbenv installed Ruby versions. Run `rbenv versions` to see the list of Ruby versions you have installed.
 
 Many other tools recognize this to figure out what Ruby version your project is running - for example, `rbenv` will no longer use the `global` Ruby version and the `Ruby LSP` VSCode extension will also change its behavior.
 

From b730b691d95d4c0f22244f78bac7531753cdc9f0 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Thu, 18 Jul 2024 08:27:41 -0400
Subject: [PATCH 4/7] fixed lint error

---
 ruby/introduction/installing_ruby.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruby/introduction/installing_ruby.md b/ruby/introduction/installing_ruby.md
index 35d9ff74109..887aac6791c 100644
--- a/ruby/introduction/installing_ruby.md
+++ b/ruby/introduction/installing_ruby.md
@@ -1,4 +1,5 @@
-<!-- markdownlint-disable MD024 MD043 -->
+<!-- TODO: Revisit lesson/heading structure to remove need to disable rules -->
+<!-- markdownlint-disable MD024 TOP004 -->
 
 ### Introduction
 

From a7f9fb794b590b42dc1ccc350650df863c96d3ee Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Thu, 18 Jul 2024 10:27:40 -0400
Subject: [PATCH 5/7] pushing changes to forms_advanced

---
 ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
index 157184432e1..2d7627a8888 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
@@ -190,7 +190,7 @@ Sometimes Rails helper methods will do it for you, but make sure you know what y
 
 We've covered two of the more common use cases for complex forms -- pre-populating a form with objects and creating multiple objects with a single form.  At this point, even if you're uncomfortable, you should have all the tools you need to work through creating a form.  We'll get your hands dirty in the project, have no fear.
 
-The best part?  This is more or less the most complicated conceptual stuff with learning Rails.  Actually, it's not even really Rails-specific... once you're comfortable with the HTML that forms require and how the parameters get submitted to your controller, mapping that to the correct Rails conventions or helpers is the easy part.  So everything you've learned may just be transferrable to every form you'll ever make.
+The best part?  This is more or less the most complicated conceptual stuff with learning Rails.  Actually, it's not even really Rails-specific... once you're comfortable with the HTML that forms require and how the parameters get submitted to your controller, mapping that to the correct Rails conventions or helpers is the easy part. So everything you've learned may just be transferrable to every form you'll ever make.
 
 ### Knowledge check
 

From 7c5e132b69acf8c751eca9f014e82c8460c55c48 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Thu, 18 Jul 2024 10:30:29 -0400
Subject: [PATCH 6/7] final changes

---
 .../advanced_forms_and_activerecord/forms_advanced.md       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
index 2d7627a8888..17785f790c6 100644
--- a/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
+++ b/ruby_on_rails/advanced_forms_and_activerecord/forms_advanced.md
@@ -32,11 +32,7 @@ Let's say you want to build a New Post form for your blog but you want to be abl
 
 The bare HTML way is to build a bunch of `<option>` tags (inside your `<select>` tag).  You could easily create these in your ERB code by just iterating over some collection, for instance if you'd like to select a post to view from a list of them.
 
-<<<<<<< HEAD
-```html
-=======
 ```erb
->>>>>>> main
   # app/views/posts/new.html.erb
   ...
   <select name="user_id">
@@ -190,7 +186,7 @@ Sometimes Rails helper methods will do it for you, but make sure you know what y
 
 We've covered two of the more common use cases for complex forms -- pre-populating a form with objects and creating multiple objects with a single form.  At this point, even if you're uncomfortable, you should have all the tools you need to work through creating a form.  We'll get your hands dirty in the project, have no fear.
 
-The best part?  This is more or less the most complicated conceptual stuff with learning Rails.  Actually, it's not even really Rails-specific... once you're comfortable with the HTML that forms require and how the parameters get submitted to your controller, mapping that to the correct Rails conventions or helpers is the easy part. So everything you've learned may just be transferrable to every form you'll ever make.
+The best part?  This is more or less the most complicated conceptual stuff with learning Rails.  Actually, it's not even really Rails-specific... once you're comfortable with the HTML that forms require and how the parameters get submitted to your controller, mapping that to the correct Rails conventions or helpers is the easy part.  So everything you've learned may just be transferrable to every form you'll ever make.
 
 ### Knowledge check
 

From 1541a084047245d1b3910438b8ea5f936efa07e2 Mon Sep 17 00:00:00 2001
From: Della Maret <dellamaret01@gmail.com>
Date: Mon, 26 Aug 2024 13:41:22 -0400
Subject: [PATCH 7/7] fixed second image in assignment instructions

---
 foundations/html_css/flexbox/project-landing-page.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/foundations/html_css/flexbox/project-landing-page.md b/foundations/html_css/flexbox/project-landing-page.md
index 28e709058e5..c15ea4236fc 100644
--- a/foundations/html_css/flexbox/project-landing-page.md
+++ b/foundations/html_css/flexbox/project-landing-page.md
@@ -45,7 +45,7 @@ Once you have completed your project, feel free to look at the other solutions t
 
 Don't forget to commit early & often! You can [reference the Commit Message lesson](https://www.theodinproject.com/paths/foundations/courses/foundations/lessons/commit-messages)!
 
-1. Download the design images and take a look at what you're going to be creating here. [Image One (Full Design)](https://cdn.statically.io/gh/TheOdinProject/curriculum/81a5d553f4073e593d23a6ab00d50eef8620796d/foundations/html_css/project/imgs/01.png), [Image Two (Color and Fonts)](https://cdn.statically.io/gh/TheOdinProject/curriculum/81a5d553f4073e593d23a6ab00d50eef8620796d/foundations/html_css/project/imgs/02.png)
+1. Download the design images and take a look at what you're going to be creating here. [Image One (Full Design)](https://cdn.statically.io/gh/TheOdinProject/curriculum/81a5d553f4073e593d23a6ab00d50eef8620796d/foundations/html_css/project/imgs/01.png), [Image Two (Color and Fonts)](https://cdn.statically.io/gh/TheOdinProject/curriculum/69e40b6fcacf567f77243547b7f89df75dd8c3d0/foundations/html_css/project/imgs/02.png)
     1. The font that's being used in the images is `Roboto`.
     1. Hero text is the statement that appears at the top of a web page.
 1. There are many ways to tackle a project like this, and it can be overwhelming to look at a blank HTML document and not know where to start. Our suggestion: take it one section at a time. The website you're creating has 4 main sections (and a footer), so pick one and get it into pretty good shape before moving on. Starting at the top is always a solid plan.