diff --git a/chromium_src/chrome/app/resources/manpage.1.in b/chromium_src/chrome/app/resources/manpage.1.in new file mode 100644 index 000000000000..f8d6fa1bf3fd --- /dev/null +++ b/chromium_src/chrome/app/resources/manpage.1.in @@ -0,0 +1,170 @@ +.\" This file is processed to generate manpages in the +.\" build diretory. +.TH @@PACKAGE@@ 1 "" "" "USER COMMANDS" + +.SH NAME +@@PACKAGE@@ \- Brave Browser + +.SH SYNOPSIS +.B @@PACKAGE@@ +[\fIOPTION\fR] [\fIPATH\fR|\fIURL\fR] + +.SH DESCRIPTION +See the Brave Help Center for help on using the browser. +.IP + +.PP +This manpage only describes invocation, environment, and arguments. + +.SH OPTIONS +@@MENUNAME@@ has hundreds of undocumented command-line flags that are added +and removed at the whim of the developers. Here, we document relatively +stable flags. +.TP +\fB\-\-user\-data\-dir\fR=\fIDIR\fR +Specifies the directory that user data (your "profile") is kept in. +Defaults to +.I $HOME/.config/@@PACKAGE@@ . +Separate instances of @@MENUNAME@@ must use separate user data directories; +repeated invocations of @@PACKAGE@@ will reuse an existing process for +a given user data directory. + +.TP +\fB\-\-app\fR=\fIURL\fR +Runs +.I URL +in "app mode": with no browser toolbars. + +.TP +\fB\-\-incognito\fR +Open in incognito mode. + +.TP +\fB\-\-new-window\fR +If \fIPATH\fR or \fIURL\fR is given, open it in a new window. + +.TP +\fB\-\-proxy-server\fR=\fIhost:port\fR +Specify the HTTP/SOCKS4/SOCKS5 proxy server to use for requests. This +overrides any environment variables or settings picked via the options dialog. +An individual proxy server is specified using the format: + + [://][:] + +Where is the protocol of the proxy server, and is one of: + + "http", "socks", "socks4", "socks5". + +If the is omitted, it defaults to "http". Also note that +"socks" is equivalent to "socks5". + +Examples: + + --proxy-server="foopy:99" + Use the HTTP proxy "foopy:99" to load all URLs. + + --proxy-server="socks://foobar:1080" + Use the SOCKS v5 proxy "foobar:1080" to load all URLs. + + --proxy-server="socks4://foobar:1080" + Use the SOCKS v4 proxy "foobar:1080" to load all URLs. + + --proxy-server="socks5://foobar:66" + Use the SOCKS v5 proxy "foobar:66" to load all URLs. + +It is also possible to specify a separate proxy server for different URL types, +by prefixing the proxy server specifier with a URL specifier: + +Example: + + --proxy-server="https=proxy1:80;http=socks4://baz:1080" + Load https://* URLs using the HTTP proxy "proxy1:80". And load http://* + URLs using the SOCKS v4 proxy "baz:1080". + +.TP +\fB\-\-no-proxy-server\fR +Disables the proxy server. Overrides any environment variables or +settings picked via the options dialog. + +.TP +\fB\-\-proxy-auto-detect\fR +Autodetect proxy configuration. Overrides any environment variables +or settings picked via the options dialog. + +.TP +\fB\-\-proxy-pac-url\fR=\fIURL\fR +Specify proxy autoconfiguration URL. Overrides any environment variables +or settings picked via the options dialog. + +.TP +\fB\-\-password-store\fR=<\fIbasic\fR|\fIgnome\fR|\fIkwallet\fR> +Set the password store to use. The default is to automatically detect based +on the desktop environment. \fIbasic\fR selects the built in, unencrypted +password store. \fIgnome\fR selects Gnome keyring. \fIkwallet\fR selects +(KDE) KWallet. (Note that KWallet may not work reliably outside KDE.) + +.TP +\fB\-\-version\fR +Show version information. + +.PP +As a GTK+ app, @@MENUNAME@@ also obeys GTK+ command-line flags, such +as +.BR \-\-display . +See the GTK documentation for more: +.IP + + + +.SH ENVIRONMENT +@@MENUNAME@@ obeys the following environment variables: + +.TP +.B all_proxy +Shorthand for specifying all of +.B http_proxy, https_proxy, ftp_proxy + +.TP +.B http_proxy, https_proxy, ftp_proxy +The proxy servers used for HTTP, HTTPS, and FTP. +.I Note: +because Gnome/KDE proxy settings may propagate into these variables +in some terminals, this variable is ignored (in preference for actual +system proxy settings) when running under Gnome or KDE. Use the +command-line flags to set these when you want to force their values. + +.TP +.B auto_proxy +Specify proxy autoconfiguration. Defined and empty autodetects; otherwise, +it should be an autoconfig URL. But see above note about Gnome/KDE. + +.TP +.B SOCKS_SERVER +SOCKS proxy server (defaults to SOCKS v4, also set +.B SOCKS_VERSION=5 +to use SOCKS v5). + +.TP +.B no_proxy +Comma separated list of hosts or patterns to bypass proxying. + +.SH FILES +.TP +.I $HOME/.config/@@PACKAGE@@ +Default directory for configuration data. + +.TP +.I $HOME/.cache/@@PACKAGE@@ +Default directory for cache data. (Why? See + .) + +.SH BUGS +Bug tracker: +.IP +https://github.com/brave/brave-browser/issues/ +.PP +Be sure to do your search within "All Issues" before reporting bugs, +and be sure to pick the "Defect on Linux" template when filing a new one. + +.SH AUTHOR +Brave Software \- diff --git a/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml b/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml index db7d0d16b4d6..0ad504f29425 100644 --- a/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml +++ b/chromium_src/chrome/installer/linux/common/brave-browser/chromium-browser.appdata.xml @@ -16,8 +16,14 @@

https://brave.com/ + + + https://www.brave.com/images/browser.png + + + Brave Software - https://github.com/brave - https://community.brave.com/ + https://github.com/brave/brave-browser/issues/ + https://support.brave.com/ diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index ee32ef463e60..18b413408009 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index cec5121658106e305ef617906e539bfc10811041..6b75b049ccf7eebd58e3aa7914b4d81328817210 100644 +index cec5121658106e305ef617906e539bfc10811041..fb6d3999a7245cf884fb90763e0c1d4e81b23bae 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn @@ -27,8 +27,8 @@ declare_args() { @@ -32,6 +32,15 @@ index cec5121658106e305ef617906e539bfc10811041..6b75b049ccf7eebd58e3aa7914b4d813 script = "//build/gn_run_binary.py" sources = [ prog_name, +@@ -220,7 +225,7 @@ branding_dir_100 = + copy("common_packaging_files") { + visibility = [ ":*" ] + sources = [ +- "//chrome/app/resources/manpage.1.in", ++ "//brave/chromium_src/chrome/app/resources/manpage.1.in", + "common/apt.include", + "common/default-app-block.template", + "common/default-app.template", @@ -243,8 +248,8 @@ copy("common_packaging_files") { ] } else {