Skip to content

Commit

Permalink
Merge commit '9a9fd02407b5cedbb0d1dd837143187e96dbdea8' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jlconlin committed Jan 17, 2017
2 parents ced964d + 9a9fd02 commit 3084d0a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
14 changes: 14 additions & 0 deletions docs/README-jekyll.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,19 @@ This repository contains the required stuff to make the NJOY website and keep it
## Using jekyll-website
For all projects under the NJOY organization, this repository should be created as a git 'subtree' in the `docs` directory. This will ensure consistency across all the projects as well as make the documentation for each accessible from the website.

In order to prevent pushing to this repository one should set the push url for this remote in git like this:

```bash
git remote set-url --push <name> no_push
```
Here `<name>` is the name of the remote (probably `jekyll`). What this tells git is whenever you try to push to this remote, simply push to the url `no_push` which doesn't exist.

Alternatively, you can set the push url to the url of the remote of the real repository like:

```bash
git remote set-url --push jekyll [email protected]:njoy/njoy.github.io.git
```
as is done for the [njoy.github.io](https://github.com/njoy/njoy.github.io) repository.

## License
This repository---and all repositories under the NJOY organization---are licensed according to the [LICENSE](LICENSE.md) file
6 changes: 1 addition & 5 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@

<div class="footer-col footer-col-3">
<p>{{ site.description }}
Website for documentation and code for the development of NJOY, a nuclear data
processing code from Los Alamos National Laboratory. All source code as part
of the NJOY project—including this website—is covered by the BSD, 3-clause
license, as detailed in the
<a href="https://njoy.github.io/LICENSE.html">license</a> file.
Website for documentation and code for the development of NJOY, a nuclear data processing code from Los Alamos National Laboratory. All source code as part of the NJOY project—including this website—is covered by the BSD, 3-clause license, as detailed in the <a href="https://njoy.github.io/LICENSE.html">license</a> file. LANL code designation LA-CC-15-092.
</p>
</div>
</div>
Expand Down

0 comments on commit 3084d0a

Please sign in to comment.