Skip to content

Commit

Permalink
Merge pull request #1996 from swaterkamp/AboutPage
Browse files Browse the repository at this point in the history
Adjust About page text
  • Loading branch information
swaterkamp authored Feb 26, 2020
2 parents af9b112 + 2ec4480 commit d4f6eb2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Multistep dialog feature, implemented on scanner dialog [#1725](https://github.com/greenbone/gsa/pull/1725)

### Changed
- Changed image and layout of About page [#1993](https://github.com/greenbone/gsa/pull/1993)
- Changed image, text, and layout of About page [#1993](https://github.com/greenbone/gsa/pull/1993)[#1996](https://github.com/greenbone/gsa/pull/1996)
- Adjusted multiselect and report listpage to use getDerivedStateFromProps instead of deprecated componentWillReceiveProps [#1935](https://github.com/greenbone/gsa/pull/1935)
- Updated react-beautiful-dnd to version 12.2.0 and fix dragging into empty row [#1837](https://github.com/greenbone/gsa/pull/1837)
- Deleting a single entity now removes its ID from store [#1839](https://github.com/greenbone/gsa/pull/1839)
Expand Down
12 changes: 6 additions & 6 deletions gsa/src/web/pages/help/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const About = ({gmp}) => (
<DivP>
{_(
'GSA connects to GVM via the Greenbone Management Protocol ' +
'(GMP) making the rich feature set of the GVM backend ' +
'(GMP) making the extensive feature set of the GVM backend ' +
'available, covering vulnerability scanning, vulnerability ' +
'management, and related activities.',
)}
Expand Down Expand Up @@ -107,11 +107,11 @@ const About = ({gmp}) => (
</DivP>
<DivP>
{_(
'Cookies: This web application uses cookies to store session' +
' information. The cookie is not stored on the server-side hard' +
' disk and not submitted anywhere. It is lost when the session ' +
'is closed or expired. The cookie is also temporarily stored in' +
' your browser where you can examine the content.',
'This web application uses cookies to store session information' +
'. The cookies are not stored on the server side hard disk ' +
'and not submitted anywhere. They are lost when the session ' +
'is closed or expired. The cookies are stored temporarily in ' +
'your browser as well where you can examine the content.',
)}
</DivP>
<DivP>
Expand Down

0 comments on commit d4f6eb2

Please sign in to comment.