Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename issue #3039 #3048

Merged
merged 7 commits into from Apr 18, 2018
Merged

Conversation

Knapstad
Copy link
Contributor

@Knapstad Knapstad commented Apr 17, 2018

Pull Request Checklist

  • I’ve read the guidelines for contributing.
  • I updated AUTHORS.txt and CHANGES.txt (if the change is non-trivial) and documentation (if applicable).
  • I tested my changes.

Description

@Knapstad
Copy link
Contributor Author

Rename DISABLE_INDEXES_PLUGIN_* settings #3039

Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DISABLE_INDEXES_PLUGIN_INDEX_AND_ATOM_FEED is still mentioned in docs/creating-a-site.rst and docs/sphinx/creating-a-site.rst

AUTHORS.txt Outdated
@@ -1,4 +1,4 @@
* `Agustin Henze <https://github.com/agustinhenze>`_
* `Agustin Henze <https://github.com/agustinhenze>`_
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You inserted a UTF-8 BOM here (a hexdump shows that the file now starts with ef bb bf).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed this for now. In the future, please make sure your editor does not insert BOMs (never use notepad.exe to edit stuff like that)

https://en.wikipedia.org/wiki/Byte_order_mark

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Copy link
Member

@Kwpolska Kwpolska left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add warnings for both options, like we do on nikola.py line 714 for UNSLUGIFY_TITLES?

nikola/nikola.py Outdated
self.config['DISABLE_INDEXES'] = self.config['DISABLE_INDEXES_PLUGIN_INDEX_AND_ATOM_FEED']

if 'DISABLE_INDEXES_PLUGIN_RSS_FEED' in self.config:
utils.LOGGER.warn('The DISABLE_INDEXES_PLUGIN_RSS_FEED setting was renamed DISABLE_MAIN_RSS_FEED')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot one line here, but I’m going to add it myself.

Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Kwpolska
Copy link
Member

Thanks for contributing, @Knapstad!

@Kwpolska Kwpolska merged commit 8b15b50 into getnikola:master Apr 18, 2018
@Knapstad
Copy link
Contributor Author

@Kwpolska thank you for letting me :) and thanks for your patiens, its my first contribution out side my own projects

@Knapstad Knapstad deleted the Rename_Disable_Indexes branch April 19, 2018 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants