Merge remote-tracking branch 'origin' into 7.0.x

samples/client/petstore/haskell-http-client/docs/linuwial.css

@@ -755,7 +755,7 @@ table.info {
 
 /* @end */
 
-/* @group Auxillary Pages */
+/* @group Auxiliary Pages */
 
 
 .extension-list {

samples/client/petstore/haskell-http-client/docs/ocean.css

@@ -546,7 +546,7 @@ div#style-menu-holder {
 
 /* @end */
 
-/* @group Auxillary Pages */
+/* @group Auxiliary Pages */
 
 
 .extension-list {

samples/client/petstore/haskell-http-client/docs/openapi-petstore.txt

@@ -2434,7 +2434,7 @@ data GetInventory
 --   Find purchase order by ID
 --   
 --   For valid response try integer IDs with value <a>5 or</a> 10. Other
---   values will generated exceptions
+--   values will generate exceptions
 getOrderById :: Accept accept -> OrderId -> OpenAPIPetstoreRequest GetOrderById MimeNoContent Order accept
 data GetOrderById
 

samples/client/petstore/haskell-http-client/docs/src/OpenAPIPetstore.API.Store.html

@@ -143,7 +143,7 @@ forall {k} (t :: k). Proxy t
 </span><span id="line-102"></span><span class="hs-comment">-- </span><span>
 </span><span id="line-103"></span><span class="hs-comment">-- Find purchase order by ID</span><span>
 </span><span id="line-104"></span><span class="hs-comment">-- </span><span>
-</span><span id="line-105"></span><span class="hs-comment">-- For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</span><span>
+</span><span id="line-105"></span><span class="hs-comment">-- For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generate exceptions</span><span>
 </span><span id="line-106"></span><span class="hs-comment">-- </span><span>
 </span><span id="line-107"></span><span id="local-6989586621679163209"><span class="annot"><a href="OpenAPIPetstore.API.Store.html#getOrderById"><span class="hs-identifier hs-type">getOrderById</span></a></span><span>
 </span><span id="line-108"></span><span>  </span><span class="hs-glyph">::</span><span> </span><span class="annot"><a href="OpenAPIPetstore.MimeTypes.html#Accept"><span class="hs-identifier hs-type">Accept</span></a></span><span> </span><span class="annot"><a href="#local-6989586621679163209"><span class="hs-identifier hs-type">accept</span></a></span><span> </span><span class="hs-comment">-- ^ request accept ('MimeType')</span><span>

samples/client/petstore/haskell-http-client/example-app/Main.hs

@@ -70,7 +70,7 @@ runPet mgr config = do
   -- -- No instance for (S.Produces S.AddPet S.MimePlainText)
   -- addPetResponse <- S.dispatchLbs mgr config addPetRequest
 
-  -- inspect the AddPet type to see typeclasses indicating wihch
+  -- inspect the AddPet type to see typeclasses indicating which
   -- content-type and accept types (mimeTypes) are valid
 
   -- :i S.AddPet
@@ -122,7 +122,7 @@ runPet mgr config = do
                 }
         _ <- S.dispatchLbs mgr config updatePetRequest
 
-        -- requred parameters are included as function arguments, optional parameters are included with applyOptionalParam
+        -- required parameters are included as function arguments, optional parameters are included with applyOptionalParam
         -- inspect the UpdatePetWithForm type to see typeclasses indicating optional paramteters (:i S.UpdatePetWithForm)
         -- instance S.HasOptionalParam S.UpdatePetWithForm S.Name
         --   -- Defined in ‘OpenAPIPetstore.API’

samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/API/Store.hs

@@ -102,7 +102,7 @@ instance Produces GetInventory MimeJSON
 -- 
 -- Find purchase order by ID
 -- 
--- For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+-- For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
 -- 
 getOrderById
   :: Accept accept -- ^ request accept ('MimeType')

samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs

@@ -2430,6 +2430,19 @@ toOuterEnum = \case
 
 -- * Auth Methods
 
+-- ** AuthOAuthPetstoreAuth
+data AuthOAuthPetstoreAuth =
+  AuthOAuthPetstoreAuth Text -- ^ secret
+  deriving (P.Eq, P.Show, P.Typeable)
+
+instance AuthMethod AuthOAuthPetstoreAuth where
+  applyAuthMethod _ a@(AuthOAuthPetstoreAuth secret) req =
+    P.pure $
+    if (P.typeOf a `P.elem` rAuthTypes req)
+      then req `setHeader` toHeader ("Authorization", "Bearer " <> secret)
+           & L.over rAuthTypesL (P.filter (/= P.typeOf a))
+      else req
+
 -- ** AuthApiKeyApiKey
 data AuthApiKeyApiKey =
   AuthApiKeyApiKey Text -- ^ secret
@@ -2470,17 +2483,4 @@ instance AuthMethod AuthBasicHttpBasicTest where
       else req
     where cred = BC.append "Basic " (B64.encode $ BC.concat [ user, ":", pw ])
 
--- ** AuthOAuthPetstoreAuth
-data AuthOAuthPetstoreAuth =
-  AuthOAuthPetstoreAuth Text -- ^ secret
-  deriving (P.Eq, P.Show, P.Typeable)
-
-instance AuthMethod AuthOAuthPetstoreAuth where
-  applyAuthMethod _ a@(AuthOAuthPetstoreAuth secret) req =
-    P.pure $
-    if (P.typeOf a `P.elem` rAuthTypes req)
-      then req `setHeader` toHeader ("Authorization", "Bearer " <> secret)
-           & L.over rAuthTypesL (P.filter (/= P.typeOf a))
-      else req
-
 

samples/client/petstore/haskell-http-client/openapi.yaml

@@ -354,7 +354,7 @@ paths:
       - store
     get:
       description: For valid response try integer IDs with value <= 5 or > 10. Other
-        values will generated exceptions
+        values will generate exceptions
       operationId: getOrderById
       parameters:
       - description: ID of pet that needs to be fetched
@@ -641,7 +641,7 @@ paths:
       responses:
         "400":
           content: {}
-          description: Someting wrong
+          description: Something wrong
       summary: Fake endpoint to test group parameters (optional)
       tags:
       - fake