Skip to content

Commit

Permalink
Fix inline HTML
Browse files Browse the repository at this point in the history
  • Loading branch information
wolf99 committed Apr 23, 2022
1 parent 3f42fce commit e78add7
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 26 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Git Credential Manager is currently available for Windows, macOS, and Linux\*. G

Feature|Windows|macOS|Linux
-|:-:|:-:|:-:
Installer/uninstaller|✓|✓|✓
Secure platform credential storage|&#10003;<br/>[(see more)](docs/credstores.md)|&#10003;<br/>[(see more)](docs/credstores.md)|&#10003;<br/>[(see more)](docs/credstores.md)
Installer/uninstaller|&#10003;|&#10003;|&#10003;\*
Secure platform credential storage|&#10003; [(see more)](docs/credstores.md)|&#10003; [(see more)](docs/credstores.md)|&#10003; [(see more)](docs/credstores.md)
Multi-factor authentication support for Azure DevOps|&#10003;|&#10003;|&#10003;
Two-factor authentication support for GitHub|&#10003;|&#10003;|&#10003;
Two-factor authentication support for Bitbucket|&#10003;|&#10003;|&#10003;
Expand Down Expand Up @@ -86,8 +86,6 @@ sudo /usr/local/share/gcm-core/uninstall.sh

---

<!-- this explicit anchor should stay stable so that external docs can link here -->
<a name="linux-install-instructions"></a>
### Linux

#### Experimental: install from source helper script
Expand Down
18 changes: 9 additions & 9 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ The following table summarizes the change in behavior and the mapping of older v
Value(s)|Old meaning|New meaning
-|-|-
`auto`|Prompt if required – use cached credentials if possible|_(unchanged)_
`never`,<br/>`false`| Never prompt – fail if interaction is required|_(unchanged)_
`always`,<br/>`force`,<br/>`true`|Always prompt – don't use cached credentials|Prompt if required (same as the old `auto` value)
`never`, `false`| Never prompt – fail if interaction is required|_(unchanged)_
`always`, `force`, `true`|Always prompt – don't use cached credentials|Prompt if required (same as the old `auto` value)

#### Example

Expand All @@ -64,7 +64,7 @@ ID|Provider
`azure-repos`|Azure Repos
`github`|GitHub
`bitbucket`|Bitbucket
`gitlab`|GitLab<br/>_(supports OAuth in browser, personal access token and Basic Authentication)_
`gitlab`|GitLab _(supports OAuth in browser, personal access token and Basic Authentication)_
`generic`|Generic (any other provider not listed above)

Automatic provider selection is based on the remote URL.
Expand Down Expand Up @@ -92,11 +92,11 @@ Select the host provider to use when authenticating by which authority is suppor
Authority|Provider(s)
-|-
`auto` _(default)_|_\[automatic\]_
`msa`, `microsoft`, `microsoftaccount`,<br/>`aad`, `azure`, `azuredirectory`,</br>`live`, `liveconnect`, `liveid`|Azure Repos<br/>_(supports Microsoft Authentication)_
`github`|GitHub<br/>_(supports GitHub Authentication)_
`bitbucket`|Bitbucket.org<br/>_(supports Basic Authentication and OAuth)_<br/>Bitbucket Server<br/>_(supports Basic Authentication)_
`gitlab`|GitLab<br/>_(supports OAuth in browser, personal access token and Basic Authentication)_
`basic`, `integrated`, `windows`, `kerberos`, `ntlm`,<br/>`tfs`, `sso`|Generic<br/>_(supports Basic and Windows Integrated Authentication)_
`msa`, `microsoft`, `microsoftaccount`, `aad`, `azure`, `azuredirectory`, `live`, `liveconnect`, `liveid`|Azure Repos _(supports Microsoft Authentication)_
`github`|GitHub _(supports GitHub Authentication)_
`bitbucket`|Bitbucket.org _(supports Basic Authentication and OAuth)_, Bitbucket Server _(supports Basic Authentication)_
`gitlab`|GitLab _(supports OAuth in browser, personal access token and Basic Authentication)_
`basic`, `integrated`, `windows`, `kerberos`, `ntlm`, `tfs`, `sso`|Generic _(supports Basic and Windows Integrated Authentication)_

#### Example

Expand Down Expand Up @@ -320,7 +320,7 @@ Default value on Windows is `wincredman`, on macOS is `keychain`, and is unset o

Value|Credential Store|Platforms
-|-|-
_(unset)_|Windows: `wincredman`<br/>macOS: `keychain`<br/>Linux: _(none)_|-
_(unset)_|Windows: `wincredman`, macOS: `keychain`, Linux: _(none)_|-
`wincredman`|Windows Credential Manager (not available over SSH).|Windows
`dpapi`|DPAPI protected files. Customize the DPAPI store location with [credential.dpapiStorePath](#credentialdpapistorepath)|Windows
`keychain`|macOS Keychain.|macOS
Expand Down
16 changes: 8 additions & 8 deletions docs/environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ The following table summarizes the change in behavior and the mapping of older v
Value(s)|Old meaning|New meaning
-|-|-
`auto`|Prompt if required – use cached credentials if possible|_(unchanged)_
`never`,<br/>`false`| Never prompt – fail if interaction is required|_(unchanged)_
`always`,<br/>`force`,<br/>`true`|Always prompt – don't use cached credentials|Prompt if required (same as the old `auto` value)
`never`, `false`| Never prompt – fail if interaction is required|_(unchanged)_
`always`, `force`, `true`|Always prompt – don't use cached credentials|Prompt if required (same as the old `auto` value)

#### Example

Expand Down Expand Up @@ -169,7 +169,7 @@ ID|Provider
`auto` _(default)_|_\[automatic\]_ ([learn more](autodetect.md))
`azure-repos`|Azure Repos
`github`|GitHub
`gitlab`|GitLab<br/>_(supports OAuth in browser, personal access token and Basic Authentication)_
`gitlab`|GitLab _(supports OAuth in browser, personal access token and Basic Authentication)_
`generic`|Generic (any other provider not listed above)

Automatic provider selection is based on the remote URL.
Expand Down Expand Up @@ -205,10 +205,10 @@ Select the host provider to use when authenticating by which authority is suppor
Authority|Provider(s)
-|-
`auto` _(default)_|_\[automatic\]_
`msa`, `microsoft`, `microsoftaccount`,<br/>`aad`, `azure`, `azuredirectory`,</br>`live`, `liveconnect`, `liveid`|Azure Repos<br/>_(supports Microsoft Authentication)_
`github`|GitHub<br/>_(supports GitHub Authentication)_
`gitlab`|GitLab<br/>_(supports OAuth in browser, personal access token and Basic Authentication)_
`basic`, `integrated`, `windows`, `kerberos`, `ntlm`,<br/>`tfs`, `sso`|Generic<br/>_(supports Basic and Windows Integrated Authentication)_
`msa`, `microsoft`, `microsoftaccount`, `aad`, `azure`, `azuredirectory`, `live`, `liveconnect`, `liveid`|Azure Repos _(supports Microsoft Authentication)_
`github`|GitHub _(supports GitHub Authentication)_
`gitlab`|GitLab _(supports OAuth in browser, personal access token and Basic Authentication)_
`basic`, `integrated`, `windows`, `kerberos`, `ntlm`, `tfs`, `sso`|Generic _(supports Basic and Windows Integrated Authentication)_

#### Example

Expand Down Expand Up @@ -500,7 +500,7 @@ Default value on Windows is `wincredman`, on macOS is `keychain`, and is unset o

Value|Credential Store|Platforms
-|-|-
_(unset)_|Windows: `wincredman`<br/>macOS: `keychain`<br/>Linux: _(none)_|-
_(unset)_|Windows: `wincredman`, macOS: `keychain`, Linux: _(none)_|-
`wincredman`|Windows Credential Manager (not available over SSH).|Windows
`dpapi`|DPAPI protected files. Customize the DPAPI store location with [`GCM_DPAPI_STORE_PATH`](#gcm_dpapi_store_path)|Windows
`keychain`|macOS Keychain.|macOS
Expand Down
2 changes: 1 addition & 1 deletion docs/github-apideprecation.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ There is a workaround which should work and doesn't require installing anything.
```

You will be prompted to enter a password – copy the newly generated PAT in
step 4 and paste it here, and press <kbd>Enter</kbd>
step 4 and paste it here, and press the `Enter` key

![image](https://user-images.githubusercontent.com/5658207/95448479-4fc64580-095b-11eb-9970-0b6faf7f4ae7.png)

Expand Down
6 changes: 3 additions & 3 deletions docs/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Because both Basic HTTP authentication and Windows Integrated Authentication (WI

The following table shows the correct replacement for all legacy authorities values:

GCM_AUTHORITY<br/>(credential.authority)|&rarr;|GCM_PROVIDER<br/>(credential.provider)|GCM_ALLOW_WINDOWSAUTH<br/>(credential.allowWindowsAuth)
GCM_AUTHORITY (credential.authority)|&rarr;|GCM_PROVIDER (credential.provider)|GCM_ALLOW_WINDOWSAUTH (credential.allowWindowsAuth)
-|-|-|-
`msa`, `microsoft`, `microsoftaccount`,<br/>`aad`, `azure`, `azuredirectory`,</br>`live`, `liveconnect`, `liveid`|&rarr;|`azure-repos`|_N/A_
`msa`, `microsoft`, `microsoftaccount`, `aad`, `azure`, `azuredirectory`, `live`, `liveconnect`, `liveid`|&rarr;|`azure-repos`|_N/A_
`github`|&rarr;|`github`|_N/A_
`basic`|&rarr;|`generic`|`false`
`integrated`, `windows`, `kerberos`, `ntlm`,<br/>`tfs`, `sso`|&rarr;|`generic`|`true` _(default)_
`integrated`, `windows`, `kerberos`, `ntlm`, `tfs`, `sso`|&rarr;|`generic`|`true` _(default)_

For example if you had previous set the authority for the `example.com` host to `basic`..

Expand Down
2 changes: 1 addition & 1 deletion docs/wsl.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ installation, and not shared with others or the Windows host.
Yes. Rather than install GCM as a Windows application (and have WSL Git invoke
the Windows GCM), can you install GCM as a Linux application instead.

To do this, simply follow the [GCM installation instructions for Linux](../README.md#linux-install-instructions).
To do this, simply follow the [GCM installation instructions for Linux](../README.md#linux).

**Note:** In this scenario, because GCM is running as a Linux application
it cannot utilize authentication or credential storage features of the host
Expand Down

0 comments on commit e78add7

Please sign in to comment.