diff --git a/foundation/www/docs/assets/img/accounts/item-subscriber.png b/foundation/www/docs/assets/img/accounts/item-subscriber.png
new file mode 100644
index 00000000..e480cced
Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/item-subscriber.png differ
diff --git a/foundation/www/docs/assets/img/accounts/mode-of-payments.png b/foundation/www/docs/assets/img/accounts/mode-of-payments.png
new file mode 100644
index 00000000..897a40e4
Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/mode-of-payments.png differ
diff --git a/foundation/www/docs/assets/img/accounts/subscription.gif b/foundation/www/docs/assets/img/accounts/subscription.gif
deleted file mode 100755
index 68488053..00000000
Binary files a/foundation/www/docs/assets/img/accounts/subscription.gif and /dev/null differ
diff --git a/foundation/www/docs/assets/img/accounts/subscription.png b/foundation/www/docs/assets/img/accounts/subscription.png
deleted file mode 100755
index 8b2cdc30..00000000
Binary files a/foundation/www/docs/assets/img/accounts/subscription.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/selling/selling-settings.png b/foundation/www/docs/assets/img/selling/selling-settings.png
old mode 100755
new mode 100644
index 345735b0..d1306753
Binary files a/foundation/www/docs/assets/img/selling/selling-settings.png and b/foundation/www/docs/assets/img/selling/selling-settings.png differ
diff --git a/foundation/www/docs/assets/img/setup/print/compact-print.png b/foundation/www/docs/assets/img/setup/print/compact-print.png
new file mode 100644
index 00000000..6f770e22
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/print/compact-print.png differ
diff --git a/foundation/www/docs/assets/img/setup/print/print-settings.png b/foundation/www/docs/assets/img/setup/print/print-settings.png
old mode 100755
new mode 100644
index 9c43dcee..04d55298
Binary files a/foundation/www/docs/assets/img/setup/print/print-settings.png and b/foundation/www/docs/assets/img/setup/print/print-settings.png differ
diff --git a/foundation/www/docs/assets/img/website/disable-signup.png b/foundation/www/docs/assets/img/website/disable-signup.png
new file mode 100644
index 00000000..2b33b90f
Binary files /dev/null and b/foundation/www/docs/assets/img/website/disable-signup.png differ
diff --git a/foundation/www/docs/assets/img/website/grid-in-webform.png b/foundation/www/docs/assets/img/website/grid-in-webform.png
new file mode 100644
index 00000000..80c2a536
Binary files /dev/null and b/foundation/www/docs/assets/img/website/grid-in-webform.png differ
diff --git a/foundation/www/docs/assets/img/website/paging-in-webform.png b/foundation/www/docs/assets/img/website/paging-in-webform.png
new file mode 100644
index 00000000..f834c6ad
Binary files /dev/null and b/foundation/www/docs/assets/img/website/paging-in-webform.png differ
diff --git a/foundation/www/docs/assets/img/website/payment-in-webform.png b/foundation/www/docs/assets/img/website/payment-in-webform.png
new file mode 100644
index 00000000..b424097c
Binary files /dev/null and b/foundation/www/docs/assets/img/website/payment-in-webform.png differ
diff --git a/foundation/www/docs/assets/img/website/portal-settings.png b/foundation/www/docs/assets/img/website/portal-settings.png
new file mode 100644
index 00000000..be64123b
Binary files /dev/null and b/foundation/www/docs/assets/img/website/portal-settings.png differ
diff --git a/foundation/www/docs/assets/img/website/web-form-view.png b/foundation/www/docs/assets/img/website/web-form-view.png
deleted file mode 100755
index 935e4e87..00000000
Binary files a/foundation/www/docs/assets/img/website/web-form-view.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/website/web-form.png b/foundation/www/docs/assets/img/website/web-form.png
deleted file mode 100755
index 69178fa5..00000000
Binary files a/foundation/www/docs/assets/img/website/web-form.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/website/webform-1.png b/foundation/www/docs/assets/img/website/webform-1.png
new file mode 100644
index 00000000..32745ac4
Binary files /dev/null and b/foundation/www/docs/assets/img/website/webform-1.png differ
diff --git a/foundation/www/docs/assets/img/website/website-signup.png b/foundation/www/docs/assets/img/website/website-signup.png
new file mode 100644
index 00000000..10fb76b7
Binary files /dev/null and b/foundation/www/docs/assets/img/website/website-signup.png differ
diff --git a/foundation/www/docs/user/manual/en/accounts/auto_repeat.md b/foundation/www/docs/user/manual/en/accounts/auto_repeat.md
new file mode 100644
index 00000000..a78cd23e
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/auto_repeat.md
@@ -0,0 +1,29 @@
+<!-- add-breadcrumbs -->
+# Auto Repeat
+
+Auto Repeat feature helps you create certain transaction automatically in a given time period.
+
+## Use Case
+
+Assuming that you follow deferred expense system for some items. It requires you to create same Journal Entry each month to Cr. Deferred Expense a/c to Dr. Expense Account. You can create first Journal Entry manually for it, and then create auto-repeat transaction for it.
+
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.png">
+
+#### Auto Repeat
+
+To set the subscription for the sales invoice Go to Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.gif">
+
+**From Date and To Date**: This defines contract period with the customer.
+
+**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+
+**Notify By Email**: If you want to notify the user about auto recurring invoice.
+
+**Print Format**: Select a print format to define document view which should be emailed to customer.
+
+**Disabled**: It will stop to make auto recurring documents against the subscription.
+
+### Difference between Subscription and Auto Repeat
+
diff --git a/foundation/www/docs/user/manual/en/accounts/index.md b/foundation/www/docs/user/manual/en/accounts/index.md
index 8b3ec0bf..5bd8d776 100755
--- a/foundation/www/docs/user/manual/en/accounts/index.md
+++ b/foundation/www/docs/user/manual/en/accounts/index.md
@@ -1,13 +1,15 @@
-<!-- add-breadcrumbs -->
 # Accounts
 
 Whether you have an accountant in your internal team OR you do it yourself OR you have chosen to outsourced it,
 the financial accounting process is almost always at the center any business management system (aka an ERP system).
 
-In ERPNext, your accounting operations consists of 3 main types of transactions:
-  * Sales Invoice: Which is a record of the bills that you raise to your Customers for the products or services you provide.
-  * Purchase Invoice: Which is a record of the bills that your Suppliers give you for their products or services provided to you.
-  * Journal Entries: For accounting entries, like payments, credit and other types of adjustments you want to record.
+In ERPNext, your accounting operations consists of 3 main transactions:
+
+  * Sales Invoice: The bills that you raise to your Customers for the products or services you provide.
+
+  * Purchase Invoice: Bills that your Suppliers give you for their products or services.
+  
+  * Journal Entries: For accounting entries, like payments, credit and other types.
 
 <div class="embed-container">
   <iframe src="https://www.youtube.com/embed/5wjollWN0OA?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
diff --git a/foundation/www/docs/user/manual/en/accounts/index.txt b/foundation/www/docs/user/manual/en/accounts/index.txt
index 7ee29d0d..dcbdf727 100755
--- a/foundation/www/docs/user/manual/en/accounts/index.txt
+++ b/foundation/www/docs/user/manual/en/accounts/index.txt
@@ -9,10 +9,12 @@ debit-note
 inter-company-invoices
 payments
 journal-entry
+mode-of-payment
 inter-company-journal-entry
 payment-entry
 deferred-revenue
 subscription
+auto-repeat
 multi-currency-accounting
 advance-payment-entry
 payment-request
diff --git a/foundation/www/docs/user/manual/en/accounts/subscription.md b/foundation/www/docs/user/manual/en/accounts/subscription.md
index 08003564..28b2bfd2 100755
--- a/foundation/www/docs/user/manual/en/accounts/subscription.md
+++ b/foundation/www/docs/user/manual/en/accounts/subscription.md
@@ -1,26 +1,38 @@
-<!-- add-breadcrumbs -->
 # Subscription
 
-If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
+If you offer a service which requires renewal in the certain time period (yearly, monthly, quarterly etc.), you can use Subscription feature to track them. Subscription master captures all the details required for the auto-creation of Sales Invoice on subscription expiry.
 
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.png">
+Let's consider a use-case of ERPNext subscription itself. Our hosting plans are available on yearly basis. Each customer's account has subscription expiry date, after which customer must renew their subscription with us.
 
-#### Scenario
+To manage client's subscription expiry and auto-generation of Sales Invoice for the renewal, we use Subscription feature.
 
-Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
+### Subscription Validity
 
-To set the subscription for the sales invoice
-Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+**Start Date:** Day from when the subscription will be valid.
 
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.gif">
+**Days Until Due:** Enter no. of days for which subscription will be valid.
 
-**From Date and To Date**: This defines contract period with the customer.
+Based on the subscription start and end date, actual dates for invoices will be calculated.
 
-**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+### Subscription Plan
 
-**Notify By Email**: If you want to notify the user about auto recurring invoice.
+The subscription plan is linked to an Item, for which Sales Invoice is created.
 
-**Print Format**: Select a print format to define document view which should be emailed to customer.
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/item-subscriber.png">
+
+### Taxes
+
+Select Taxes and Charges which will be applicable in the Sales Invoice created against this Subscription.
+
+### Discounts
+
+Mention discounts if any which will be applied on this particular subscription.
+
+### Difference Between Subscription and Auto-Repeat
+
+Before Subscription feature was added in ERPNext, the current Auto-Repeat feature was available as a Subscription only.
+
+The Auto-Repeat feature which is applicable for multiple transactions like Sales Order, Purchase Order, Invoices, Journal Entry etc. Whereas based on Subscription, only Sales Invoices are auto-created.
 
 **Disabled**: It will stop to make auto recurring documents against the subscription
 
diff --git a/foundation/www/docs/user/manual/en/human-resources/index.txt b/foundation/www/docs/user/manual/en/human-resources/index.txt
index d2234121..f5cd9f80 100755
--- a/foundation/www/docs/user/manual/en/human-resources/index.txt
+++ b/foundation/www/docs/user/manual/en/human-resources/index.txt
@@ -13,3 +13,4 @@ human-resources-reports
 human-resource-setup
 setup
 articles
+employee-onboarding-and-separation
diff --git a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 7d89469f..f4050e7e 100755
--- a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -25,8 +25,7 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
 
 If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation).
 
-
-<img class="screenshot" alt="Target Distribution" src="/docs/assets/im/selling/sales-person-target-distribution.gif">
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}assets/img/selling/sales-person-target-distribution.gif">
 
 ####Report - Sales Person Target Variance Item Groupwise
 
@@ -79,7 +78,7 @@ To create new Monthly Distriibution, go to:
 
 `Accounts > Monthly Distributon`
 
-<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png">
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/img/selling/target-distribution.png">
 
 You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
 
diff --git a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
index 5c818898..cf6f365b 100755
--- a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
+++ b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md
@@ -1,74 +1,73 @@
-<!-- add-breadcrumbs -->
 # Selling Settings
 
-Selling Setting is where you can define propertiese which will be applied in your selling transactions. 
+Selling Setting is where you can define properties which will be applied to the masters and transactions involved in the sales cycle.
+
 Let's check into each property one by one.
 
 <img class="screenshot" alt="Selling Settings" src="{{docs_base_url}}/assets/img/selling/selling-settings.png">
 
 ####1. Customer Naming By
 
-When customer is saved, system generated unique ID for that Customer. Using that Customer ID, 
-you can select Customer in other transactions.
+When a customer is saved, a unique ID is generated for that Customer.
 
-Bydefault Customer will be saved with Customer Name. If you wish to save Customer using 
-a naming series, you should set Customer Naming By as "Naming Series".
+By default, Customer ID is generated based on Customer Name. If you wish to save Customer using a naming series, in the field Customer Naming Series, set value as "Naming Series".
 
 Example of Customer Id's saved in Naming Series - `CUST00001,CUST00002, CUST00003...` and so on.
 
-You can set Naming Series for customer naming from:
+You can set Naming Series for Customers from:
 
-> Setup > Settings > Naming Series`
+> Setup > Data > Naming Series
 
 ####2. Campaign Naming By
 
-Just like for Customer, you can also configure as how ID will be generated for the Campaign master. 
-Bydefault Campaign will be saved with Campaign Name provided while its creation.
+Just like for Customer, you can also configure naming methodology for the Campaign master as well. By default, Campaign will be saved with Campaign Name only.
 
-####3. Default Customer Group
+####3. Default Customer Group and Territory
 
-Customer Group in this field will be auto-updated when you open new Customer form.
-While converting Quotation created for Lead into Sales Order, system attempts to convert 
-Lead into Customer in the backend. While creating Customer in the backend, system pickup 
-Customer Group and Territory as defined in the Selling Setting. If system doesn't find 
-any values, then following validation message will be raised.
-To resolve this, you should:
-Either manually convert Lead into Customer, and define Customer Group and Territory manually while 
-creating Customer or define Default Customer Group and Territory in the Selling Setting. 
-Then you should have Lead automatically converted into Customer when convert Quotation into Sales Order.
+Select a default [Customer Group](/docs/user/manual/en/CRM/setup/customer-group.html) which will be auto-updated when creating a new Customer.
 
-####4. Default Territory
-
-Territory defined in this field will be auto-updated in the Territory field of Customer master.
-
-Just like Customer Group, Territory is also checked when system tries creating Customer in the backend.
+Quotations can be created for the Customers as well as for the Leads. When converting a Quotation into Sales Order, which is created for a Lead, the system attempts to convert that Lead into Customer. While creating Customer in the backend, values for Customer Group and Territory is picked from Selling Settings. If no default values are found for Customer Group or Territory, then you will receive a validation message asking for Customer Group or Territory. Or you can manually convert a Lead into Customer.
 
 ####5. Default Price List
 
-Price List set in this field will be auto-updated in the Price List field of Sales transactions.
+Price List set in this field will be auto-updated in the Price List field of sales transactions like Quotation, Sales Order, Delivery Note and Sales Invoice.
 
-####6. Sales Order Required
+####6. Close Opportunity After Days
 
-If you wish to make Sales Order creation mandatory before creation of Sales Invoice, then you should 
-set Sales Order Required field as Yes. Bydefault, this will be "No" for a value.
+If there are many Opportunities having a status other than Open, then they will be auto-closed after the no. of days mentioned in this field.
 
-####7. Delivery Note Required
+####7. Default Quotation Validity Days
 
-To make Delivery Note creation as mandatory before Sales Invoice creation, you should set 
-this field as "Yes". It will be "No" by default.
+Quotation Issues to the customer is Valid for certain days only. In the Quotation, you can update Valid Till Date manually. By default, the Valid Till date is auto-set as 30 days from the Quotation's Posting Date. You can change the no. of days in this field as per your business case.
 
-####8. Maintain Same Rate Throughout Sales Cycle
+####8. Sales Order Required
 
-System bydefault validates that item price will be same throughout sales cycle 
-(Sales Order - Delivery Note - Sales Invoice). If you could have item price changing within the cycle, 
-and you need to bypass validation of same rate throughout cycle, then you should uncheck this field and save.
+If you wish to make Sales Order creation mandatory before the creation of Sales Invoice, then you should set the Sales Order Required field as Yes. By default, this will be "No" for a value.
 
-####9. Allow User to Edit Price List Rate in Transaction
+####9. Delivery Note Required
 
-Item table of the sale transactions has field called Price List Rate. This field be non-editale 
-by default in all the sales transactions. This is to ensure that price of an item is fetched from 
-Item Price record, and user is not able to edit it.
+To make Delivery Note creation as mandatory before Sales Invoice creation, you should set this field as "Yes". By default, this will be "No" for a value.
 
-If you need to enable user to edit Item Price, fetched from Price List of an item, you should uncheck this field.
+####10. Maintain Same Rate Throughout Sales Cycle
 
-{next}
+The system by default validates that item price will be the same throughout the sales cycle (Sales Order - Delivery Note - Sales Invoice). If you could have item price changing within the cycle, and you need to bypass validation of the same rate throughout the cycle, then you should uncheck this field and save.
+
+####11. Allow User to Edit Price List Rate in Transaction
+
+Item table of the sale transactions has a field called Price List Rate. This field is non-editable by default in all the sales transactions. This is to ensure that price of an item is fetched from  Item Price record and the user is not able to edit it.
+
+If you need to enable the user to edit Item Price, fetched from Price List of an item, you should uncheck this field.
+
+####12. Allow multiple Sales Orders against a Customer's Purchase Order
+
+When creating a Sales Order, you can update the Purchase Order ID and Date received from the Customer. You can create only one Sales Order against the Customer's PO No. and Date. However, if you wish to allow the creation of multiple Sales Order's against the same PO No. of the Customer, enable the property of "Allow multiple Sales Orders against a Customer's Purchase Order".
+
+####13. Validate Selling Price for Item against Purchase Rate or Valuation Rate
+
+When making sales, it's important to know if you are not selling it at a loss-making price. Enabling this validation will validate item's Selling Price with its valuation/buying price. If item's selling price is found to be less than it's buying price, then you will get a prompt indicating the same.
+
+####14. Hide Customer's Tax Id from Sales Transactions
+
+As per the statutory requirement, most of the Customers have unique Tax ID assigned to them. They also need to have this tax ID fetched in the selling transactions. However, if you don't wish to use this functionality, you can disable by checking this property.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md b/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md
index 9be5e451..56de787a 100755
--- a/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md
+++ b/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md
@@ -1,7 +1,6 @@
-<!-- add-breadcrumbs -->
 # Print Settings
 
-In Print Settings you can set your default printing preferences like Paper Size, default text size, whether you want output as PDF or HTML etc.
+In Print Settings you can set your default printing preferences like Paper Size, default text size, whether you want to output as PDF or HTML etc.
 
 To edit print settings, go to:
 
@@ -9,6 +8,57 @@ To edit print settings, go to:
 
 <img class="screenshot" alt="Print Settings" src="{{docs_base_url}}/assets/img/setup/print/print-settings.png">
 
+There is various other configuration available in the Print Settings. Let's learn about each below.
+
+#### PDF or HTML
+
+When you email any document (like order or invoice) from ERPNext, it is sent in the PDF or HTML format. The file is sent in the PDF by default. If you wish to send a document in the HTML format, just uncheck field "Send Print as PDF".
+
+#### Repeat Header and Footer in PDF
+
+The letterhead is a master where you can define the standard Header and Footer which is appended to the document's Print Format. If this Property is enabled, then Header and Footer are added to each page. If you don't want header and footer repeat on each page, just disbale this setting.
+
+#### Print With Letterhead
+
+Enabling this property will automatically update Letterhead in each of your print formats.
+
+#### Compact Item Print
+
+The transactions like orders and invoices have table detailing item's bought or sold. It has multiple columns like Item Name, Description, UoM, Rate Amount etc. If there are many columns in the Item table, then print format looks bit cluttered. You can improve the view of the table by enabling Compact Item Print. 
+
+As per this setting, there will be only four column in the Print Format, namely:
+
+> Description, Qty, Rate and Amount
+
+The value of other columns (like name, description, image, serial nos. etc.) is concatenated in the Description column. Here is the sneak preview of Compact Print Format.
+
+<img class="screenshot" alt="Compact Print Format Settings" src="{{docs_base_url}}/assets/img/setup/print/compact-print.png">
+
+#### Allow Print for Draft
+
+The documents (mostly transactions) has two stage of authentication, Save and Submit. The saved documents are a first draft and mostly un-authenticate. Hence printing is restricted for the documents at this stage. However, if you wish to permit users to print documents at the Draft stage as well, enabling this setting will help.
+
+#### Send document web view link in the email
+
+ERPNext has a portal view available from where parties like Customer and Suppliers can signup and view their order history.
+
+When you email a transaction to your party, you can also send a web link to view the same document on the portal of your ERPNext account.
+
+#### Always add "Draft" Heading for printing draft documents
+
+Enabling this setting also print Draft in the Print Format as well, thus indicating that document shared is not completely authenticated as yet.
+
+#### Allow Page Break Inside Table
+
+If you have item's details which capture more than usual space of a page, then enabling this setting will split item's details to the next page. Hence, a page break will be inserted between the Item Description, and the rest of the details will be pushed to the next page.
+
+#### Allow Print for Cancelled
+
+Canceled transactions are the ones which don't have any impact on the reports. If you wish to allow printing for the canceled transactions, then enable this setting.
+
+#### Print Taxes with Zero Amount
+
+In the sales and purchase transactions, you can add apply multiple taxes on the item. Bydefault, in the print format, only taxes which has some amount calculated are visible in the Print Format. If you wish to also print the tax which was not applied to any item and has zero tax amount, just enable this setting.
 
 #### Network Printer
 
@@ -30,5 +80,4 @@ For Redhat OS Family:
 
 `sudo yum install cups-libs`
 
-
 {next}
diff --git a/foundation/www/docs/user/manual/en/stock/articles/mode_of_payment.md b/foundation/www/docs/user/manual/en/stock/articles/mode_of_payment.md
new file mode 100644
index 00000000..02d31ab7
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/stock/articles/mode_of_payment.md
@@ -0,0 +1,11 @@
+#Mode of Payment
+
+In the sales and purchase transactions, there are various options to settle the payment. We can do it in cash, via bank transfer, via promotion voucher to list a few. In ERPNext, you can create Mode of Payments as per your requirement. In the Payment Entry, you can select the Mode of Payment applicable.
+
+You can manage standard Mode of Payments and create new ones from:
+
+> Accounts > Setup > Mode of Payment
+
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/mode-of-payments.png">
+
+In each Mode of Payment master, you can also set a default payment account. On selection of Mode of Payment, the respective payment account will be fetched automatically in the transaction.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/add-products-to-website.md b/foundation/www/docs/user/manual/en/website/add-products-to-website.md
index 9801f7d4..5d020835 100755
--- a/foundation/www/docs/user/manual/en/website/add-products-to-website.md
+++ b/foundation/www/docs/user/manual/en/website/add-products-to-website.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Add Products To Website
 
 ### Add Products to the Website
diff --git a/foundation/www/docs/user/manual/en/website/articles/disable-signup.md b/foundation/www/docs/user/manual/en/website/articles/disable-signup.md
new file mode 100644
index 00000000..deba41fa
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/website/articles/disable-signup.md
@@ -0,0 +1,22 @@
+# Disable Signup on ERPNext Website
+
+ERPNext has portal feature available which allows thirs parties like Customers and Supplier sign, place new order and track updates on the previous orders. 
+
+<img class="screenshot" alt="Website signup" src="{{docs_base_url}}/assets/img/website/website-signup.png">
+
+To allow new Customer and Supplier to Signup, the login page of your ERPNext account has Signup link avaiable. However, if you wish to disbale this feature, you can achieve it by following the steps given below.
+
+### Steps
+
+1. Go To
+
+> Website > Setup > Website Settings `
+
+2. In the Website Settings page, scroll down upto `More Information` section.
+
+3. Check fied `Disable Signup`.
+
+<img class="screenshot" alt="Disable signup" src="{{docs_base_url}}/assets/img/website/disable-signup.png">
+
+4. Save Website Settings.
+
diff --git a/foundation/www/docs/user/manual/en/website/articles/index.txt b/foundation/www/docs/user/manual/en/website/articles/index.txt
index 97c24d55..eb7b11d5 100755
--- a/foundation/www/docs/user/manual/en/website/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/website/articles/index.txt
@@ -1,3 +1,4 @@
-managing-user-sign-up-via-website
+disable-signup
 website-security
 website-home-page
+website-banner
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
deleted file mode 100755
index 821d7622..00000000
--- a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- add-breadcrumbs -->
-<h1>Managing User Sign Up via Website</h1>
-
-Users can sign up for ERPNext account via the ERPNext Website.<div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg"><br></div><div><br></div><div>As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.</div><div>One might want to disable this feature to prevent anonymous users from signing up via the web.</div><div>To do so -</div><div>1. Go to&nbsp;<span style="line-height: 1.42857143;">` Website > Setup > Website Settings `&nbsp;</span></div><div>2. In website settings doctype navigate to the misc section.</div><div>3. Check the disable SignUp check-box and save the doc.</div><div><br></div><div>Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.</div><div><br></div>
-
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
deleted file mode 100755
index dda24ae6..00000000
--- a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- add-breadcrumbs -->
-#Customer / Supplier Signup
-
-Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
-
-<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
-
-As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
-
-One might want to disable this feature to prevent anonymous users from signing up via the web.
-
-To do so, Go to 
-
-1. ` Website > Setup > Website Settings ` 
-
-2. In website settings doctype navigate to the misc section.
-
-3. Check the disable SignUp check-box and save the doc.
-
-Now only the login button will appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
-
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-banner.md b/foundation/www/docs/user/manual/en/website/articles/website-banner.md
index 637f85c8..a16f7768 100755
--- a/foundation/www/docs/user/manual/en/website/articles/website-banner.md
+++ b/foundation/www/docs/user/manual/en/website/articles/website-banner.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Website Banner Resizing
 
 Each ERPNext account website automatically generated from it. On a website, logo is set based on logo image selected in the Setup Wizard. You can change or edit property for your company's logo from the Website Settings.
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
index c11c626b..d44a31aa 100755
--- a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
+++ b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Wesite Home Page
 
 It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-security.html b/foundation/www/docs/user/manual/en/website/articles/website-security.html
deleted file mode 100755
index cd6bf30d..00000000
--- a/foundation/www/docs/user/manual/en/website/articles/website-security.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- add-breadcrumbs -->
-<h1>Website Security</h1>
-
-<div><span style="line-height: 1.42857143;">One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.</span><br></div><div><span style="line-height: 1.42857143;"><br></span></div><div>Well at the moment this feature is not available. You cannot&nbsp;<span style="line-height: 1.42857143;">limit the access of the website generated by ERPNext to certain people.&nbsp;</span><span style="line-height: 1.42857143;">If you publish the website it will be&nbsp;</span><span style="line-height: 1.42857143;">publicly</span><span style="line-height: 1.42857143;">&nbsp;visible.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><span style="line-height: 1.42857143;">However while you cannot control who can view the website, you can always choose which items to display on the website.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><ul><li><span style="line-height: 1.42857143;">To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox.</span><br></li></ul></div><div><span style="line-height: 1.42857143;"><br></span></div><div><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><img src="{{docs_base_path}}/assets/img/articles/ShowItemOnWebsite.PNG"></div></blockquote></div><div><ul><li><span style="line-height: 1.42857143;">You can also fill in the details of the product as to be shown on the website here.</span><br></li></ul></div>
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-security.md b/foundation/www/docs/user/manual/en/website/articles/website-security.md
index 4be1c595..ef7986a6 100755
--- a/foundation/www/docs/user/manual/en/website/articles/website-security.md
+++ b/foundation/www/docs/user/manual/en/website/articles/website-security.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 #Website Security
 
 One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public.
diff --git a/foundation/www/docs/user/manual/en/website/blog-post.md b/foundation/www/docs/user/manual/en/website/blog-post.md
index 17683766..2b270e2a 100755
--- a/foundation/www/docs/user/manual/en/website/blog-post.md
+++ b/foundation/www/docs/user/manual/en/website/blog-post.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Blog Post
 
 Blogs are a great way to share your thoughts about your business and keep your
diff --git a/foundation/www/docs/user/manual/en/website/blogger.md b/foundation/www/docs/user/manual/en/website/blogger.md
index 34493acb..469ada12 100755
--- a/foundation/www/docs/user/manual/en/website/blogger.md
+++ b/foundation/www/docs/user/manual/en/website/blogger.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Blogger
 
 Blogger is a user who can post blogs. 
diff --git a/foundation/www/docs/user/manual/en/website/shopping-cart.md b/foundation/www/docs/user/manual/en/website/shopping-cart.md
index cf79b1f8..09129bd9 100755
--- a/foundation/www/docs/user/manual/en/website/shopping-cart.md
+++ b/foundation/www/docs/user/manual/en/website/shopping-cart.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Shopping Cart
 
 On the Webpage, a shopping cart is an icon that allows you to store all the
diff --git a/foundation/www/docs/user/manual/en/website/web-form.md b/foundation/www/docs/user/manual/en/website/web-form.md
index 8cc211d9..1a6cc37c 100755
--- a/foundation/www/docs/user/manual/en/website/web-form.md
+++ b/foundation/www/docs/user/manual/en/website/web-form.md
@@ -1,13 +1,14 @@
-<!-- add-breadcrumbs -->
 # Web Forms
 
-<p class="lead">Add forms to the website that will add / update data in your tables. Allow users to edit / manage multiple web forms</p>
+Portal Views are viewed by external users, but the community that interacts with the organization, but is not a part of the organization. These are customers, suppliers, job applicants, or students, guardians etc. 
 
-You can add forms in your website for example, Contact Us, Inquiry, Complaint etc. Data from these can fill up records like Lead, Opportunity, Issue etc. The user can also be allowed manage multiple records (like Complaints etc.)
+The standardized way these users can add or edit records is called "Web Forms".
 
----
+You can add Web Forms to your ERPNext website that will allow addition/updation of new records for the external users.
 
-### Creating
+You can add forms in your website for example, Contact Us, Inquiry, Complaint and other forms as per your requirement. Following is the help on adding new Web Form on ERPNext.
+
+### Creating Web Form
 
 To create a new **Web Form** go to:
 
@@ -18,21 +19,47 @@ To create a new **Web Form** go to:
 1. Select if you require the user to login, edit records, manage multiple records etc.
 1. Add the fields you want in the record.
 
-<img class="screenshot" alt="Web Form" src="{{docs_base_url}}/assets/img/website/web-form.png">
+<img class="screenshot" alt="Web Form Entry" src="{{docs_base_url}}/assets/img/website/webform-1.png">
 
----
+--
 
-### Viewing
+## Web Form View
 
-Once you create the web form, you can view it on the url and test it out!
+### Form with Child Table
 
-<img class="screenshot" alt="Web form" src="{{docs_base_url}}/assets/img/website/web-form-view.png">
+Once you create the web form, you can view it on the url and test it out! You can add child tables to your web forms, just like regular forms 
+
+<img class="screenshot" alt="Web form Grid" src="{{docs_base_url}}/assets/img/website/grid-in-webform.png">
+
+### Pagination
+
+To help your users fill out long new forms, you can insert page breaks that will appear on new sections. This way the user can focus on only filling one section at a time. 
+
+<img class="screenshot" alt="Web form paging" src="{{docs_base_url}}/assets/img/website/paging-in-webform.png">
+
+### Payment Gateway Integration
+
+You can now add a Payment Gateway to the web form, so that you can ask users to pay against a web form. A good example for this is a conference ticket :) 
+
+<img class="screenshot" alt="Web form payment" src="{{docs_base_url}}/assets/img/website/payment-in-webform.png">
+
+### Portal User
+
+We have also introduced roles for Website users. Now the for each standard Role you can optionally disallow "Desk Access" to that user. 
+
+In Portal Settings, you can set a role against each menu item so that only users with that role will be allowed to see that item. 
+
+<img class="screenshot" alt="portal settings" src="{{docs_base_url}}/assets/img/website/portal-settings.png">
 
 ---
 
 ### Results
 
-Your data will be stored in the table you have selected
+When website user submits the form, the data will be stored in the document/doctype for which web form is creaeted.
+
+### Customizing
+
+For customizing web forms, see the [Frappe Documentation of Web Forms](https://frappe.io/docs/user/en/guides/portal-development/web-forms)
 
 ### Customizing
 
diff --git a/foundation/www/docs/user/manual/en/website/web-page.md b/foundation/www/docs/user/manual/en/website/web-page.md
index a09e88a6..5b4d46be 100755
--- a/foundation/www/docs/user/manual/en/website/web-page.md
+++ b/foundation/www/docs/user/manual/en/website/web-page.md
@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Web Page
 
 <p class="lead">Static Content like your Home Page, About Us, Contact Us, Terms pages can be created using the Web Page. </p>