Starting the 4.0.0-rc0 doc changes

Author: jamesdaniels

docs/1-install-and-setup.md

@@ -95,7 +95,7 @@ You can optionally provide a custom FirebaseApp name with `initializeApp`.
 @NgModule({
   imports: [
     BrowserModule,
-    AngularFireModule.initializeApp(firebaseConfig, authConfig, 'my-app-name')
+    AngularFireModule.initializeApp(firebaseConfig, 'my-app-name')
   ],
   declarations: [ AppComponent ],
   bootstrap: [ AppComponent ]
@@ -110,7 +110,8 @@ Open `/src/app/app.component.ts`, and make sure to modify/delete any tests to ge
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseListObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
+
 
 @Component({
 
@@ -119,7 +120,7 @@ import { AngularFire, FirebaseListObservable } from 'angularfire2';
   styleUrls: ['app.component.css']
 })
 export class AppComponent {
-  constructor(af: AngularFire) {
+  constructor(db: AngularFireDatabase) {
 
   }
 }
@@ -132,7 +133,7 @@ In `/src/app/app.component.ts`:
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseListObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
 
 @Component({
 
@@ -142,8 +143,8 @@ import { AngularFire, FirebaseListObservable } from 'angularfire2';
 })
 export class AppComponent {
   items: FirebaseListObservable<any[]>;
-  constructor(af: AngularFire) {
-    this.items = af.database.list('/items');
+  constructor(db: AngularFireDatabase) {
+    this.items = db.list('/items');
   }
 }
 ```

docs/2-retrieving-data-as-objects.md

@@ -14,7 +14,7 @@ If you've followed the earlier step "Installation and Setup"  your `/src/app/app
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseListObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
@@ -23,8 +23,8 @@ import { AngularFire, FirebaseListObservable } from 'angularfire2';
 })
 export class AppComponent {
   items: FirebaseListObservable<any[]>;
-  constructor(af: AngularFire) {
-    this.items = af.database.list('items');
+  constructor(db: AngularFireDatabase) {
+    this.items = db.list('items');
   }
 }
 ```
@@ -42,9 +42,9 @@ There are two ways to create an object binding:
 
 ```ts
 // relative URL, uses the database url provided in bootstrap
-const relative = af.database.object('/item');
+const relative = db.object('/item');
 // absolute URL
-const absolute = af.database.object('https://<your-app>.firebaseio.com/item');
+const absolute = db.object('https://<your-app>.firebaseio.com/item');
 ```
 
 ### Retrieve data
@@ -56,8 +56,8 @@ Replace the FirebaseListObservable to FirebaseObjectObservable in your `/src/app
 Also notice the templateUrl changed to inline template below:
 
 ```ts
-import {Component} from '@angular/core';
-import {AngularFire, FirebaseObjectObservable} from 'angularfire2';
+import { Component } from '@angular/core';
+import { AngularFireDatabase, FirebaseObjectObservable } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
@@ -67,8 +67,8 @@ import {AngularFire, FirebaseObjectObservable} from 'angularfire2';
 })
 export class AppComponent {
   item: FirebaseObjectObservable<any>;
-  constructor(af: AngularFire) {
-    this.item = af.database.object('/item');
+  constructor(db: AngularFireDatabase) {
+    this.item = db.object('/item');
   }
 }
 ```
@@ -94,7 +94,7 @@ The promise can be useful to chain multiple operations, catching possible errors
 from security rules denials, or for debugging.
 
 ```ts
-const promise = af.database.object('/item').remove();
+const promise = db.object('/item').remove();
 promise
   .then(_ => console.log('success'))
   .catch(err => console.log(err, 'You dont have access!'));
@@ -105,7 +105,7 @@ promise
 Use the `set()` method for **destructive updates**.
 
 ```ts
-const itemObservable = af.database.object('/item');
+const itemObservable = db.object('/item');
 itemObservable.set({ name: 'new name!'});
 ```
 
@@ -114,7 +114,7 @@ itemObservable.set({ name: 'new name!'});
 Use the `update()` method for **non-destructive updates**.
 
 ```ts
-const itemObservable = af.database.object('/item');
+const itemObservable = db.object('/item');
 itemObservable.update({ age: newAge });
 ```
 
@@ -125,15 +125,15 @@ using an update with a primitive is the exact same as doing a `.set()` with a pr
 Use the `remove()` method to remove data at the object's location.
 
 ```ts
-const itemObservable = af.database.object('/item');
+const itemObservable = db.object('/item');
 itemObservable.remove();
 ```
 
 **Example app**: 
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseObjectObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseObjectObservable } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
@@ -149,8 +149,8 @@ import { AngularFire, FirebaseObjectObservable } from 'angularfire2';
 })
 export class AppComponent {
   item: FirebaseObjectObservable<any>;
-  constructor(af: AngularFire) {
-    this.item = af.database.object('/item');
+  constructor(db: AngularFireDatabase) {
+    this.item = db.object('/item');
   }
   save(newName: string) {
     this.item.set({ name: newName });
@@ -177,7 +177,7 @@ Data retrieved from the object binding contains special properties retrieved fro
 AngularFire2 unwraps the Firebase DataSnapshot by default, but you can get the data as the original snapshot by specifying the `preserveSnapshot` option. 
 
 ```ts
-this.item = af.database.object('/item', { preserveSnapshot: true });
+this.item = db.object('/item', { preserveSnapshot: true });
 this.item.subscribe(snapshot => {
   console.log(snapshot.key)
   console.log(snapshot.val())

docs/3-retrieving-data-as-lists.md

@@ -15,15 +15,15 @@ Replace your  `/src/app/app.component.ts` from previous step to look like below.
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire } from 'angularfire2';
+import { AngularFireDatabase } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
   styleUrls: ['app.component.css']
 })
 export class AppComponent {
-  constructor(af: AngularFire) {
+  constructor(db: AngularFireDatabase) {
 
   }
 }
@@ -33,7 +33,7 @@ In this section, we're going to modify the `/src/app/app.component.ts`  to retre
 
 ## Create a list binding
 
-Data is retrieved through the `af.database` service.
+Data is retrieved through the `AngularFireDatabase` module.
 
 There are three ways to create a list binding:
 
@@ -43,11 +43,11 @@ There are three ways to create a list binding:
 
 ```ts
 // relative URL, uses the database url provided in bootstrap
-const relative = af.database.list('/items');
+const relative = db.list('/items');
 // absolute URL
-const absolute = af.database.list('https://<your-app>.firebaseio.com/items');
+const absolute = db.list('https://<your-app>.firebaseio.com/items');
 // query 
-const queryList = af.database.list('/items', {
+const queryList = db.list('/items', {
   query: {
     limitToLast: 10,
     orderByKey: true
@@ -63,8 +63,8 @@ Then in your template, you can use the `async` pipe to unwrap the binding.
 Update `/src/app/app.component.ts` to import `FirebaseListObservable` from angularfire2 and iterate thru the list once data is retrieved. Also note the change in attribute `templateUrl` to inline `template` below.
 
 ```ts
-import {Component} from '@angular/core';
-import {AngularFire, FirebaseListObservable} from 'angularfire2';
+import { Component } from '@angular/core';
+import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
@@ -78,8 +78,8 @@ import {AngularFire, FirebaseListObservable} from 'angularfire2';
 })
 export class AppComponent {
   items: FirebaseListObservable<any>;
-  constructor(af: AngularFire) {
-    this.items = af.database.list('/items');
+  constructor(db: AngularFireDatabase) {
+    this.items = db.list('/items');
   }
 }
 ```
@@ -105,7 +105,7 @@ The promise can be useful to chain multiple operations, catching possible errors
 from security rules denials, or for debugging.
 
 ```ts
-const promise = af.database.list('/items').remove();
+const promise = db.list('/items').remove();
 promise
   .then(_ => console.log('success'))
   .catch(err => console.log(err, 'You do not have access!'));
@@ -116,7 +116,7 @@ promise
 Use the `push()` method to add new items on the list.
 
 ```ts
-const items = af.database.list('/items');
+const items = db.list('/items');
 items.push({ name: newName });
 ```
 
@@ -125,7 +125,7 @@ items.push({ name: newName });
 Use the `update()` method to update existing items.
 
 ```ts
-const items = af.database.list('/items');
+const items = db.list('/items');
 // to get a key, check the Example app below
 items.update('key-of-some-data', { size: newSize });
 ```
@@ -134,7 +134,7 @@ items.update('key-of-some-data', { size: newSize });
 Use the `remove()` method to remove data at the list item's location.
 
 ```ts
-const items = af.database.list('/items');
+const items = db.list('/items');
 // to get a key, check the Example app below
 items.remove('key-of-some-data');
 ```
@@ -144,15 +144,15 @@ items.remove('key-of-some-data');
 If you omit the `key` parameter from `.remove()` it deletes the entire list.
 
 ```ts
-const items = af.database.list('/items');
+const items = db.list('/items');
 items.remove();
 ```
 
 **Example app**
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
 
 @Component({
   selector: 'app-root',
@@ -171,8 +171,8 @@ import { AngularFire, FirebaseListObservable, FirebaseObjectObservable } from 'a
 })
 export class AppComponent {
   items: FirebaseListObservable<any>;
-  constructor(af: AngularFire) {
-    this.items = af.database.list('/messages');
+  constructor(db: AngularFireDatabase) {
+    this.items = db.list('/messages');
   }
   addItem(newName: string) {
     this.items.push({ text: newName });
@@ -201,7 +201,7 @@ Data retrieved from the object binding contains special properties retrieved fro
 AngularFire2 unwraps the Firebase DataSnapshot by default, but you can get the data as the original snapshot by specifying the `preserveSnapshot` option. 
 
 ```ts
-this.items = af.database.list('/items', { preserveSnapshot: true });
+this.items = db.list('/items', { preserveSnapshot: true });
 this.items
   .subscribe(snapshots => {
     snapshots.forEach(snapshot => {

docs/4-querying-lists.md

@@ -9,7 +9,7 @@ observables emit new values, the query is automatically re-run.
 Queries are created by specifying a `query` object on the `FirebaseListObservable` options.
 
 ```ts
-const queryObservable = af.database.list('/items', {
+const queryObservable = db.list('/items', {
   query: {
     orderByChild: 'size',
     equalTo: 'large' 
@@ -40,7 +40,7 @@ const queryObservable = af.database.list('/items', {
 
 ```ts
 // WARNING: Do not copy and paste. This will not work!
-const queryObservable = af.database.list('/items', {
+const queryObservable = db.list('/items', {
   query: {
     orderByChild: 'size',
     equalTo: 'large',
@@ -53,7 +53,7 @@ You can only use `limitToFirst` or `limitToLast`, but not both in combination.
 
 ```ts
 // WARNING: Do not copy and paste. This will not work!
-const queryObservable = af.database.list('/items', {
+const queryObservable = db.list('/items', {
   query: {
     limitToFirst: 10,
     limitToLast: 100,
@@ -72,7 +72,7 @@ An RxJS Subject is imported below. A Subject is like an Observable, but can mult
 
 ```ts
 const subject = new Subject(); // import {Subject} from 'rxjs/Subject';
-const queryObservable = af.database.list('/items', {
+const queryObservable = db.list('/items', {
   query: {
     orderByChild: 'size',
     equalTo: subject 
@@ -95,7 +95,7 @@ subject.next('small');
 
 ```ts
 import { Component } from '@angular/core';
-import { AngularFire, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2';
+import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
 import { Subject } from 'rxjs/Subject';
 
 @Component({
@@ -118,9 +118,9 @@ export class AppComponent {
   items: FirebaseListObservable<any[]>;
   sizeSubject: Subject<any>;
 
-  constructor(af: AngularFire) {
+  constructor(db: AngularFireDatabase) {
     this.sizeSubject = new Subject();
-    this.items = af.database.list('/items', {
+    this.items = db.list('/items', {
       query: {
         orderByChild: 'size',
         equalTo: this.sizeSubject