Skip to content

Commit

Permalink
Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages
Browse files Browse the repository at this point in the history
…into gh-pages
  • Loading branch information
bclozel committed Mar 23, 2017
2 parents 8ad831c + b2be58e commit 73eef0a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Assuming you're already within your project's clone directory, and you've alread

Use the `--watch` flag to pick up changes to files as you make them, allowing you a nice edit-and-refresh workflow.

jekyll serve --watch
bundle exec jekyll serve --watch

> **Important:** Because the `baseurl` is set explicitly within your project's `_config.yml` file, you'll need to fully-qualify the URL to view your project. For example, if your project is named "spring-xyz", your URL when running Jekyll locally will be <http://localhost:4000/spring-xyz/>. Don't forget the trailing slash! You'll get a 404 without it.
Expand Down
2 changes: 1 addition & 1 deletion js/projectDocumentationWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Spring.SnippetView = Backbone.View.extend({
this.combinedTemplate = _.template(
"<div class=\"highlight\"><pre><code>" +
downloadTemplate.find("code:first").html() +
"{@ if (repository) { @}" +
"{@ if (typeof(repository) != \"undefined\") { @}" +
repositoryTemplate.find("code:first").html() +
"{@ } @}" +
"</code></pre></div>"
Expand Down

0 comments on commit 73eef0a

Please sign in to comment.