Merge branch 'release/4.0' into release/4.1

pull/2851/head
Alex Coles 10 years ago
commit 89abfd100b
  1. 2
      doc/CONFIGURATION.md
  2. 2
      lib/redcloth3.rb

@ -78,7 +78,7 @@ storage config above like this:
* `autologin_cookie_secure` (default: false) * `autologin_cookie_secure` (default: false)
* `database_cipher_key` (default: nil) * `database_cipher_key` (default: nil)
* `scm_git_command` (default: 'git') * `scm_git_command` (default: 'git')
* `scm_subversion_command` (default: 'git') * `scm_subversion_command` (default: 'svn')
* `session_store`: `active_record_store`, `cache_store`, or `cookie_store` (default: cache_store) * `session_store`: `active_record_store`, `cache_store`, or `cookie_store` (default: cache_store)
* [`omniauth_direct_login_provider`](#omniauth-direct-login-provider) (default: nil) * [`omniauth_direct_login_provider`](#omniauth-direct-login-provider) (default: nil)
* [`disable_password_login`](#disable-password-login) (default: false) * [`disable_password_login`](#disable-password-login) (default: false)

@ -134,7 +134,7 @@
# #
# == Adding Tables # == Adding Tables
# #
# In Textile, simple tables can be added by seperating each column by # In Textile, simple tables can be added by separating each column by
# a pipe. # a pipe.
# #
# |a|simple|table|row| # |a|simple|table|row|

Loading…
Cancel
Save