Skip to content

Commit

Permalink
Merge branch 'master' into integration
Browse files Browse the repository at this point in the history
  • Loading branch information
AccaliaDeElementia committed Dec 3, 2015
2 parents 80f4844 + 2197932 commit 0558e14
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docs/Development/plugin creation.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ notifications and other events.
This parameter will be a [browser] that is set up to communicate with Discourse. At the time of the
prepare() call the browser will not have yet authenticated with discourse.

[EventEmitter]: ../api/external/events#module_SockEvents
[browser]: ../api/lib/browser#module_browser
[configuration]: ../api/lib/config
[EventEmitter]: ../api/external/events.md#module_SockEvents
[browser]: ../api/lib/browser.md#module_browser
[configuration]: ../api/lib/config.md

### Function `start()`

Expand Down
2 changes: 1 addition & 1 deletion docs/Plugins/summoner.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For example, if the bot is summoned by user @joeRandom and the reply
the value of the `username` key in the post, resulting in the reply text of:
`'@joeRandom has summoned me, and so I appear.'`

[post]: ../api/external/posts/#external.module_posts.Post
[post]: ../api/external/posts.md#external.module_posts.Post

## Configuration Options

Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Core configuration options are fixed and can be found described in the API docum
Plugin configuration options are determined by the individual plugins and will vary from plugin to plugin;
consult each plugins' documentation for more details.

[defaultConfig]: api/config/#defaultConfig
[defaultConfig]: ./api/lib/config.md#defaultConfig

## Core Configuration
Core configuration sets options for the entire bot, such as username/password to login as and what forum to
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ plugins:
echo: true
```

[config]: ./configuration/
[config]: ./configuration.md

## Running the bot

Expand Down

0 comments on commit 0558e14

Please sign in to comment.