From fa6dc5901a05300bfb4a78c55c16c2f4fa78e182 Mon Sep 17 00:00:00 2001 From: WrathZA Date: Wed, 25 Jul 2018 09:41:04 +0200 Subject: [PATCH] Spelling in documentation. (#491) * Minor spelling issues * spelling --- docs/features/administration.rst | 4 ++-- docs/features/claimstransformation.rst | 16 ++++++++-------- docs/features/middlewareinjection.rst | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/features/administration.rst b/docs/features/administration.rst index dd08feabd..3afcbdee2 100644 --- a/docs/features/administration.rst +++ b/docs/features/administration.rst @@ -62,7 +62,7 @@ will need to be changed if you are running Ocelot on a different url to http://l The scripts show you how to request a bearer token from ocelot and then use it to GET the existing configuration and POST a configuration. -If you are running multiple Ocelot's in a cluster then you need to use a certificate to sign the bearer tokens used to access the administration API. +If you are running multiple Ocelot instances in a cluster then you need to use a certificate to sign the bearer tokens used to access the administration API. In order to do this you need to add two more environmental variables for each Ocelot in the cluster. @@ -71,7 +71,7 @@ In order to do this you need to add two more environmental variables for each Oc ``OCELOT_CERTIFICATE_PASSWORD`` The password for the certificate. -Normally Ocelot just uses temporary signing credentials but if you set these environmental variables then it will use the certificate. If all the other Ocelots in the cluster have the same certificate then you are good! +Normally Ocelot just uses temporary signing credentials but if you set these environmental variables then it will use the certificate. If all the other Ocelot instances in the cluster have the same certificate then you are good! Administration API diff --git a/docs/features/claimstransformation.rst b/docs/features/claimstransformation.rst index e17e1aa70..ea45f46f5 100644 --- a/docs/features/claimstransformation.rst +++ b/docs/features/claimstransformation.rst @@ -7,13 +7,13 @@ parameters and other claims. This is only available once a user has been authent After the user is authenticated we run the claims to claims transformation middleware. This allows the user to transform claims before the authorisation middleware is called. After the user is authorised first we call the claims to headers middleware and Finally -the claims to query strig parameters middleware. +the claims to query string parameters middleware. -The syntax for performing the transforms is the same for each proces. In the ReRoute +The syntax for performing the transforms is the same for each process. In the ReRoute configuration a json dictionary is added with a specific name either AddClaimsToRequest, AddHeadersToRequest, AddQueriesToRequest. -Note I'm not a hotshot programmer so have no idea if this syntax is good.. +Note: I'm not a hotshot programmer so have no idea if this syntax is good... Within this dictionary the entries specify how Ocelot should transform things! The key to the dictionary is going to become the key of either a claim, header @@ -23,12 +23,12 @@ The value of the entry is parsed to logic that will perform the transform. First all a dictionary accessor is specified e.g. Claims[CustomerId]. This means we want to access the claims and get the CustomerId claim type. Next is a greater than (>) symbol which is just used to split the string. The next entry is either value or value with -and indexer. If value is specifed Ocelot will just take the value and add it to the +and indexer. If value is specified Ocelot will just take the value and add it to the transform. If the value has an indexer Ocelot will look for a delimiter which is provided after another greater than symbol. Ocelot will then split the value on the delimiter and add whatever was at the index requested to the transform. -Claims to Claims Tranformation +Claims to Claims Transformation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Below is an example configuration that will transforms claims to claims @@ -54,10 +54,10 @@ Below is an example configuration that will transforms claims to headers "CustomerId": "Claims[sub] > value[1] > |" } -This shows a transform where Ocelot looks at the users sub claim and trasnforms it into a +This shows a transform where Ocelot looks at the users sub claim and transforms it into a CustomerId header. Assuming the sub looks like this "usertypevalue|useridvalue". -Claims to Query String Parameters Tranformation +Claims to Query String Parameters Transformation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Below is an example configuration that will transforms claims to query string parameters @@ -68,5 +68,5 @@ Below is an example configuration that will transforms claims to query string pa "LocationId": "Claims[LocationId] > value", } -This shows a transform where Ocelot looks at the users LocationId claim and add its as +This shows a transform where Ocelot looks at the users LocationId claim and add it as a query string parameter to be forwarded onto the downstream service. \ No newline at end of file diff --git a/docs/features/middlewareinjection.rst b/docs/features/middlewareinjection.rst index 44f44fb33..4b6636582 100644 --- a/docs/features/middlewareinjection.rst +++ b/docs/features/middlewareinjection.rst @@ -4,8 +4,8 @@ Middleware Injection and Overrides Warning use with caution. If you are seeing any exceptions or strange behavior in your middleware pipeline and you are using any of the following. Remove them and try again! -When setting up Ocelot in your Startup.cs you can provide some additonal middleware -and override middleware. This is done as follos. +When setting up Ocelot in your Startup.cs you can provide some additional middleware +and override middleware. This is done as follows. .. code-block:: csharp @@ -20,7 +20,7 @@ and override middleware. This is done as follos. app.UseOcelot(configuration); In the example above the provided function will run before the first piece of Ocelot middleware. -This allows a user to supply any behaviours they want before and after the Ocelot pipeline has run. +This allows a user to supply any behaviors they want before and after the Ocelot pipeline has run. This means you can break everything so use at your own pleasure! The user can set functions against the following. @@ -35,7 +35,7 @@ The user can set functions against the following. * AuthorisationMiddleware - This overrides Ocelots authorisation middleware. -* PreQueryStringBuilderMiddleware - This alows the user to manipulate the query string on the http request before it is passed to Ocelots request creator. +* PreQueryStringBuilderMiddleware - This allows the user to manipulate the query string on the http request before it is passed to Ocelots request creator. Obviously you can just add middleware as normal before the call to app.UseOcelot() It cannot be added after as Ocelot does not call the next middleware.