# HG changeset patch # User Rich Burridge # Date 1445546882 25200 # Node ID ba06ad809495bd95851790061365dca57b56c6b2 # Parent 714545171c1749574e03d0a6c09857317f0c8be1 PSARC 2015/428 Normalization of Solaris man page section numbers 22079179 Normalize smp_utils man pages 22079309 Normalize groff man pages 22079430 Normalize tomcat man pages 22079505 Normalize mtr man pages 22079563 Normalize gnupg man pages diff -r 714545171c17 -r ba06ad809495 components/gnupg/Makefile --- a/components/gnupg/Makefile Thu Oct 22 09:15:17 2015 -0700 +++ b/components/gnupg/Makefile Thu Oct 22 13:48:02 2015 -0700 @@ -150,14 +150,6 @@ install: $(INSTALL_64) ( cd $(PROTOUSRSHARELOCALEDIR) ; \ $(CP) -R 'en@boldquot' en ) - ( cd $(PROTOUSRSHAREMANDIR) ; \ - if test -d man8 ; then \ - $(MV) man8 man1m ; fi ) - ( cd $(PROTOUSRSHAREMANDIR)/man1m ; \ - list1='$(MAN8LIST)' ; for f in $$list1; do \ - if test -f $$f.8 ; then \ - $(MV) $$f.8 $$f.1m ; fi ; \ - done ) test: $(TEST_64) diff -r 714545171c17 -r ba06ad809495 components/gnupg/gnupg.p5m --- a/components/gnupg/gnupg.p5m Thu Oct 22 09:15:17 2015 -0700 +++ b/components/gnupg/gnupg.p5m Thu Oct 22 13:48:02 2015 -0700 @@ -150,8 +150,8 @@ file path=usr/share/man/man1/scdaemon.1 file path=usr/share/man/man1/symcryptrun.1 file path=usr/share/man/man1/watchgnupg.1 -file path=usr/share/man/man1m/addgnupghome.1m -file path=usr/share/man/man1m/applygnupgdefaults.1m +file path=usr/share/man/man8/addgnupghome.8 +file path=usr/share/man/man8/applygnupgdefaults.8 # license gnupg.license license="GPLv3, LGPLv3" # diff -r 714545171c17 -r ba06ad809495 components/groff/Makefile --- a/components/groff/Makefile Thu Oct 22 09:15:17 2015 -0700 +++ b/components/groff/Makefile Thu Oct 22 13:48:02 2015 -0700 @@ -69,14 +69,6 @@ CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" -# Groff's manual section numbering is configurable. Renumber the sections -# during build to get the internal references substituted, and during install -# to get them into the right directories. -COMPONENT_BUILD_ARGS += man5ext=4 -COMPONENT_BUILD_ARGS += man7ext=5 -COMPONENT_INSTALL_ARGS += man5ext=4 -COMPONENT_INSTALL_ARGS += man7ext=5 - # Don't generate tmac wrappers for the Solaris troff macro packages. # Some man pages (such as groff.1) use long macro name definitions # which fail in compatibility mode. See: diff -r 714545171c17 -r ba06ad809495 components/groff/groff.p5m --- a/components/groff/groff.p5m Thu Oct 22 09:15:17 2015 -0700 +++ b/components/groff/groff.p5m Thu Oct 22 13:48:02 2015 -0700 @@ -527,29 +527,29 @@ file path=usr/share/man/man1/roff2x.1 file path=usr/share/man/man1/tfmtodit.1 file path=usr/share/man/man1/xtotroff.1 -file path=usr/share/man/man4/groff_font.4 -file path=usr/share/man/man4/groff_out.4 -file path=usr/share/man/man4/groff_tmac.4 -file path=usr/share/man/man4/lj4_font.4 -file path=usr/share/man/man5/ditroff.5 -file path=usr/share/man/man5/groff.5 -file path=usr/share/man/man5/groff_char.5 -file path=usr/share/man/man5/groff_diff.5 -file path=usr/share/man/man5/groff_hdtbl.5 -file path=usr/share/man/man5/groff_man.5 -file path=usr/share/man/man5/groff_mdoc.5 -file path=usr/share/man/man5/groff_me.5 -file path=usr/share/man/man5/groff_mm.5 -file path=usr/share/man/man5/groff_mmse.5 -file path=usr/share/man/man5/groff_mom.5 -file path=usr/share/man/man5/groff_ms.5 -file path=usr/share/man/man5/groff_trace.5 -file path=usr/share/man/man5/groff_www.5 -link path=usr/share/man/man5/man.5 target=./groff_man.5 -link path=usr/share/man/man5/me.5 target=./groff_me.5 -link path=usr/share/man/man5/mm.5 target=./groff_mm.5 -link path=usr/share/man/man5/ms.5 target=./groff_ms.5 -file path=usr/share/man/man5/roff.5 +file path=usr/share/man/man5/groff_font.5 +file path=usr/share/man/man5/groff_out.5 +file path=usr/share/man/man5/groff_tmac.5 +file path=usr/share/man/man5/lj4_font.5 +file path=usr/share/man/man7/ditroff.7 +file path=usr/share/man/man7/groff.7 +file path=usr/share/man/man7/groff_char.7 +file path=usr/share/man/man7/groff_diff.7 +file path=usr/share/man/man7/groff_hdtbl.7 +file path=usr/share/man/man7/groff_man.7 +file path=usr/share/man/man7/groff_mdoc.7 +file path=usr/share/man/man7/groff_me.7 +file path=usr/share/man/man7/groff_mm.7 +file path=usr/share/man/man7/groff_mmse.7 +file path=usr/share/man/man7/groff_mom.7 +file path=usr/share/man/man7/groff_ms.7 +file path=usr/share/man/man7/groff_trace.7 +file path=usr/share/man/man7/groff_www.7 +link path=usr/share/man/man7/man.7 target=./groff_man.7 +link path=usr/share/man/man7/me.7 target=./groff_me.7 +link path=usr/share/man/man7/mm.7 target=./groff_mm.7 +link path=usr/share/man/man7/ms.7 target=./groff_ms.7 +file path=usr/share/man/man7/roff.7 license FDL license=FDLv1.3 license COPYING license=GPLv3 diff -r 714545171c17 -r ba06ad809495 components/mtr/mtr.p5m --- a/components/mtr/mtr.p5m Thu Oct 22 09:15:17 2015 -0700 +++ b/components/mtr/mtr.p5m Thu Oct 22 13:48:02 2015 -0700 @@ -40,6 +40,6 @@ # file exec_attr.txt path=etc/security/exec_attr.d/network:mtr file path=usr/bin/mtr mode=4555 -file usr/share/man/man8/mtr.8 path=usr/share/man/man1m/mtr.1m +file path=usr/share/man/man8/mtr.8 # license COPYING license=GPLv2 diff -r 714545171c17 -r ba06ad809495 components/smp_utils/Makefile --- a/components/smp_utils/Makefile Thu Oct 22 09:15:17 2015 -0700 +++ b/components/smp_utils/Makefile Thu Oct 22 13:48:02 2015 -0700 @@ -65,13 +65,6 @@ $(GSED) -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool ; \ $(GSED) -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool) -# Move the section 8 man pages into section 1m. -COMPONENT_POST_INSTALL_ACTION = \ - for f in $(PROTOUSRSHAREMANDIR)/man8/*; do \ - mv $$f $${f%.8}.1m; \ - done ; \ - $(MV) $(PROTOUSRSHAREMANDIR)/man8 $(PROTOUSRSHAREMANDIR)/man1m - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files COMPONENT_INSTALL_ARGS += INSTALL=$(INSTALL) diff -r 714545171c17 -r ba06ad809495 components/smp_utils/smp_utils.p5m --- a/components/smp_utils/smp_utils.p5m Thu Oct 22 09:15:17 2015 -0700 +++ b/components/smp_utils/smp_utils.p5m Thu Oct 22 13:48:02 2015 -0700 @@ -83,35 +83,35 @@ file usr/sbin/$(MACH64)/smp_zone_lock path=usr/sbin/smp_zone_lock file usr/sbin/$(MACH64)/smp_zone_unlock path=usr/sbin/smp_zone_unlock file usr/sbin/$(MACH64)/smp_zoned_broadcast path=usr/sbin/smp_zoned_broadcast -file path=usr/share/man/man1m/smp_conf_general.1m -file path=usr/share/man/man1m/smp_conf_phy_event.1m -file path=usr/share/man/man1m/smp_conf_route_info.1m -file path=usr/share/man/man1m/smp_conf_zone_man_pass.1m -file path=usr/share/man/man1m/smp_conf_zone_perm_tbl.1m -file path=usr/share/man/man1m/smp_conf_zone_phy_info.1m -file path=usr/share/man/man1m/smp_discover.1m -file path=usr/share/man/man1m/smp_discover_list.1m -file path=usr/share/man/man1m/smp_ena_dis_zoning.1m -file path=usr/share/man/man1m/smp_phy_control.1m -file path=usr/share/man/man1m/smp_phy_test.1m -file path=usr/share/man/man1m/smp_read_gpio.1m -file path=usr/share/man/man1m/smp_rep_broadcast.1m -file path=usr/share/man/man1m/smp_rep_exp_route_tbl.1m -file path=usr/share/man/man1m/smp_rep_general.1m -file path=usr/share/man/man1m/smp_rep_manufacturer.1m -file path=usr/share/man/man1m/smp_rep_phy_err_log.1m -file path=usr/share/man/man1m/smp_rep_phy_event.1m -file path=usr/share/man/man1m/smp_rep_phy_event_list.1m -file path=usr/share/man/man1m/smp_rep_phy_sata.1m -file path=usr/share/man/man1m/smp_rep_route_info.1m -file path=usr/share/man/man1m/smp_rep_self_conf_stat.1m -file path=usr/share/man/man1m/smp_rep_zone_man_pass.1m -file path=usr/share/man/man1m/smp_rep_zone_perm_tbl.1m -file path=usr/share/man/man1m/smp_utils.1m -file path=usr/share/man/man1m/smp_write_gpio.1m -file path=usr/share/man/man1m/smp_zone_activate.1m -file path=usr/share/man/man1m/smp_zone_lock.1m -file path=usr/share/man/man1m/smp_zone_unlock.1m -file path=usr/share/man/man1m/smp_zoned_broadcast.1m +file path=usr/share/man/man8/smp_conf_general.8 +file path=usr/share/man/man8/smp_conf_phy_event.8 +file path=usr/share/man/man8/smp_conf_route_info.8 +file path=usr/share/man/man8/smp_conf_zone_man_pass.8 +file path=usr/share/man/man8/smp_conf_zone_perm_tbl.8 +file path=usr/share/man/man8/smp_conf_zone_phy_info.8 +file path=usr/share/man/man8/smp_discover.8 +file path=usr/share/man/man8/smp_discover_list.8 +file path=usr/share/man/man8/smp_ena_dis_zoning.8 +file path=usr/share/man/man8/smp_phy_control.8 +file path=usr/share/man/man8/smp_phy_test.8 +file path=usr/share/man/man8/smp_read_gpio.8 +file path=usr/share/man/man8/smp_rep_broadcast.8 +file path=usr/share/man/man8/smp_rep_exp_route_tbl.8 +file path=usr/share/man/man8/smp_rep_general.8 +file path=usr/share/man/man8/smp_rep_manufacturer.8 +file path=usr/share/man/man8/smp_rep_phy_err_log.8 +file path=usr/share/man/man8/smp_rep_phy_event.8 +file path=usr/share/man/man8/smp_rep_phy_event_list.8 +file path=usr/share/man/man8/smp_rep_phy_sata.8 +file path=usr/share/man/man8/smp_rep_route_info.8 +file path=usr/share/man/man8/smp_rep_self_conf_stat.8 +file path=usr/share/man/man8/smp_rep_zone_man_pass.8 +file path=usr/share/man/man8/smp_rep_zone_perm_tbl.8 +file path=usr/share/man/man8/smp_utils.8 +file path=usr/share/man/man8/smp_write_gpio.8 +file path=usr/share/man/man8/smp_zone_activate.8 +file path=usr/share/man/man8/smp_zone_lock.8 +file path=usr/share/man/man8/smp_zone_unlock.8 +file path=usr/share/man/man8/smp_zoned_broadcast.8 license smp_utils.license license=BSD depend type=require fmri=driver/storage/smp diff -r 714545171c17 -r ba06ad809495 components/tomcat-8/Solaris/tomcat.1m --- a/components/tomcat-8/Solaris/tomcat.1m Thu Oct 22 09:15:17 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ -'\" te -.\" Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. -.TH tomcat8 1M "May 2015" "SunOS 5.12" "System Administration Commands" -.SH NAME -tomcat \- Apache Tomcat Version 8 overview -.SH DESCRIPTION -.sp -.LP -Apache Tomcat Version 8 (Tomcat) is implementation of -the Java Servlet and JavaServer Pages technologies. -.sp -Tomcat can be enabled by authorized user within the service -management facility (SMF), using the following fault management -resource identifier (FMRI): -.sp -.in +2 -.nf -svc:/network/http:tomcat8 -.fi -.in -2 -.sp -Tomcat enabled via SMF is executed for better security with "webserv" -user credentials and with added "net_privaddr" privilege so it can be -configured to listen on privileged TCP ports (e.g. 80). With default -configuration Tomcat listens on TCP port 8080. -.sp -Unauthorized user can start Tomcat with his or her credentials using -ordinary startup scripts and by setting CATALINA_BASE environment -variable to path with his or her conf/, webapp/ and logs/ subdirectories -(see Tomcat directory structure bellow). -.sp -Similarly it's possible to run multiple SMF Tomcat instances by setting -CATALINA_BASE for both start and stop methods for newly created Tomcat -FMRI. -.sp -.LP -.SH FILES -.sp -.LP -The following files specify the installation locations for Tomcat 6: -.LP -\fB\fB/etc/tomcat8/\fR\fR -.ad -.sp .6 -.RS 4n -Symbolic link to directory containing Tomcat 8 configuration files (/var/tomcat8/conf). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/usr/tomcat8/bin/\fR\fR -.ad -.sp .6 -.RS 4n -Contains Tomcat startup scripts. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/usr/tomcat8/lib/\fR\fR -.ad -.sp .6 -.RS 4n -Contains Tomcat private libraries. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/usr/tomvat8/docs/\fR\fR -.ad -.sp .6 -.RS 4n -Contains Tomcat documentation in HTML format. The directory has classical -WEBAPP structure and it's symbolically linked as /var/tomcat8/webapps/docs -(the link is part of web/java-servlet/tomcat/tomcat-examples packages). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/conf/\fR\fR -.ad -.sp .6 -.RS 4n -Contains Tomcat configuration files. A newly-installed Tomcat -contains a default \fBserver.xml\fR file. This is the main configuration file. -For setting Tomcat environment variables it's possible to create here -\fBsetenv.sh\fR file which is sourced during start by catalina.sh. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/logs/\fR\fR -.ad -.sp .6 -.RS 4n -Contains Tomcat log and output files. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/temp/\fR\fR -.ad -.sp .6 -.RS 4n -Directory used by the JVM for temporary files (java.io.tmpdir). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/webapps/\fR\fR -.ad -.sp .6 -.RS 4n -Tomcat Web Application Directory where are WAR files put for deployment. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/webapps/ROOT/\fR\fR -.ad -.sp .6 -.RS 4n -Directory with default (ROOT) web application which is served when URL -is requested without further path specifier (http://hostname/). After -Tomcat packages installation this directory is intentionally left empty -with just index.jsp and index.htm files. The HTML file redirects -requester to Tomcat home page which is in ROOT.example/ directory (this -file is part of web/java-servlet/tomcat/tomcat-examples package). The JSP file is default home -page which is shown when web/java-servlet/tomcat/tomcat-examples (and thus HTML file) is not -installed. This shall allow better deployment of custom ROOT web -application while maintain upgrade ability via packaging system (without -loosing data). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/webapps/ROOT.example/\fR\fR -.ad -.sp .6 -.RS 4n -Tomcat home web application (part of web/java-servlet/tomcat/tomcat-examples package). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/webapps/examples/\fR\fR -.ad -.sp .6 -.RS 4n -This directory contains web application with various ServLets and JSP -examples. The directory is part of web/java-servlet/tomcat/tomcat-examples package which can -be removed if it's required (to permanently disable this web -application). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB/var/tomcat8/work/\fR\fR -.ad -.sp .6 -.RS 4n -Directory where Tomcat places for web applications intermediate files -(such as compiled JSP files) during its work. -.RE - -.SH SEE ALSO -.sp -.LP -http://tomcat.apache.org/tomcat-8.0-doc diff -r 714545171c17 -r ba06ad809495 components/tomcat-8/Solaris/tomcat.8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/tomcat-8/Solaris/tomcat.8 Thu Oct 22 13:48:02 2015 -0700 @@ -0,0 +1,191 @@ +'\" te +.\" Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. +.TH tomcat8 8 "21 Oct 2015" "SunOS 5.12" "System Administration Commands" +.SH NAME +tomcat \- Apache Tomcat Version 8 overview +.SH DESCRIPTION +.sp +.LP +Apache Tomcat Version 8 (Tomcat) is implementation of +the Java Servlet and JavaServer Pages technologies. +.sp +Tomcat can be enabled by authorized user within the service +management facility (SMF), using the following fault management +resource identifier (FMRI): +.sp +.in +2 +.nf +svc:/network/http:tomcat8 +.fi +.in -2 +.sp +Tomcat enabled via SMF is executed for better security with "webserv" +user credentials and with added "net_privaddr" privilege so it can be +configured to listen on privileged TCP ports (e.g. 80). With default +configuration Tomcat listens on TCP port 8080. +.sp +Unauthorized user can start Tomcat with his or her credentials using +ordinary startup scripts and by setting CATALINA_BASE environment +variable to path with his or her conf/, webapp/ and logs/ subdirectories +(see Tomcat directory structure bellow). +.sp +Similarly it's possible to run multiple SMF Tomcat instances by setting +CATALINA_BASE for both start and stop methods for newly created Tomcat +FMRI. +.sp +.LP +.SH FILES +.sp +.LP +The following files specify the installation locations for Tomcat 6: +.LP +\fB\fB/etc/tomcat8/\fR\fR +.ad +.sp .6 +.RS 4n +Symbolic link to directory containing Tomcat 8 configuration files (/var/tomcat8/conf). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/usr/tomcat8/bin/\fR\fR +.ad +.sp .6 +.RS 4n +Contains Tomcat startup scripts. +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/usr/tomcat8/lib/\fR\fR +.ad +.sp .6 +.RS 4n +Contains Tomcat private libraries. +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/usr/tomvat8/docs/\fR\fR +.ad +.sp .6 +.RS 4n +Contains Tomcat documentation in HTML format. The directory has classical +WEBAPP structure and it's symbolically linked as /var/tomcat8/webapps/docs +(the link is part of web/java-servlet/tomcat/tomcat-examples packages). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/conf/\fR\fR +.ad +.sp .6 +.RS 4n +Contains Tomcat configuration files. A newly-installed Tomcat +contains a default \fBserver.xml\fR file. This is the main configuration file. +For setting Tomcat environment variables it's possible to create here +\fBsetenv.sh\fR file which is sourced during start by catalina.sh. +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/logs/\fR\fR +.ad +.sp .6 +.RS 4n +Contains Tomcat log and output files. +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/temp/\fR\fR +.ad +.sp .6 +.RS 4n +Directory used by the JVM for temporary files (java.io.tmpdir). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/webapps/\fR\fR +.ad +.sp .6 +.RS 4n +Tomcat Web Application Directory where are WAR files put for deployment. +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/webapps/ROOT/\fR\fR +.ad +.sp .6 +.RS 4n +Directory with default (ROOT) web application which is served when URL +is requested without further path specifier (http://hostname/). After +Tomcat packages installation this directory is intentionally left empty +with just index.jsp and index.htm files. The HTML file redirects +requester to Tomcat home page which is in ROOT.example/ directory (this +file is part of web/java-servlet/tomcat/tomcat-examples package). The JSP file is default home +page which is shown when web/java-servlet/tomcat/tomcat-examples (and thus HTML file) is not +installed. This shall allow better deployment of custom ROOT web +application while maintain upgrade ability via packaging system (without +loosing data). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/webapps/ROOT.example/\fR\fR +.ad +.sp .6 +.RS 4n +Tomcat home web application (part of web/java-servlet/tomcat/tomcat-examples package). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/webapps/examples/\fR\fR +.ad +.sp .6 +.RS 4n +This directory contains web application with various ServLets and JSP +examples. The directory is part of web/java-servlet/tomcat/tomcat-examples package which can +be removed if it's required (to permanently disable this web +application). +.RE + +.sp +.ne 2 +.mk +.na +\fB\fB/var/tomcat8/work/\fR\fR +.ad +.sp .6 +.RS 4n +Directory where Tomcat places for web applications intermediate files +(such as compiled JSP files) during its work. +.RE + +.SH SEE ALSO +.sp +.LP +http://tomcat.apache.org/tomcat-8.0-doc diff -r 714545171c17 -r ba06ad809495 components/tomcat-8/tomcat.p5m --- a/components/tomcat-8/tomcat.p5m Thu Oct 22 09:15:17 2015 -0700 +++ b/components/tomcat-8/tomcat.p5m Thu Oct 22 13:48:02 2015 -0700 @@ -49,9 +49,9 @@ link path=etc/tomcat8 target=../var/tomcat8/conf file Solaris/http-tomcat.xml path=lib/svc/manifest/network/http-tomcat8.xml file Solaris/http-tomcat path=lib/svc/method/http-tomcat8 -link path=usr/share/man/man1m/tomcat.1 target=tomcat8.1m mediator=tomcat \ +link path=usr/share/man/man8/tomcat.8 target=tomcat8.8 mediator=tomcat \ mediator-version=8 -file Solaris/tomcat.1m path=usr/share/man/man1m/tomcat8.1m +file Solaris/tomcat.8 path=usr/share/man/man8/tomcat8.8 file path=usr/tomcat8/bin/bootstrap.jar file path=usr/tomcat8/bin/catalina-tasks.xml file path=usr/tomcat8/bin/catalina.sh