Skip to content

Commit

Permalink
Update: Documentation & license updates (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyjin authored Oct 26, 2017
1 parent ee7cf59 commit 294bd6d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All contributions are welcome to this project.

Before a contribution can be merged into this project, please fill out the Contributor License Agreement (CLA) located at:

https://developer.box.com/docs/box-ui-elements-cla
https://developer.box.com/docs/box-sdk-cla

To learn more about CLAs and why they are important to the UI Element projects, please see the [Wikipedia entry](http://en.wikipedia.org/wiki/Contributor_License_Agreement).

Expand Down
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SOFTWARE LICENSE AGREEMENT
(v.20170516)

BOX UI ELEMENTS
BOX SDK

This "Agreement" forms a legally binding agreement between Box (as defined in
Section 14) and you ("Developer") that governs Developer's right to access and
Expand Down Expand Up @@ -114,7 +114,7 @@ services for their respective governing terms.
and
b. For each Contribution, Developer shall agree to the Box "Contributor
License Agreement" (or "CLA") located here:
https://developer.box.com/docs/box-ui-elements-cla.
https://developer.box.com/docs/box-sdk-cla.

5. Feedback. Developer may, from time to time, provide feedback to Box
concerning the functionality and performance of the SDK or Box Service
Expand Down Expand Up @@ -345,7 +345,7 @@ services for their respective governing terms.


Exhibit A
BOX UI ELEMENT ACCEPTABLE USE POLICY
BOX SDK ACCEPTABLE USE POLICY

Acceptable Use Policy. Developer shall not, and shall not use the SDKs to:
a) Do anything illegal, or facilitate, promote or encourage any illegal
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Supported Locales

Usage
-----
Box Annotations can be used by pulling from our [NPM package](https://www.npmjs.com/package/box-ui-elements).
Box Annotations can be used by pulling from our [NPM package](https://www.npmjs.com/package/box-annotations).

Initialization
--------------
Expand Down Expand Up @@ -72,7 +72,7 @@ const annotator = new annotatorConf.CONSTRUCTOR({
| Parameter | Description |
| --- | --- |
| annotator | Viewer-specific annotator configurations object |
| apiHost | Host for Box API calls i.e. 'https://app.box.com/api' |
| apiHost | Host for Box API calls e.g. 'https://app.box.com/api' |
| fileId | Box file ID |
| token | A string auth token, see below for details on how to generate annotator tokens with appropriate scopes |
| container | DOM node or selector where Preview should be placed |
Expand Down Expand Up @@ -581,17 +581,17 @@ Support
-------
If you have any questions, please search our [issues list](https://github.com/box/box-annotations/issues) to see if they have been previously answered. Report new issues [here](https://github.com/box/box-annotations/issues/new).

For general Box Platform, API, and UI Element questions, please visit our [developer forum](https://community.box.com/t5/Developer-Forum/bd-p/DeveloperForum) or contact us via one of our [available support channels](https://community.box.com/t5/Community/ct-p/English).
For general Box Platform, API, Elements, and Annotations questions, please visit our [developer forum](https://community.box.com/t5/Developer-Forum/bd-p/DeveloperForum) or contact us via one of our [available support channels](https://community.box.com/t5/Community/ct-p/English).

Copyright and License
---------------------
Copyright 2016-2017 Box, Inc. All Rights Reserved.
Copyright 2016-present Box, Inc. All Rights Reserved.

Licensed under the Box Software License Agreement v.20170516.
You may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://github.com/box/box-content-preview/blob/master/LICENSE
https://developer.box.com/docs/box-sdk-license

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
5 changes: 2 additions & 3 deletions build/license.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = `Box UI Element
module.exports = `Box Annotations
Copyright 2016-present, Box, Inc.
All rights reserved.
Copyright 2016-present Box, Inc. All Rights Reserved.
This source code is licensed under the Box Software License Agreement found
in the LICENSE file in the root directory of this source tree. Additional
Expand Down

0 comments on commit 294bd6d

Please sign in to comment.