Add 'asciidoc' to the ASCIIDoc possible extensions
Update settings.rst

Added missing CATEGORIES_URL and CATEGORIES_SAVE_AS settings to the table.
The modified attribute no longer has a default value.
This allows for templates using {% if article.modified %}
instead of {% if article.modified != article.published %} .
For creating a CNAME, directory name should be extra

The name of the directory do not match subsequent commands. hence renaming extras to extra. A one character change
Merge pull request #1163 from salilpa/patch-1

For creating a CNAME, directory name should be extra
Merge pull request #1147 from woshilapin/master

Add 'asciidoc' to the ASCIIDoc possible extensions
Add 'adoc' as a file extension for asciidoc

This is to match the behaviour that GitHub have
Merge pull request #1161 from florianjacob/modified_no_default

The modified attribute no longer has a default value.
Merge pull request #1159 from jcramb/patch-1

Add CATEGORIES_URL and CATEGORIES_SAVE_AS to docs
Added ARCHIVES_URL to settings.rst
Merge pull request #1168 from mitchtbaum/patch-1

Add ARCHIVES_URL to settings.rst
Produce inline links instead of references.
Merge pull request #642 from kdeldycke/inline-links-import

Remove `--reference-links` parameter from pelican-import