Commit Graph

95 Commits

Author SHA1 Message Date
Dougal Matthews
176b722c1c Merge pull request #947 from waylan/template
Support theme customization with blocks
2016-05-31 10:28:24 +01:00
Brian J King
6b892249bc Fix typo in scp command
scp -r ./site command was missing the E in user.
2016-05-27 14:53:25 -05:00
Waylan Limberg
37a542cdb2 Improve documentation regarding template blocks. 2016-05-27 11:06:04 -04:00
Waylan Limberg
3c6504fd7d Support theme customization with template blocks
This is a backward incompatable change as it switches the primary
template from base.html to main.html.  See the release notes for
details.

Partially addresses #607.
2016-05-27 11:03:52 -04:00
Saurabh Kumar
72e3992188 Fix minor typo in documentation 2016-05-11 22:59:03 +05:30
Waylan Limberg
f8a0ac6e03 Refactor page specific template variables.
A deprecation warning is issued for all old variables and all new
page specific variables are attributes of the 'page' object.

Global variables are uneffected, except page_description.

See the changes described in the release notes for details.

Fixes #874.
2016-05-01 19:40:00 -04:00
Dougal Matthews
b2cb385db3 Merge pull request #911 from waylan/theme-docs
Document theme_dir. Fixes #863
2016-04-29 15:42:22 +01:00
Dougal Matthews
d8d8341808 Fix the feedback from LinkChecker and enforce it in the Travis config 2016-04-29 11:09:48 +01:00
Waylan Limberg
4bb0c1cb1a Document theme_dir. Fixes #863 2016-04-27 11:49:37 -04:00
Jean Cruypenynck
4e889c451f Fix Markdown table syntax 2016-04-11 20:20:04 +02:00
Dougal Matthews
cc1c9a3adb Remove external themes from MkDocs
This change removes the dependency on mkdocs-bootstrap and mkdocs-bootswatch.
It also updates all references in the code. The only remaining connection is
when a user specifies one of these themes but they are not installed they get
slightly helpful error.
2016-03-01 10:53:02 +00:00
lesleyauk
99d118f15f Fix "bootstrap" -> "bootswatch"
Also improved readability.
2016-02-26 18:30:19 +00:00
Waylan Limberg
c84cb0ce03 More docs cleanup for Markdown linter 2015-08-13 10:18:35 -04:00
Waylan Limberg
bd33c4b76b Corrected lint errors in Markdown docs.
Also added README.md and CONTRIBUTING.md to the linter.

Note, that I am still getting one failer (in two locations). However
I consider that failer a bug in the linter and have reported it
upstream. We could disable that Rule (MD031), but as we are not
requiring the lint rules to pass presently, I just left it alone.

Also, while the code linter is set to allow lines 119 chars long,
I am using the Markdown linter's default of 80. Prose is easier to
read with shorter line lenghts, so I think it makes more sense to
use the default. Also, changing the default would have required
adding a config file. Adding a Ruby file for only one minor setting
seems silly, so I left it alone.
2015-08-13 10:18:34 -04:00
Bruno Oliveira
ab89b36f54 minor typo: filies -> files 2015-08-06 22:42:40 -03:00
Dougal Matthews
3c13f2a70f Add examples demonstrating the extra config options 2015-06-28 10:27:01 +01:00
Dougal Matthews
43c64ab766 Add a comment about using the mkdocs-basic theme 2015-06-27 23:05:20 +01:00
Dougal Matthews
463075c5da Remove an outdated remark in the documentation 2015-06-27 23:04:58 +01:00
Dougal Matthews
44fc6d9230 Added docuementation for packaging themes 2015-06-27 11:03:30 +01:00
Harri Berglund
b33f6e6d64 Update deploying-your-docs.md
Fix some typos.

[ci skip]
2015-06-15 22:09:09 +03:00
Dougal Matthews
3f89332156 Link to the Markdown, not the built output location
This means the links will work in GitHub etc.
2015-06-11 09:59:56 +01:00
Dougal Matthews
dfc14183aa Don't populate extra_templates be default
This is causing a number of users issues. So, this will now be a opt-in
feature only.

Fixes #616
2015-06-08 16:19:11 +01:00
Dougal Matthews
867d9bc529 Document extra_templates
Fixes #609
2015-06-07 15:18:14 +01:00
Dougal Matthews
d80474ac0c Merge pull request #604 from d0ugal/gh-deploy
Remove ghp-import dependency and update gh-deploy
2015-06-07 12:15:43 +01:00
Sam Hatfield
4948ef9a3a Updated documentation on pages configuration.
It now better reflects the new pages configuration format. The pages section
in `configuration.md` was also reduced to a summary, with most of the
details now in `writing-your-docs.md`. Also fixed a few typos.
2015-06-06 23:20:53 +01:00
Dougal Matthews
eecd83b998 Refactor gh-deploy and remove ghp-import requirement
This change modifies ghp-import to be a library and uses it instead of
calling the package with subprocess.

Fixes #598
Fixes #547
2015-06-06 10:17:26 +01:00
Dougal Matthews
87a96bda51 Cover the metadata extension in the custom theme area
Closes #188
2015-06-06 08:50:33 +01:00
Dougal Matthews
f00ca8982b Merge pull request #602 from trel/patch-4
remove more lorem ipsum
2015-06-06 07:16:28 +01:00
Terrell Russell
bbe7ec8b23 remove more lorem ipsum
additional cruft...
2015-06-05 20:25:01 -04:00
Terrell Russell
d5743c0e29 remove lorem ipsum
requested in #599
2015-06-05 20:23:18 -04:00
Dougal Matthews
53fb2cffb8 Fixed link 2015-06-04 10:11:54 +01:00
Ankur Dedania
94527677ba Update deploying-your-docs.md
Fix url
2015-06-03 18:52:10 -05:00
Waylan Limberg
2d7fd14dca Removed list of common hosts per @d0ugal's request. 2015-05-28 10:15:01 -04:00
Waylan Limberg
f7be6c7282 Add "Deploying your Docs" page to the User Guide.
Fixed #477
2015-05-28 10:11:47 -04:00
Terrell Russell
c055f6def4 typos 2015-05-26 20:31:26 -04:00
Waylan Limberg
a6fc4f9420 Refactor Markdown Extension Options Config.
Config validation now handles all extension processing:

* Builtin extensions are defined and within the default scheme.
* User extensions are defined only as a list in the config. Note, this is
  a backward incompatable change from the previous (short-lived) release.
* The users extensions are added to the list of builtins.
* Any duplicates are accounted for in validation.
* Extension options are supported by a child key/value pair on the ext name.
* All extension options are compiled into a format Markdown accepts
  within the validation process and are saved to the internal `mdx_configs`
  config setting.
* The `mdx_configs` setting is private and raises an error if set by the user.
* A whole suite of tests were added to test all aspects of ext validation.

All relevant build tests were updated to pass the config to
`build.convert_markdown` as the config now handles all extension data.

The relevant documentation was updated to reflect the changes. While I was
at it, I spellchecked the entire document and made a few additional formatting
changes.

This fixes #519 plus a lot more.
2015-05-16 10:40:55 -04:00
Dougal Matthews
93a181a208 Merge pull request #516 from mbacho/master
Adding custom commit message option to gh_deploy
2015-05-15 11:16:17 +01:00
Chomba Ng'ang'a
0d2c63b97d Small fixes to gh-deploy command
Rename CLI option 'branch' to 'remote-branch'
Pass CLI remote-branch option value to load_config instead of gh_deploy in cli.py
Update documentation
2015-05-15 12:56:05 +03:00
Chomba Ng'ang'a
955abb678a Add documentation on remote_branch config option 2015-05-14 19:38:53 +03:00
Dougal Matthews
072eb41c01 Expose the full config to templates rather than extra directly.
This update changes cf10026 so that templates must now access extra with
{{ config.something }} rather than just {{ extra.something }}.
2015-05-12 07:26:33 +01:00
Dougal Matthews
cf10026b28 Add extra config to support global template vars
This change adds a new configuration option called `extra` which allows
uers to add an arbitrary set of data to the config that is passed to the
template context.

Fixes #144
2015-05-09 21:09:12 +01:00
peter1000
27b7dcb1f1 Fixes typo 2015-05-08 15:40:37 -03:00
Dougal Matthews
ccc0d40770 Merge pull request #503 from d0ugal/template-context
Expand further on the template context for custom themes
2015-05-07 07:44:10 +01:00
Dougal Matthews
95e39c57ef Expand further on the template context for custom themes 2015-05-05 15:18:30 +01:00
Dougal Matthews
8085c65c6a Refactor the pages configuration
The current pages configuration looks like this:

    pages:
    - ['index.md', 'Home']
    - ['writing-your-docs.md', 'User Guide', 'Writing your docs']
    - ['styling-your-docs.md', 'User Guide', 'Styling your docs']
    - ['configuration.md', 'User Guide', 'Configuration']
    - ['about/license.md', 'About', 'License']
    - ['about/release-notes.md', 'About', 'Release Notes']
    - ['about/contributing.md', 'About', 'Contributing']

This has a number of flaws:

- It isn't clear how to add second levels of navigation for
  newcomers. This is often queried and not easy to document.

- We are representing a tree structure as a set of flat items
  that need to be merged. This creates some interesting edge
  cases, for example:

    - ['writing-your-docs.md', 'User Guide']
    - ['styling-your-docs.md', 'User Guide', 'Styling your docs']

 Is the first entry a page with the title User Guide? or a page
 in the User Guide category with an automatic title.

- We are currently limited to two levels deep in the navigation.
  Changing this with the current structure isn't trivial.

This change adds a new format which makes the above configuration
look like this:

    pages:
    - Home: index.md
    - User Guide:
        - user-guide/writing-your-docs.md
        - user-guide/styling-your-docs.md
        - user-guide/configuration.md
    - About:
        - License: about/license.md
        - about/release-notes.md
        - Contributing: about/contributing.md

With this structure, we can more easily see the documentation
tree and it is far more obvious what the navigation will look
like. It also removes the ambiguous edge cases and opens up the
possibility of adding further levels to the navigation more
easily.

This change restructures the pages configuration, but doesn't yet
allow users to add further levels in the navigation.

Fixes #6
2015-05-05 08:38:18 +01:00
Dougal Matthews
8ba6864282 Merge pull request #457 from d0ugal/search-new
Add search to MkDocs
2015-04-27 12:18:06 +01:00
Dougal Matthews
2b37deb188 Add further documentation about the pages config
This change explicitly calls out how to do multi-level documentation.

Closes #475
2015-04-26 09:02:13 +01:00
Dougal Matthews
835c27b5b2 Add details about implementing search in a custom theme 2015-04-25 10:03:47 +01:00
Dougal Matthews
eb75c8a71a Expanded the section at the start of styling your docs 2015-04-24 20:43:47 +01:00
Argoday
21d01f7219 Add strict parameter 2015-04-16 23:50:03 +01:00