updated docs

erpnext/docs/user/manual/en/accounts/opening-accounts.md

@@ -1,5 +1,3 @@
-	Now that you have completed most of the setup, its time to start moving in!
-
 There are two important sets of data you need to enter before you start your
 operations.
 
@@ -46,7 +44,7 @@ Complete Journal Entries on the Debit and Credit side.
 
  To update opening balance is to make Journal Entry for an individual/group of accounts.
 
-For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
+For example, if you want to update balance in three bank accounts, then make Journal Entries in this manner.
 
 ![Opening Temp Entry]({{docs_base_url}}/assets/old_images/erpnext/image-temp-opening.png)
 
@@ -56,11 +54,11 @@ Temporary Asset and Liability account is used for balancing purpose. When you up
 
 This way, you can update opening balance in Asset and Liability accounts.
 
-You can make two Opening Journal Entrys:
+You can make two Opening Journal Entries:
 
   * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account.
   * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account.
-  * In this method you can update opening balance of specific balancesheet accounts and not for all.
+  * In this method you can update opening balance of specific balance sheet accounts and not for all.
   * Opening entry is only for balance sheet accounts and not for expense or Income accounts.
 
 After completing the accounting entries, the trial balance report will look like the one given below:
@@ -69,7 +67,7 @@ After completing the accounting entries, the trial balance report will look like
 
 #### Outstanding Invoices
 
-After your Opening Journal Entrys are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+After your Opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
 
 Since you have already booked the income or expense on these invoices in the previous period, select the temp opening account **Temporary Opening** in the “Income” and “Expense” accounts.
 

erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md

@@ -19,7 +19,7 @@ asset account will be reduced, based on the valuation amount of those items.
     * Stock Adjustment Account
     * Expenses Included In Valuation
     * Cost Center
-  2. In perpetual inventory, the system will maintain seperate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
+  2. In perpetual inventory, the system will maintain separate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
 
   3. Activate Perpetual Inventory
 
@@ -370,4 +370,4 @@ Goods Sold" accounts are also affected based on the valuation amount.
 
 <img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png">
 
-{ next }
+{next}

erpnext/docs/user/manual/en/using-erpnext/calendar.md

@@ -1,46 +1,36 @@
-The Calendar is a tool where you can create and share Events and also see auto-generated events from the system.
+The Calendar is a tool where you can create and share Events and also see
+auto-generated events from the system.
 
-You can access Calendar from
+You can switch calender view based on Month, Week and Day.
 
-`Explore > Tools > Calendar`
-
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
-
-###Creating new Event
+###Creating Events in Calender
 
 ####Creating Event Manually
 
-To create event manually, you should first select the Calender View (Day, Month, Year). If Event's start and end time will be within one day, then select Week or Day view.
+To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view.
 
-Select the Time from for the Event via drag and drop.
+This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
+![Calender Event Manually]({{docs_base_url}}/assets/old_images/erpnext/calender-event-manually.png)
 
-Based on the selection of time slot, Start Time and End Time will be updated in the Event master.
+Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
 
-####Subject
-
-Enter Subject for the Event.
-
-####Event Type
-
-Event Type can be Public or Private. Public Events will be visible to all the Users.
-
-###Event Based on Lead
+####Event Based on Lead
 
 In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person specified in this field.
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
+![Calender Event Lead]({{docs_base_url}}/assets/old_images/erpnext/calender-event-lead.png)
 
-###Birthday Events
+####Birthday Event
 
-Birthday Events are auto-created based on Date of Birth of the Employee.
+Birthday Event is created based on Date of Birth specified in the Employee master.
 
 ###Recurring Events
 
-You can set events as recurring in specific interval by Checking the "Repeat This Event".
+You can set events as recurring in specific interval by Checking the "Repeat This
+Event".
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
+![Calender Event Recurring]({{docs_base_url}}/assets/old_images/erpnext/calender-event-recurring.png)
 
 ###Permission for Event
 
@@ -48,7 +38,7 @@ You can set Event as Private or Public. Private Events will be visible only to y
 
 Public Event, like Birthday will be visible to all.
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-5.png">
+![Calender Event Permission]({{docs_base_url}}/assets/old_images/erpnext/calender-event-permission.png)
 
 ###Event Reminders
 
@@ -58,12 +48,16 @@ There are two ways you can receive email reminder for an event.
 
 In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event.
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
+![Calender Event Notification]({{docs_base_url}}/assets/old_images/erpnext/calender-event-notification.png)
 
-###Calendar Views
+####Create Email Digest
 
-Calendar view is available for the documents like Sales Order, Production Order, Holiday List, Leave Application etc. Based on the posting date of the document, it's link will be visible in the Calendar.
+To get email reminders for event, you should set Email Digest for Calender Events.
 
-<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-7.png">
+Email Digest can be set from:
+
+`Setup > Email > Email Digest`
+
+![Calender Email Digest]({{docs_base_url}}/assets/old_images/erpnext/calender-email-digest.png)
 
 {next}