From: Nilgun Belma Buguner Date: Fri, 4 Feb 2011 08:19:21 +0000 (+0000) Subject: break lines in X-Git-Tag: 2.2.18~168 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d401105f3a2f4123e72124baf271c645c6f8aca4;p=thirdparty%2Fapache%2Fhttpd.git break lines in git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1067110 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 8814fb48018..39054ec1a94 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -39,7 +39,7 @@ authorization process. You will usually need to choose at least one module from each group.

    -
  • Authentication type (see the +
  • Authentication type (see the AuthType directive)
    • mod_auth_basic
    • @@ -57,7 +57,7 @@ module from each group.

    • mod_authnz_ldap
  • -
  • Authorization (see the +
  • Authorization (see the Require directive)
    • mod_authnz_ldap
    • @@ -153,7 +153,7 @@ module from each group.

      came with Apache. This will be located in the bin directory of wherever you installed Apache. If you have installed Apache from a third-party package, it may be in your execution path.

      - +

      To create the file, type:

      @@ -261,24 +261,24 @@ that several criteria may be considered when trying to decide if a particular us will be granted admission. Satisfy can take as an argument one of two options - all or any. By default, it is assumed that the value is all. This means that if several criteria are specified, then all of them must be met in order for someone to get in. -However, if set to any, then several criteria may be specified, but if +However, if set to any, then several criteria may be specified, but if the user satisfies any of these, then they will be granted entrance.

      -

      An example of this is using access control to assure that, although a resource +

      An example of this is using access control to assure that, although a resource is password protected from outside your network, all hosts inside the network will be given unauthenticated access to the resource. This would be accomplished by using the Satisfy directive, as shown below.

      -<Directory /usr/local/apache/htdocs/sekrit> - AuthType Basic - AuthName intranet - AuthUserFile /www/passwd/users - AuthGroupFile /www/passwd/groups - Require group customers - Order allow,deny - Allow from internal.com - Satisfy any +<Directory /usr/local/apache/htdocs/sekrit>
      + AuthType Basic
      + AuthName intranet
      + AuthUserFile /www/passwd/users
      + AuthGroupFile /www/passwd/groups
      + Require group customers
      + Order allow,deny
      + Allow from internal.com
      + Satisfy any
      </Directory>
      @@ -408,11 +408,11 @@ person in contain some more information about how this all works. mod_authn_alias can also help in simplifying certain authentication configurations.

      - +

      The various ciphers supported by Apache for authentication data are explained in Password Encryptions.

      - +

      And you may want to look at the Access Control howto, which discusses a number of related topics.