aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2013-06-10 11:39:01 -0700
committerIgor Minar2013-06-10 11:39:01 -0700
commitb700aa9291409a94dbc01c6c945ab18391dd9afb (patch)
tree4662d278f731396b31653bd698fd130624e6c9fe
parent4eaaf9f83c44641b1cbc5976f1968dc9ee4c642b (diff)
downloadangular.js-b700aa9291409a94dbc01c6c945ab18391dd9afb.tar.bz2
docs(faq): update customink order info
-rw-r--r--docs/content/misc/faq.ngdoc12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/content/misc/faq.ngdoc b/docs/content/misc/faq.ngdoc
index 667437f9..ac4ee4f5 100644
--- a/docs/content/misc/faq.ngdoc
+++ b/docs/content/misc/faq.ngdoc
@@ -51,7 +51,7 @@ Yes. See instructions in {@link downloading}.
### What browsers does Angular work with?
We run our extensive test suite against the following browsers: Safari, Chrome, Firefox, Opera,
-IE8, IE9 and mobile browsers (Android, Chrome Mobile, iOS Safari). See {@link guide/ie Internet
+IE8, IE9 and mobile browsers (Android, Chrome Mobile, iOS Safari). See {@link guide/ie Internet
Explorer Compatibility} for more details in supporting legacy IE browsers.
@@ -101,9 +101,9 @@ The MIT License.
### Can I download and use the Angular logo artwork?
-Yes! You can find design files in our github repository, under "{@link https://github.com/angular/angular.js/tree/master/images/logo
+Yes! You can find design files in our github repository, under "{@link https://github.com/angular/angular.js/tree/master/images/logo
angular.js/images/logo}"
-The logo design is licensed under a "{@link http://creativecommons.org/licenses/by-sa/3.0/
+The logo design is licensed under a "{@link http://creativecommons.org/licenses/by-sa/3.0/
Creative Commons Attribution-ShareAlike 3.0 Unported License}". If you have some other use in mind, contact us.
### How can I get some AngularJS schwag?
@@ -114,7 +114,7 @@ they'll waive the setup costs, and you can order any quantity you need.
**Stickers**
Contact Tom Witting (or anyone in sales) via email at tom@stickergiant.com, and tell him you want to order some AngularJS
-stickers just like the ones in job #42711. You'll have to give them your own info for billing and shipping.
+stickers just like the ones in job #42711. You'll have to give them your own info for billing and shipping.
As long as the design stays exactly the same, {@link http://www.stickergiant.com StickerGiant} will give you a reorder discount.
@@ -122,7 +122,9 @@ As long as the design stays exactly the same, {@link http://www.stickergiant.com
Contact sales at {@link http://www.customink.com www.customink.com} and tell them you want some shirts with design name "angularjs",
just like past order #2106371. You'll have to give them your own info for billing and shipping.
-As long as the design stays exactly the same, CustomInk won't charge for any set up fees, and they'll give you a reorder discount.
+As long as the design stays exactly the same and your order 6+ shirts, CustomInk won't charge for any set up fees, and they'll
+give you a discount based on the order size. For smaller orders you'll be charged $14.49 per shirt + $15 set up fee per order.
+
## Common Pitfalls