Re: Patch for pgAdmin docs (role_dialog.rst, resource_group_dialog.rst) - Mailing list pgadmin-hackers

Hi All, Dave helped me through this problem on chat... Thanks! -- Susan > On Nov 30, 2017, at 7:09 AM, Dave Page wrote: > > Hi > > On Thu, Nov 30, 2017 at 12:04 PM, Susan Douglas > wrote: > Hi All, > > I've attached a patch that updates the following files (correcting minor problems, adding missing tabs, etc.): > > resource_group_dialog.rst > role_dialog.rst > > Dave has checked in the screenshots that go with these updates - Let me know if there are any problems! > > Thanks! > > Unfortunately the patch doesn't apply. Did you remember to update your repo before creating it? > > (pgadmin4)piranha:pgadmin4 dpage$ git apply ~/Downloads/pgadmin4_doc.patch > /Users/dpage/Downloads/pgadmin4_doc.patch:10: trailing whitespace. > Fields used to create a resource group are located on the *General* tab. The *SQL* tab displays the SQL code generated by your selections on the *Resource Group* dialog. > /Users/dpage/Downloads/pgadmin4_doc.patch:27: trailing whitespace. > Your entries in the *Resource Group* dialog generate a SQL command. Use the *SQL* tab for review; revisit the *General* tab to make any changes to the SQL command. > /Users/dpage/Downloads/pgadmin4_doc.patch:36: trailing whitespace. > * Click the Info button (*i*) to access online SQL syntax reference material. > /Users/dpage/Downloads/pgadmin4_doc.patch:37: trailing whitespace. > * Click the Help button (*?*) to access online documentation about Resource Groups. > /Users/dpage/Downloads/pgadmin4_doc.patch:50: trailing whitespace. > The *Login/Group Role* dialog organizes the creation and management of roles through the following dialog tabs: *General*, *Definition*, *Privileges*, *Parameters*, and *Security*. The *SQL* tab displays the SQL code generated by dialog selections. > error: patch failed: docs/en_US/resource_group_dialog.rst:8 > error: docs/en_US/resource_group_dialog.rst: patch does not apply > error: patch failed: docs/en_US/role_dialog.rst:6 > error: docs/en_US/role_dialog.rst: patch does not apply > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company