mirror of
				https://github.com/django/django.git
				synced 2025-10-30 23:47:49 +03:00 
			
		
		
		
	Made small formatting tweaks to docs/settings.txt and docs/email.txt changes from [5111]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
		
							parent
							
								
									ec577d88ea
								
							
						
					
					
						commit
						812c261006
					
				|  | @ -22,8 +22,7 @@ In two lines:: | ||||||
| 
 | 
 | ||||||
| Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ | Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ | ||||||
| and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ | and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ | ||||||
| settings, if set, will be used to authenticate to the | settings, if set, will be used to authenticate to the SMTP server. | ||||||
| SMTP server. |  | ||||||
| 
 | 
 | ||||||
| .. note:: | .. note:: | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -396,8 +396,9 @@ EMAIL_HOST_PASSWORD | ||||||
| Default: ``''`` (Empty string) | Default: ``''`` (Empty string) | ||||||
| 
 | 
 | ||||||
| Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is | Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is | ||||||
| used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server. | used in conjunction with ``EMAIL_HOST_USER`` when authenticating to the SMTP | ||||||
| If either of these settings is empty, Django won't attempt authenticaion. | server. If either of these settings is empty, Django won't attempt | ||||||
|  | authenticaion. | ||||||
| 
 | 
 | ||||||
| See also ``EMAIL_HOST_USER``. | See also ``EMAIL_HOST_USER``. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user