Repository: phoenixframework/phoenix
Pull request #3984 (2020-09-08 05:30:47)

Fix broken link to Gettext in docs
Use the correct link to Gettext under the Plug section in the guides.


Patch:
diff --git a/README.md b/README.md
index 54c333a1d..17e603957 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 ![phoenix logo](https://raw.githubusercontent.com/phoenixframework/phoenix/master/priv/static/phoenix.png)
-> ### Productive. Reliable. Fast.
-> A productive web framework that does not compromise speed or maintainability.
+> Peace of mind from prototype to production.
 
 [![Build Status](https://github.com/phoenixframework/phoenix/workflows/CI/badge.svg)](https://github.com/phoenixframework/phoenix/actions?query=workflow%3ACI)
 [![Inline docs](http://inch-ci.org/github/phoenixframework/phoenix.svg)](http://inch-ci.org/github/phoenixframework/phoenix)
diff --git a/guides/controllers.md b/guides/controllers.md
index 23b0398c7..8b1ee409a 100644
--- a/guides/controllers.md
+++ b/guides/controllers.md
@@ -363,7 +363,7 @@ When we reload our [Welcome Page](http://localhost:4000), we see that we've been
 
 If we care to, we can open up our developer tools, click on the network tab, and visit our root route again. We see two main requests for this page - a get to `/` with a status of `302`, and a get to `/redirect_test` with a status of `200`.
 
-Notice that the redirect function takes `conn` as well as a string representing a relative path within our application. For security reasons, the `:to` helper can only redirect for paths within your appplication. If you want to redirect to a fully-qualified path or an external URL, you should use `:external` instead:
+Notice that the redirect function takes `conn` as well as a string representing a relative path within our application. For security reasons, the `:to` helper can only redirect for paths within your application. If you want to redirect to a fully-qualified path or an external URL, you should use `:external` instead:
 
 ```elixir
 def index(conn, _params) do
diff --git a/guides/deployment/releases.md b/guides/deployment/releases.md
index d4cf1463f..289d960ef 100644
--- a/guides/deployment/releases.md
+++ b/guides/deployment/releases.md
@@ -85,7 +85,7 @@ Release created at _build/prod/rel/my_app!
     _build/prod/rel/my_app/bin/my_app start
 ```
 
-And starting the release now should also successfully start the web server! Now you can get all of the files under the `_build/prod/rel/my_app` directory, package it, and run it in any production machine with the same OS and archictecture as the one that assembled the release. For more details, check the [docs for `mix release`](https://hexdocs.pm/mix/Mix.Tasks.Release.html).
+And starting the release now should also successfully start the web server! Now you can get all of the files under the `_build/prod/rel/my_app` directory, package it, and run it in any production machine with the same OS and architecture as the one that assembled the release. For more details, check the [docs for `mix release`](https://hexdocs.pm/mix/Mix.Tasks.Release.html).
 
 But before we finish this guide, there are two features from releases most Phoenix applications will use, so let's talk about those.
 
diff --git a/guides/plug.md b/guides/plug.md
index d18c88bff..e8aa98e62 100644
--- a/guides/plug.md
+++ b/guides/plug.md
@@ -118,7 +118,7 @@ To see the assign in action, go to the layout in "lib/hello_web/templates/layout
   <p>Locale: <%= @locale %></p>
 ```
 
-Go to "http://localhost:4000/" and you should see the locale exhibited. Visit "http://localhost:4000/?locale=fr" and you should see the assign changed to "fr". Someone can use this information alongside [Gettext](https://hexdocs.pm/gettext/Gettext) to provide a fully internationalized web application.
+Go to "http://localhost:4000/" and you should see the locale exhibited. Visit "http://localhost:4000/?locale=fr" and you should see the assign changed to "fr". Someone can use this information alongside [Gettext](https://hexdocs.pm/gettext/Gettext.html) to provide a fully internationalized web application.
 
 That's all there is to Plug. Phoenix embraces the plug design of composable transformations all the way up and down the stack. Let's see some examples!
 
diff --git a/installer/templates/phx_umbrella/config/dev.exs b/installer/templates/phx_umbrella/config/dev.exs
index b3471eeb1..04bd9c0b4 100644
--- a/installer/templates/phx_umbrella/config/dev.exs
+++ b/installer/templates/phx_umbrella/config/dev.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # Do not include metadata nor timestamps in development logs
 config :logger, :console, format: "[$level] $message\n"
diff --git a/installer/templates/phx_umbrella/config/prod.secret.exs b/installer/templates/phx_umbrella/config/prod.secret.exs
index a6ed850f2..fe0a69212 100644
--- a/installer/templates/phx_umbrella/config/prod.secret.exs
+++ b/installer/templates/phx_umbrella/config/prod.secret.exs
@@ -2,4 +2,4 @@
 # from environment variables. You can also hardcode secrets,
 # although such is generally not recommended and you have to
 # remember to add this file to your .gitignore.
-use Mix.Config
+import Config
diff --git a/lib/phoenix/presence.ex b/lib/phoenix/presence.ex
index b357e65ec..c109a637b 100644
--- a/lib/phoenix/presence.ex
+++ b/lib/phoenix/presence.ex
@@ -165,7 +165,7 @@ defmodule Phoenix.Presence do
     {:error, reason :: term()}
 
   @doc """
-  Track an arbitary process as a presence.
+  Track an arbitrary process as a presence.
 
   Same with `track/3`, except track any process by `topic` and `key`.
   """
@@ -196,7 +196,7 @@ defmodule Phoenix.Presence do
   @doc """
   Update a process presence's metadata.
 
-  Same as `update/3`, but with an arbitary process.
+  Same as `update/3`, but with an arbitrary process.
   """
   @callback update(pid, topic, key :: String.t, meta :: map() | (map() -> map())) ::
     {:ok, ref :: binary()} |


Test patch:
diff --git a/test/support/websocket_client.exs b/test/support/websocket_client.exs
index 82c7aaecc..2438abd52 100644
--- a/test/support/websocket_client.exs
+++ b/test/support/websocket_client.exs
@@ -84,7 +84,7 @@ defmodule Phoenix.Integration.WebsocketClient do
     {:ok, state}
   end
 
-  # The websocket client always sends a payload, even when none is explictly set
+  # The websocket client always sends a payload, even when none is explicitly set
   # on the frame.
   def websocket_handle({opcode, msg}, _conn_state, state) when opcode in [:ping, :pong] do
     send(state.sender, {:control, opcode, msg})