PR#6: Extending content - making modules and community - fedora-docs/modularity

		`@@ -0,0 +1,158 @@`
		`+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>`
		`+ <!-- Created with Inkscape (http://www.inkscape.org/) -->`
		`+`
		`+ <svg`
		`+ xmlns:dc="http://purl.org/dc/elements/1.1/"`
		`+ xmlns:cc="http://creativecommons.org/ns#"`
		`+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"`
		`+ xmlns:svg="http://www.w3.org/2000/svg"`
		`+ xmlns="http://www.w3.org/2000/svg"`
		`+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"`
		`+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"`
		`+ width="32mm"`
		`+ height="10.58333mm"`
		`+ viewBox="0 0 32 10.58333"`
		`+ id="svg2"`
		`+ version="1.1"`
		`+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"`
		`+ sodipodi:docname="docs_logo.svg"`
		`+ inkscape:export-filename="/home/rlerch/Source/pagure/pagure/static/pagure-logo.png"`
		`+ inkscape:export-xdpi="192"`
		`+ inkscape:export-ydpi="192">`
		`+ <defs`
		`+ id="defs4" />`
		`+ <sodipodi:namedview`
		`+ id="base"`
		`+ pagecolor="#ffffff"`
		`+ bordercolor="#666666"`
		`+ borderopacity="1.0"`
		`+ inkscape:pageopacity="0.0"`
		`+ inkscape:pageshadow="2"`
		`+ inkscape:zoom="2.8284271"`
		`+ inkscape:cx="107.3632"`
		`+ inkscape:cy="-69.668191"`
		`+ inkscape:document-units="mm"`
		`+ inkscape:current-layer="g126"`
		`+ showgrid="false"`
		`+ fit-margin-top="0"`
		`+ fit-margin-left="0"`
		`+ fit-margin-right="0"`
		`+ fit-margin-bottom="0"`
		`+ inkscape:window-width="1920"`
		`+ inkscape:window-height="1016"`
		`+ inkscape:window-x="0"`
		`+ inkscape:window-y="27"`
		`+ inkscape:window-maximized="1"`
		`+ inkscape:snap-bbox="true"`
		`+ inkscape:bbox-nodes="true"`
		`+ inkscape:snap-page="true"`
		`+ inkscape:snap-global="false" />`
		`+ <metadata`
		`+ id="metadata7">`
		`+ <rdf:RDF>`
		`+ <cc:Work`
		`+ rdf:about="">`
		`+ <dc:format>image/svg+xml</dc:format>`
		`+ <dc:type`
		`+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />`
		`+ <dc:title></dc:title>`
		`+ </cc:Work>`
		`+ </rdf:RDF>`
		`+ </metadata>`
		`+ <g`
		`+ inkscape:label="Layer 1"`
		`+ inkscape:groupmode="layer"`
		`+ id="layer1"`
		`+ transform="translate(-48.767028,-31.073165)">`
		`+ <g`
		`+ id="g4595"`
		`+ transform="matrix(0.45619308,0,0,0.45619308,26.519847,-9.145808)">`
		`+ <g`
		`+ id="g4624"`
		`+ transform="matrix(0.92003825,0,0,0.92003825,3.8994993,8.9046582)">`
		`+ <text`
		`+ id="text4225"`
		`+ y="106.14349"`
		`+ x="82.744614"`
		`+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555753;fill-opacity:1;stroke:none;stroke-width:0.29657274px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"`
		`+ xml:space="preserve"><tspan`
		`+ style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.86291027px;line-height:1.25;font-family:Montserrat;-inkscape-font-specification:'Montserrat Semi-Bold';fill:#555753;fill-opacity:1;stroke-width:0.29657274px"`
		`+ y="106.14349"`
		`+ x="82.744614"`
		`+ id="tspan4227"`
		`+ sodipodi:role="line">DOCS</tspan></text>`
		`+ <g`
		`+ transform="matrix(0.13021808,0,0,0.13021808,83.22229,87.323483)"`
		`+ id="g4488">`
		`+ <g`
		`+ transform="translate(-266.55899,-345.34488)"`
		`+ id="layer1-0">`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 316.7736,397.581 c 0,0 0,0 -20.53889,0 0.3327,4.45245 3.92157,7.77609 8.70715,7.77609 3.38983,0 6.31456,-1.39616 8.64094,-3.65507 0.46553,-0.46679 0.99726,-0.59962 1.59519,-0.59962 0.79781,0 1.59561,0.39932 2.12692,1.06388 0.3327,0.46553 0.53216,0.99726 0.53216,1.52857 0,0.73118 -0.3327,1.52857 -0.93106,2.12734 -2.7919,2.99052 -7.51086,4.98503 -12.16403,4.98503 -8.44149,0 -15.22074,-6.77967 -15.22074,-15.22158 0,-8.44149 6.58022,-15.22074 15.02171,-15.22074 8.37529,0 14.62323,6.51317 14.62323,15.08749 0,1.26418 -1.12924,2.12861 -2.39258,2.12861 z m -12.23065,-11.76512 c -4.45329,0 -7.51085,2.92473 -8.17499,7.17731 10.03626,0 16.35083,0 16.35083,0 -0.59836,-4.05355 -3.78874,-7.17731 -8.17584,-7.17731 z"
		`+ id="path11"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		`+ d="m 375.46344,410.80807 c -8.44106,0 -15.22074,-6.77968 -15.22074,-15.22159 0,-8.44149 6.77968,-15.22074 15.22074,-15.22074 8.44234,0 15.22159,6.77925 15.22159,15.22074 -4.2e-4,8.44149 -6.77968,15.22159 -15.22159,15.22159 z m 0,-24.65992 c -5.31688,0 -8.77377,4.25427 -8.77377,9.43833 0,5.18364 3.45689,9.43833 8.77377,9.43833 5.31731,0 8.77504,-4.25469 8.77504,-9.43833 -4.2e-4,-5.18406 -3.45773,-9.43833 -8.77504,-9.43833 z"`
		`+ id="path13"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		`+ d="m 412.66183,380.36574 c -4.45963,0 -7.40966,1.319 -10.01391,4.62956 l -0.24036,-1.53995 v 0 c -0.20198,-1.60743 -1.57326,-2.84926 -3.23382,-2.84926 -1.80139,0 -3.26206,1.459 -3.26206,3.26081 0,0.003 0,0.005 0,0.008 v 0 0.003 0 23.40712 c 0,1.79464 1.46194,3.25743 3.257,3.25743 1.79465,0 3.25744,-1.46279 3.25744,-3.25743 v -12.56209 c 0,-5.71621 4.98502,-8.57432 10.23613,-8.57432 1.59519,0 2.85726,-1.32953 2.85726,-2.92515 0,-1.59561 -1.26207,-2.85726 -2.85768,-2.85726 z"`
		`+ id="path15"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 447.02614,395.58648 c 0.0666,-8.17541 -5.78326,-15.22074 -15.222,-15.22074 -8.44192,0 -15.28779,6.77925 -15.28779,15.22074 0,8.44191 6.64684,15.22159 14.68985,15.22159 4.01434,0 7.62682,-2.06621 9.23846,-4.22518 l 0.79359,2.01434 v 0 c 0.42589,1.13177 1.5176,1.93717 2.7978,1.93717 1.65001,0 2.98756,-1.33671 2.99009,-2.98545 v 0 -7.80687 0 z m -15.222,9.43833 c -5.31773,0 -8.77419,-4.25469 -8.77419,-9.43833 0,-5.18406 3.45604,-9.43833 8.77419,-9.43833 5.3173,0 8.77419,4.25427 8.77419,9.43833 0,5.18364 -3.45689,9.43833 -8.77419,9.43833 z"
		`+ id="path17"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 355.01479,368.3337 c 0,-1.7938 -1.46194,-3.18997 -3.25659,-3.18997 -1.79422,0 -3.25743,1.39659 -3.25743,3.18997 v 17.1499 c -1.66097,-3.05756 -5.25026,-5.11786 -9.50495,-5.11786 -8.64052,0 -14.42336,6.51318 -14.42336,15.22074 0,8.70757 5.98229,15.22159 14.42336,15.22159 3.76555,0 7.03057,-1.55429 8.98587,-4.25554 l 0.72317,1.83428 c 0.44782,1.25912 1.64917,2.16024 3.06051,2.16024 1.78621,0 3.24984,-1.45435 3.24984,-3.24815 0,-0.005 0,-0.009 0,-0.0139 v 0 -38.95128 h -4.2e-4 z m -15.22116,36.69111 c -5.31731,0 -8.70715,-4.25469 -8.70715,-9.43833 0,-5.18406 3.38984,-9.43833 8.70715,-9.43833 5.31773,0 8.70714,4.0544 8.70714,9.43833 0,5.38309 -3.38941,9.43833 -8.70714,9.43833 z"
		`+ id="path19"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 287.21553,365.34023 c -0.59414,-0.0877 -1.19966,-0.13198 -1.80097,-0.13198 -6.73118,0 -12.20746,5.4767 -12.20746,12.20788 v 3.8132 h -3.98903 c -1.46237,0 -2.65908,1.19671 -2.65908,2.65781 0,1.46321 1.19671,2.93738 2.65908,2.93738 h 3.98819 v 20.46004 c 0,1.79464 1.46236,3.25743 3.25658,3.25743 1.79507,0 3.25744,-1.46279 3.25744,-3.25743 v -20.46004 h 4.40986 c 1.46194,0 2.65823,-1.47417 2.65823,-2.93738 0,-1.46152 -1.19629,-2.65823 -2.65823,-2.65823 h -4.40733 v -3.8132 c 0,-3.13852 2.55323,-6.11469 5.69175,-6.11469 0.28294,0 0.56757,0.0211 0.84672,0.062 1.78031,0.26355 3.4358,-0.54269 3.70019,-2.32342 0.2627,-1.77904 -0.96606,-3.43538 -2.74594,-3.69935 z"
		`+ id="path21"`
		`+ style="fill:#3c6eb4" />`
		`+ </g>`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		`+ d="m 181.98344,61.675273 h 2.81558 v 0.37898 h -1.18152 v 2.94935 h -0.45254 v -2.94935 h -1.18152 v -0.37898 m 3.26144,0 h 0.67101 l 0.84937,2.26496 0.85381,-2.26496 h 0.67102 v 3.32833 h -0.43917 v -2.9226 l -0.85828,2.28279 h -0.45255 l -0.85827,-2.28279 v 2.9226 h -0.43694 v -3.32833"`
		`+ id="path2391"`
		`+ style="fill:#294172;enable-background:new" />`
		`+ </g>`
		`+ <g`
		`+ id="g126"`
		`+ transform="matrix(0.63038796,0,0,0.63038796,136.33122,166.95132)">`
		`+ <g`
		`+ transform="matrix(0.83326781,0,0,0.83326781,-499.2038,-411.67682)"`
		`+ id="g132-9">`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		`+ d="m 482.01243,363.57426 c 0,-10.06788 -8.16108,-18.22938 -18.22897,-18.22938 -10.06282,0 -18.22179,8.15475 -18.22854,18.21631 l -4.2e-4,-4.2e-4 v 14.1071 l 4.2e-4,4.2e-4 c 0.005,2.28463 1.85832,4.13409 4.14463,4.13409 0.007,0 0.0127,-8.4e-4 0.0194,-8.4e-4 l 10e-4,8.4e-4 h 14.07083 v 0 c 10.06409,-0.004 18.22138,-8.16276 18.22138,-18.22812 z"`
		`+ id="path25-1"`
		`+ style="fill:#294172" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 469.13577,349.66577 c -4.72528,0 -8.55576,3.83049 -8.55576,8.55577 0,0.002 0,0.004 0,0.006 v 4.52836 h -4.51444 c -8.5e-4,0 -8.5e-4,0 -10e-4,0 -4.72528,0 -8.55576,3.81193 -8.55576,8.53678 0,4.72528 3.83048,8.55577 8.55576,8.55577 4.72486,0 8.55534,-3.83049 8.55534,-8.55577 0,-0.002 0,-0.004 0,-0.006 v -4.54733 h 4.51444 c 8.5e-4,0 0.001,0 0.002,0 4.72486,0 8.55534,-3.79296 8.55534,-8.51781 0,-4.72528 -3.83048,-8.55577 -8.55534,-8.55577 z m -8.55576,21.63483 c -0.004,2.48998 -2.02446,4.50811 -4.51571,4.50811 -2.49378,0 -4.53426,-2.02193 -4.53426,-4.5157 0,-2.49421 2.04048,-4.55366 4.53426,-4.55366 0.002,0 0.004,4.2e-4 0.006,4.2e-4 h 3.86971 c 0.001,0 0.002,-4.2e-4 0.003,-4.2e-4 0.35209,0 0.63799,0.28505 0.63799,0.63715 0,4.2e-4 -4.2e-4,8.4e-4 -4.2e-4,10e-4 v 3.92284 h -4.2e-4 z m 8.55534,-8.5448 c -0.001,0 -0.003,0 -0.004,0 h -3.87223 c -8.4e-4,0 -0.002,0 -0.002,0 -0.35252,0 -0.63757,-0.28506 -0.63757,-0.63758 v -4.2e-4 -3.90343 c 0.004,-2.49083 2.02446,-4.50854 4.51571,-4.50854 2.49378,0 4.53468,2.02193 4.53468,4.51613 4.2e-4,2.49336 -2.04048,4.53384 -4.53426,4.53384 z"
		`+ id="path29-2"`
		`+ style="fill:#3c6eb4" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		+ d="m 460.58001,362.7558 v -4.52836 c 0,-0.002 0,-0.004 0,-0.006 0,-4.72528 3.83048,-8.55577 8.55576,-8.55577 0.71685,0 1.22623,0.0805 1.88952,0.25469 0.96774,0.25385 1.75796,1.04618 1.75838,1.96922 4.2e-4,1.11575 -0.80919,1.92621 -2.0194,1.92621 -0.57642,0 -0.78473,-0.11048 -1.62892,-0.11048 -2.49125,0 -4.51149,2.01771 -4.51571,4.50854 v 3.90385 4.2e-4 c 0,0.35252 0.28505,0.63758 0.63757,0.63758 4.3e-4,0 0.001,0 0.002,0 h 2.96521 c 1.10521,0 1.99747,0.88467 1.99832,1.99283 0,1.10816 -0.89353,1.99114 -1.99832,1.99114 h -3.60489 v 4.54733 c 0,0.002 0,0.004 0,0.006 0,4.72485 -3.83048,8.55534 -8.55534,8.55534 -0.71684,0 -1.22623,-0.0805 -1.88952,-0.25469 -0.96774,-0.25343 -1.75838,-1.04618 -1.7588,-1.9688 0,-1.11575 0.80919,-1.92663 2.01982,-1.92663 0.576,0 0.78473,0.11048 1.6285,0.11048 2.49125,0 4.51191,-2.01771 4.51613,-4.50811 0,0 0,-3.92368 0,-3.9241 0,-0.35168 -0.2859,-0.63673 -0.63799,-0.63673 -4.3e-4,0 -8.5e-4,0 -0.002,0 l -2.96521,-4.2e-4 c -1.10521,0 -1.99831,-0.88214 -1.99831,-1.9903 -4.3e-4,-1.11533 0.90238,-1.99367 2.01939,-1.99367 h 3.58339 v 0 z"
		`+ id="path31-7"`
		`+ style="fill:#ffffff" />`
		`+ <path`
		`+ inkscape:connector-curvature="0"`
		`+ d="m 477.41661,378.55292 h 2.81558 v 0.37898 h -1.18152 v 2.94935 h -0.45254 v -2.94935 h -1.18152 v -0.37898 m 3.26144,0 h 0.67101 l 0.84937,2.26496 0.85381,-2.26496 h 0.67102 v 3.32833 h -0.43917 v -2.9226 l -0.85828,2.28279 h -0.45255 l -0.85827,-2.28279 v 2.9226 h -0.43694 v -3.32833"`
		`+ id="text6223-0"`
		`+ style="fill:#294172;enable-background:new" />`
		`+ </g>`
		`+ </g>`
		`+ </g>`
		`+ </g>`
		`+ </g>`
		`+ </svg>`

_stylesheets/asciibinder.css

file modified

+72 -79

		`@@ -73,35 +73,62 @@`
		`font-size: 28px;`
		`}`

		`- .page-header {`
		`- height: 100% !important;`
		`- }`
		`.page-header .img-responsive {`
		`display: inline;`
		`}`
		`- .page-header h2 {`
		`- font-size: 32px;`
		`- display: inline;`
		`- vertical-align: bottom;`
		`+`
		`+ .docs-content h1,`
		`+ .docs-content h2,`
		`+ .docs-content h3,`
		`+ .docs-content h4,`
		`+ .docs-content h5,`
		`+ .docs-content h6`
		`+ {`
		`+ font-weight: bold;`
		`+ color: #444;`
		`+ }`
		`+`
		`+ .docs-content h1{`
		`+ font-size: 1.5rem`
		`+ }`
		`+ .docs-content h2{`
		`+ font-size: 1.3rem`
		`+ }`
		`+ .docs-content h3{`
		`+ font-size: 1.1rem`
		`+ }`
		`+ .docs-content h4,`
		`+ .docs-content h5,`
		`+ .docs-content h6{`
		`+ font-size: 1rem;`
		`}`

		`- .navbar-brand {`
		`- padding: initial;`
		`- height: initial;`
		`- padding: 12px;`
		`+ .docs-content .page-header h1 {`
		`+ line-height: 1.5rem;`
		`+ padding-bottom: 0.2em;`
		`+ margin-bottom: 0.7em;`
		`+ border-bottom: 1px solid #ccc;`
		`+`
		`}`

		`- .navbar-header h2 {`
		`- display: inline;`
		`- position: absolute;`
		`- font-weight: bold;`
		`- margin-top: 50px ;`
		`+`
		`+ nav .breadcrumb{`
		`+ background: none;`
		`+ font-size:0.8em;`
		`+ padding-left:10px;`
		`+ padding-bottom:0px;`
		`}`

		`.nav > li > a.hover{`
		`background-color: none;`
		`}`

		`+ .breadcrumb-item + .breadcrumb-item::before{`
		`+ content: '\f054';`
		`+ font-family: FontAwesome;`
		`+ font-size: 0.8em;`
		`+ }`
		`+`
		`h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {`
		`position: relative;`
		`}`
		`@@ -158,21 +185,47 @@`
		`}`
		`}`

		`+ .masthead, .footer{`
		`+ position: relative;`
		`+ z-index: 1;`
		`+ }`
		`+`
		`+ .footer a{`
		`+ color:#aaa`
		`+ }`
		`+`
		`+ .footer{`
		`+ font-size:0.8em;`
		`+ box-shadow: 0px 1000px 0px 1000px #495057;`
		`+ }`
		`+`
		`+ .footer h3{`
		`+ font-size:1.3em;`
		`+ font-weight: bold;`
		`+ text-transform: uppercase;`
		`+ }`
		`+`
		`/*`
		`* Sidebar`
		`*/`

		`+ .docs-sidebar{`
		`+ background: #eee;`
		`+ box-shadow: -3000px 0 0 3000px #eee;`
		`+ }`
		`+`
		`.nav-header {`
		`font-size: 16px;`
		`}`

		`.nav-header ul {`
		`font-size: 14px;`
		`+ padding-left:1em;`
		`}`

		`.nav-header ul li a {`
		`display: block;`
		`- padding: 5px 20px 5px 25px;`
		`+ padding: 3px 0px 4px 7px;`
		`font-size: 13px;`
		`font-weight: normal;`
		`}`
		`@@ -183,8 +236,8 @@`
		`width: 14px;`
		`}`

		`- .nav-sidebar li a {`
		`- color: inherit;`
		`+ .docs-sidebar li a {`
		`+ color: #555;`
		`}`

		`.nav-sidebar li a:hover {`
		`@@ -223,66 +276,6 @@`
		`}`
		`}`

		`- /*`
		`- * Off Canvas`
		`- * --------------------------------------------------`
		`- */`
		`-`
		`- body, html {`
		`- overflow-x: hidden; /* Prevent scroll on narrow devices */`
		`- font-family: "Overpass", sans-serif;`
		`- }`
		`-`
		`- .toggle-nav {`
		`- margin-right: 20px;`
		`- }`
		`-`
		`- @media screen and (max-width: 767px) {`
		`- .row-offcanvas {`
		`- position: relative;`
		`- -webkit-transition: all .25s ease-out;`
		`- -o-transition: all .25s ease-out;`
		`- transition: all .25s ease-out;`
		`- }`
		`-`
		`- .row-offcanvas-right {`
		`- right: 0;`
		`- }`
		`-`
		`- .row-offcanvas-left {`
		`- left: 0;`
		`- }`
		`-`
		`- .row-offcanvas-right`
		`- .sidebar-offcanvas {`
		`- right: -75%; /* 8 columns */`
		`- }`
		`-`
		`- .row-offcanvas-left`
		`- .sidebar-offcanvas {`
		`- left: -75%; /* 8 columns */`
		`- }`
		`-`
		`- .row-offcanvas-right.active {`
		`- right: 75%; /* 8 columns */`
		`- }`
		`-`
		`- .row-offcanvas-left.active {`
		`- left: 75%; /* 8 columns */`
		`- }`
		`-`
		`- .sidebar-offcanvas {`
		`- overflow: hidden;`
		`- position: absolute;`
		`- top: 0;`
		`- width: 75%; /* 8 columns */`
		`- }`
		`- }`
		`-`
		`- p {`
		`- margin: 0 0 1.6em;`
		`- }`
		`-`
		`/* Remnants of Asciidoctor default stylesheet - remove styles as needed */`

		`#map_canvas img, #map_canvas embed, #map_canvas object, .map_canvas img, .map_canvas embed, .map_canvas object { max-width: none !important; }`

_templates/_breadcrumb.html.erb

file added

+14

		`@@ -0,0 +1,14 @@`
		`+ <%- navigation.each do \|topic_group\| -%>`
		`+ <%- if topic_id.start_with?(topic_group[:id]) %>`
		`+ <li class="breadcrumb-item hidden-xs active">`
		`+ <%- if topic_group.has_key?(:topics) -%>`
		`+ <a href="<%= subtopic_shim %><%= topic_group[:path] %>"><%= topic_group[:name] %></a>`
		`+ <%- else -%>`
		`+ <%= topic_group[:name] %>`
		`+ <%- end -%>`
		`+ </li>`
		`+ <%- end -%>`
		`+ <%- if topic_group.has_key?(:topics) -%>`
		`+ <%= render("_templates/_breadcrumb.html.erb", :navigation => topic_group[:topics], :topic_id => topic_id, :subtopic_shim => subtopic_shim) %>`
		`+ <%- end -%>`
		`+ <%- end -%>`

_templates/_nav.html.erb

file modified

+15 -28

		`@@ -1,31 +1,18 @@`
		`- <ul class="nav nav-sidebar">`
		`- <%- navigation.each.with_index do \|topic_group, groupidx\| -%>`
		`- <%- current_group = topic_group[:id] == group_id -%>`
		`- <li class="nav-header">`
		`- <a class="" href="#" data-toggle="collapse" data-target="#topicGroup<%= groupidx %>">`
		`- <span id="tgSpan<%= groupidx %>" class="fa <%= current_group ? 'fa-angle-down' : 'fa-angle-right' %>"></span><%= topic_group[:name] %>`
		`+ <%- navigation.each do \|topic_group\| -%>`
		`+ <%- if not topic_group.has_key?(:topics) -%>`
		`+ <%- if topic_id == topic_group[:id] %>`
		`+ <li><a class="active" href="<%= subtopic_shim %><%= topic_group[:path] %>"><%= topic_group[:name] %></a></li>`
		`+ <%- else %>`
		`+ <li><a href="<%= subtopic_shim %><%= topic_group[:path] %>"><%= topic_group[:name] %></a></li>`
		`+ <%- end %>`
		`+ <%- else -%>`
		`+ <li class="nav-header list-unstyled">`
		`+ <a class="" href="#" data-toggle="collapse" data-target="#topicGroup-<%= topic_group[:id].hash %>">`
		`+ <span id="sgSpan-<%= topic_group[:id].hash %>" class="fa <%= topic_id.start_with?(topic_group[:id]) ? 'fa-caret-down' : 'fa-caret-right' %>"></span> <%= topic_group[:name] %>`
		`</a>`
		`- <ul id="topicGroup<%= groupidx %>" class="collapse <%= current_group ? 'in' : '' %> list-unstyled">`
		`- <%- topic_group[:topics].each.with_index do \|topic, topicidx\| -%>`
		`- <%- if not topic.has_key?(:topics) -%>`
		`- <%- current_topic = current_group && (topic[:id] == topic_id) -%>`
		`- <li><a class="<%= current_topic ? ' active' : '' %>" href="<%= subtopic_shim %><%= topic[:path] %>"><%= topic[:name] %></a></li>`
		`- <%- else -%>`
		`- <%- current_subgroup = topic[:id] == subgroup_id -%>`
		`- <li class="nav-header">`
		`- <a class="" href="#" data-toggle="collapse" data-target="#topicSubGroup-<%= groupidx %>-<%= topicidx %>">`
		`- <span id="sgSpan-<%= groupidx %>-<%= topicidx %>" class="fa <%= current_subgroup ? 'fa-caret-down' : 'fa-caret-right' %>"></span> <%= topic[:name] %>`
		`- </a>`
		`- <ul id="topicSubGroup-<%= groupidx %>-<%= topicidx %>" class="nav-tertiary list-unstyled collapse<%= current_subgroup ? ' in' : '' %>">`
		`- <%- topic[:topics].each do \|subtopic\| -%>`
		`- <%- current_subtopic = current_group && current_subgroup && (subtopic[:id] == topic_id) %>`
		`- <li><a class="<%= current_subtopic ? ' active' : '' %>" href="<%= subtopic_shim %><%= subtopic[:path] %>"><%= subtopic[:name] %></a></li>`
		`- <%- end -%>`
		`- </ul>`
		`- </li>`
		`- <%- end -%>`
		`- <%- end -%>`
		`- </ul>`
		`+ <ul id="topicGroup-<%= topic_group[:id].hash %>" class="collapse <%= topic_id.start_with?(topic_group[:id]) ? 'show' : '' %> list-unstyled">`
		`+ <%= render("_templates/_nav.html.erb", :navigation => topic_group[:topics], :topic_id => topic_id, :subtopic_shim => subtopic_shim) %>`
		`+ </ul>`
		`</li>`
		`<%- end -%>`
		`- </ul>`
		`+ <%- end -%>`

_templates/_title.html.erb

file added

		`@@ -0,0 +1,8 @@`
		`+ <%- navigation.each do \|topic_group\| -%>`
		`+ <%- if topic_id.start_with?(topic_group[:id]) %>`
		`+ \| <%= topic_group[:name] %>`
		`+ <%- end -%>`
		`+ <%- if topic_group.has_key?(:topics) -%>`
		`+ <%= render("_templates/_title.html.erb", :navigation => topic_group[:topics], :topic_id => topic_id) %>`
		`+ <%- end -%>`
		`+ <%- end -%>`

_templates/page.html.erb

file modified

+71 -108

		`@@ -7,11 +7,9 @@`
		`<title><%= distro %> <%= version %> \| <%= [group_title, subgroup_title, topic_title].compact.join(' \| ') %></title>`

		`<!-- Bootstrap -->`
		`- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">`
		`- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">`
		`+ <link href="https://apps.fedoraproject.org/global/fedora-bootstrap-1.1.1/fedora-bootstrap.min.css" rel="stylesheet">`

		`- <!-- Overpass Font -->`
		`- <link rel="stylesheet" href="https://overpass-30e2.kxcdn.com/overpass.css">`
		`+ <link rel="stylesheet" href="https://apps.fedoraproject.org/global/fedora-bootstrap-fonts/open-sans.css">`

		`<%= render("_templates/_css.html.erb", :css_path => css_path) %>`

		`@@ -22,7 +20,7 @@`
		`<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>`
		`<![endif]-->`

		`- <link href="<%= File.join(images_path, "favicon32x32.png") %>" rel="shortcut icon" type="text/css">`
		`+ <link href="<%= File.join(images_path, "favicon.ico") %>" rel="shortcut icon" type="text/css">`
		`<!--[if IE]><link rel="shortcut icon" href="<%= File.join(images_path, "favicon.ico") %>"><![endif]-->`
		`<meta content="AsciiBinder" name="application-name">`
		`</head>`
		`@@ -30,88 +28,56 @@`
		`<%- if version == "Rawhide" %>`
		`<div class="corner-ribbon"><a href="https://pagure.io/fedora-docs/<%= repo_path.sub('/') {\|s\| "/blob/#{branch}/f/en-US/"} %>">Improve this Page</a></div>`
		`<%- end %>`
		`- <div class="navbar navbar-default" role="navigation">`
		`- <div class="container-fluid">`
		`- <div class="navbar-header">`
		`- <a class="navbar-brand" href="https://docs.fedoraproject.org/"><img alt="Fedora Documentation" src="<%= File.join(images_path, "fedora.svg") %>"></a>`
		`+ <div class="masthead" role="navigation">`
		`+ <div class="container">`
		`+ <div>`
		`+ <a href="https://docs.fedoraproject.org/"><img height=40px alt="Fedora Documentation" src="<%= File.join(images_path, "docs_logo.png") %>"></a>`
		`</div>`
		`+ <!--<p class="toggle-nav visible-xs pull-left">`
		`+ <button class="btn btn-default btn-sm" type="button" data-toggle="offcanvas">Toggle nav</button>`
		`+ </p>-->`
		`+ <nav aria-label="breadcrumb">`
		`+ <ol class="breadcrumb mb-0">`
		`+ <li class="breadcrumb-item active">`
		`+ <a href="<%= site_home_path %>"><%= site_name %></a>`
		`+ </li>`
		`+ <%= render("_templates/_breadcrumb.html.erb", :navigation => navigation, :group_id => group_id, :topic_id => topic_id, :subgroup_id => subgroup_id, :subtopic_shim => subtopic_shim) %>`
		`+ </ol>`
		`+ </nav>`
		`</div>`
		`</div>`
		`- <div class="container">`
		`- <p class="toggle-nav visible-xs pull-left">`
		`- <button class="btn btn-default btn-sm" type="button" data-toggle="offcanvas">Toggle nav</button>`
		`- </p>`
		`- <ol class="breadcrumb">`
		`- <li class="sitename">`
		`- <a href="<%= site_home_path %>"><%= site_name %></a>`
		`- </li>`
		`- <li class="hidden-xs active">`
		`- <%= breadcrumb_root %>`
		`- </li>`
		`- <li class="hidden-xs active">`
		`- <%= breadcrumb_group %>`
		`- </li>`
		`- <%= breadcrumb_subgroup_block %>`
		`- <li class="hidden-xs active">`
		`- <%= breadcrumb_topic %>`
		`- </li>`
		`- </ol>`
		`- <div class="row row-offcanvas row-offcanvas-left">`
		`- <div class="col-xs-8 col-sm-3 col-md-3 sidebar sidebar-offcanvas">`
		`+ <div class="bg-white">`
		`+ <div class="container">`
		`+ <div class="row">`
		`+ <div class="col-xs-8 col-sm-3 col-md-3 py-4 docs-sidebar">`
		`<%= render("_templates/_nav.html.erb", :navigation => navigation, :group_id => group_id, :topic_id => topic_id, :subgroup_id => subgroup_id, :subtopic_shim => subtopic_shim) %>`
		`- </div>`
		`- <div class="col-xs-12 col-sm-9 col-md-9 main">`
		`- <div class="page-header">`
		`- <h2><%= article_title %></h2>`
		`</div>`
		`- <%= content %>`
		`+ <div class="col-xs-12 col-sm-9 col-md-9 py-4 pl-4 docs-content">`
		`+ <div class="page-header">`
		`+ <h1><%= article_title %></h1>`
		`+ </div>`
		`+ <%= content %>`
		`+ </div>`
		`</div>`
		`</div>`
		`</div>`
		`- <div id="bottom" class="text-muted py-3" >`
		`+ <div class="footer text-white" >`
		`<div class="foot">`
		`- <div class="container">`
		`+ <div class="container py-4">`
		`<div class="row footerlinks">`
		`- <div class="col-sm-3 col-xs-6 widget">`
		`+ <div class="col-sm-2 col-xs-4 mt-3 widget">`
		`<h3 class="widget-title">About</h3>`
		`<div class="widget-body">`
		`<dl>`
		`- <dd><a href="https://fedoraproject.org/wiki/Overview">About Fedora</a></dd>`
		`+ <dd><a href="https://getfedora.org/">Get Fedora</a></dd>`
		`<dd><a href="https://getfedora.org/en/sponsors">Sponsors</a></dd>`
		`<dd><a href="https://fedoramagazine.org">Fedora Magazine</a></dd>`
		`<dd><a href="https://fedoraproject.org/wiki/Legal:Main#Legal">Legal</a></dd>`
		`</dl>`
		`- <ul class="list-inline">`
		`- <li>`
		`- <a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>`
		`- </li>`
		`- <li>`
		`- <a href="https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>`
		`- </li>`
		`- <li>`
		`- <a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>`
		`- </li>`
		`- </ul>`
		`</div>`
		`</div>`

		`- <div class="col-sm-3 col-xs-6 widget">`
		`- <h3 class="widget-title uppercase">Download</h3>`
		`- <div class="widget-body">`
		`- <dl>`
		`- <dd><a href="https://getfedora.org/en/workstation/download">Get Fedora Workstation</a></dd>`
		`- <dd><a href="https://getfedora.org/en/server/download">Get Fedora Server</a></dd>`
		`- <dd><a href="https://getfedora.org/en/atomic/download">Get Fedora Atomic</a></dd>`
		`- <dd><a href="https://spins.fedoraproject.org">Fedora Spins</a></dd>`
		`- <dd><a href="https://labs.fedoraproject.org">Fedora Labs</a></dd>`
		`- <dd><a href="https://arm.fedoraproject.org">Fedora ARM<span class="sup">®</span></a></dd>`
		`- <dd><a href="https://alt.fedoraproject.org/">Alternative Downloads</a></dd>`
		`-`
		`- </dl>`
		`- </div>`
		`- </div>`
		`-`
		`- <div class="col-sm-3 col-xs-6 widget">`
		`+ <div class="col-sm-2 col-xs-4 mt-3 widget">`
		`<h3 class="widget-title">Support</h3>`
		`<div class="widget-body">`
		`<dl>`
		`@@ -119,69 +85,66 @@`
		`<dd><a href="https://ask.fedoraproject.org/">Ask Fedora</a></dd>`
		`<dd><a href="https://fedoraproject.org/wiki/Common_F27_bugs">Common Bugs</a></dd>`
		`<dd><a href="https://developer.fedoraproject.org/">Fedora Developer Portal</a></dd>`
		`- <dd><a href="https://docs.fedoraproject.org/f27/install-guide/index.html">Installation Guide</a></dd>`
		`</dl>`
		`</div>`
		`</div>`

		`- <div class="col-sm-3 col-xs-6 widget">`
		`- <h3 class="widget-title">Join</h3>`
		`+ <div class="col-sm-2 col-xs-4 mt-3 widget">`
		`+ <h3 class="widget-title">Community</h3>`
		`<div class="widget-body">`
		`<dl>`
		`<dd><a href="https://fedoraproject.org/wiki/Join">Join Fedora</a></dd>`
		`+ <dd><a href="https://fedoraproject.org/wiki/Overview">About Fedora</a></dd>`
		`<dd><a href="http://fedoraplanet.org">Planet Fedora</a></dd>`
		`- <dd><a href="https://fedoraproject.org/wiki/SIGs">Fedora SIGs</a></dd>`
		`<dd><a href="https://admin.fedoraproject.org/accounts/">Fedora Account System</a></dd>`
		`- <dd><a href="https://fedoracommunity.org/">Fedora Community</a></dd>`
		`</dl>`
		`</div>`
		`</div>`
		`- </div> <!-- /row of widgets -->`
		`-`
		`- <div class="row">`
		`- <div class="col-md-2">`
		`- <div class="widget-body">`
		`- <a href="https://www.redhat.com/"><img class="rh-logo" src="<%= File.join(images_path, "redhat-logo.png") %>" alt="Red Hat Logo" /></a>`
		`- </div>`
		`- </div>`
		`- <div class="col-md-7">`
		`+ <div class="col-sm-6 col-xs-12 widget text-right">`
		`+ <a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-2x fa-facebook"></i></a>`
		`+ <a href="https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-2x fa-google-plus"></i></a>`
		`+ <a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-2x fa-twitter"></i></a>`
		`+ <p class="pt-3">`
		`+ © 2018 Red Hat, Inc. and others. <br/>Please send any comments or corrections`
		`+ to the <a href="https://pagure.io/fedora-docs/docs-fp-o">documentation team</a>`
		`+ </p>`
		`+ <p>`
		`+ Fedora is sponsored by Red Hat. <br/>`
		`+ <a href="https://www.redhat.com/en/technologies/linux-platforms/articles/relationship-between-fedora-and-rhel">Learn more about the relationship between Red Hat and Fedora »</a>`
		`+ </p>`
		`<div class="widget-body">`
		`- <p class="sponsor">Fedora is sponsored by Red Hat.</p>`
		`- <p class="sponsor"><a href="https://www.redhat.com/en/technologies/linux-platforms/articles/relationship-between-fedora-and-rhel">Learn more about the relationship between Red Hat and Fedora »</a></p>`
		`- <p class="copy">© 2017 Red Hat, Inc. and others. Please send any comments or corrections to the <a href="https://pagure.io/fedora-docs/docs-fp-o">documentation team</a></p>`
		`+ <a href="https://www.redhat.com/"><img height="50px" class="rh-logo" src="<%= File.join(images_path, "redhat-logo.png") %>" alt="Red Hat Logo" /></a>`
		`</div>`
		`</div>`
		`- </div> <!-- /row of widgets -->`
		`-`
		`- </div>`
		`+ </div> <!-- /row of widgets -->`
		`</div>`
		`</div>`
		`<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->`
		`<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>`
		`<!-- Latest compiled and minified JavaScript -->`
		`- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>`
		`- <script src="<%= File.join(javascripts_path, "bootstrap-offcanvas.js") %>" type="text/javascript"></script>`
		`+ <script src="https://apps.fedoraproject.org/global/fedora-bootstrap-1.1.1/fedora-bootstrap.min.js"></script>`
		`<script type="text/javascript">`
		`- /<![CDATA[/`
		`- $(document).ready(function() {`
		`- $("[id^='topicGroup']").on('show.bs.collapse', function (event) {`
		`- if (!($(event.target).attr('id').match(/^topicSubGroup/))) {`
		`- $(this).parent().find("[id^='tgSpan']").toggleClass("fa-angle-right fa-angle-down");`
		`- }`
		`- });`
		`- $("[id^='topicGroup']").on('hide.bs.collapse', function (event) {`
		`- if (!($(event.target).attr('id').match(/^topicSubGroup/))) {`
		`- $(this).parent().find("[id^='tgSpan']").toggleClass("fa-angle-right fa-angle-down");`
		`- }`
		`- });`
		`- $("[id^='topicSubGroup']").on('show.bs.collapse', function () {`
		`- $(this).parent().find("[id^='sgSpan']").toggleClass("fa-caret-right fa-caret-down");`
		`- });`
		`- $("[id^='topicSubGroup']").on('hide.bs.collapse', function () {`
		`- $(this).parent().find("[id^='sgSpan']").toggleClass("fa-caret-right fa-caret-down");`
		`+ /<![CDATA[/`
		`+ $(document).ready(function() {`
		`+ $("[id^='topicGroup']").on('show.bs.collapse', function (event) {`
		`+ if (!($(event.target).attr('id').match(/^topicSubGroup/))) {`
		`+ $(this).parent().find("[id^='tgSpan']").toggleClass("fa-angle-right fa-angle-down");`
		`+ }`
		`+ });`
		`+ $("[id^='topicGroup']").on('hide.bs.collapse', function (event) {`
		`+ if (!($(event.target).attr('id').match(/^topicSubGroup/))) {`
		`+ $(this).parent().find("[id^='tgSpan']").toggleClass("fa-angle-right fa-angle-down");`
		`+ }`
		`+ });`
		`+ $("[id^='topicSubGroup']").on('show.bs.collapse', function () {`
		`+ $(this).parent().find("[id^='sgSpan']").toggleClass("fa-caret-right fa-caret-down");`
		`+ });`
		`+ $("[id^='topicSubGroup']").on('hide.bs.collapse', function () {`
		`+ $(this).parent().find("[id^='sgSpan']").toggleClass("fa-caret-right fa-caret-down");`
		`+ });`
		`});`
		`- });`
		`- /]]>/`
		`+ /]]>/`
		`+`
		`</script>`
		`</body>`
		`</html>`

_topic_map.yml

file modified

+15 -8

		`@@ -24,16 +24,9 @@`
		`Name: Fedora Modularity`
		`Dir: en-US`
		`Topics:`
		`- # - Name: index alias`
		`- # File: index`
		`- # Alias: en-US/brian`
		`- Name: What is Modularity`
		`File: index`
		`- - Name: Using Modules in Fedora`
		`- File: Using_Modules`
		`- - Name: Making Modules`
		`- File: Making_Modules`
		`- - Name: Architecture`
		`+ - Name: How does it work`
		`Dir: architecture`
		`Topics:`
		`- Name: Main Concepts`
		`@@ -42,12 +35,26 @@`
		`File: Building_Software`
		`- Name: Consuming Software`
		`File: Consuming_Software`
		`+ - Name: Making Modules`
		`+ Dir: making-modules`
		`+ Topics:`
		`+ - Name: Naming and organizing modules`
		`+ File: Naming_and_organizing_modules`
		`+ - Name: Storing and defining sources`
		`+ File: Storing_and_defining_sources`
		`+ - Name: Building and installing`
		`+ File: Building_and_installing`
		`+ - Name: Using Modules`
		`+ File: Using_Modules`
		`- Name: Community`
		`Dir: community`
		`Topics:`
		`- Name: Communication`
		`File: Communication`
		`+ - Name: Working Groups & Teams`
		`+ File: working_groups_and_teams`
		`- Name: References`
		`File: References`
		`- Name: FAQ`
		`File: FAQ`
		`+`
		`\ No newline at end of file`

en-US/Making_Modules.adoc

file removed

-31

		`@@ -1,31 +0,0 @@`
		`- = Making Modules`
		`-`
		`- NOTE: This page is a placeholder. You can make this page more useful by submitting a pull-request to https://pagure.io/fedora-docs/modularity/`
		`-`
		`- == Overview of module files`
		`-`
		`- explain module.yaml, what it should be named, what the branch should be called, where to find the spec, some example`
		`-`
		`- == How to generate a module`
		`-`
		`- using fedmod`
		`-`
		`- == Requesting a new module`
		`-`
		`- mostly a link to the process in the wiki`
		`-`
		`- == Requesting a new module stream`
		`-`
		`- mostly a link to the process in the wiki`
		`-`
		`- == Testing your module`
		`-`
		`- how to do a local build, why there is no scratch build, using odcs with your new module`
		`-`
		`- == Publishing your module`
		`-`
		`- how to do a mbs build`
		`-`
		`-`
		`-`
		`-`

en-US/References.adoc

file modified

		`@@ -12,3 +12,8 @@`

		`https://github.com/fedora-modularity/[Modularity on GitHub]::`
		`GitHub is an alternative place for some of our repositories.`
		`+`
		`+ == Other teams and working groups`
		`+`
		`+ https://fedoraproject.org/wiki/SELinuxModularity[Modularity and SELinux]::`
		`+ Documents related to SELinux support in Modularity`
		`\ No newline at end of file`

en-US/community/working_groups_and_teams.adoc

file added

		`@@ -0,0 +1,9 @@`
		`+ = Working Groups and Teams`
		`+`
		`+ Modularity is driven by the https://fedoraproject.org/wiki/Modularity_Working_Group[Modularity Working Group]`
		`+`
		`+ However, Modularity couldn't happen without other working groups contributing a significant portion of effort into it, i.e.:`
		`+`
		`+ * https://fedoraproject.org/wiki/Server[Server Working Group]`
		`+ * https://docs.pagure.org/releng/[Fedora Release Engineering]`
		`+ * https://fedoraproject.org/wiki/Infrastructure[Fedora Infrastructure]`
		`\ No newline at end of file`

en-US/images/modularity-building-modules.png

file added

empty or binary file added

en-US/images/modularity-building-trad.png

file added

empty or binary file added

en-US/making-modules/Building_and_installing.adoc

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ = Building and installing modules`
		`+`
		`+ NOTE: This section needs some love. Mostly info about how build groups work in MBS, how to do local builds, etc.`
		`+`
		`+ All packages in a module are built as a unit. That's why we talk about module builds instead of individual package builds.`
		`+`
		`+ == Submitting a build`
		`+`
		`+ Builds are managed by _fedpkg_. To submit a build, run the following command from a local copy of your module's dist-git repository:`
		`+`
		`+ $ fedpkg module-build`
		`+`
		`+ == Some facts about modules and other packages`
		`+`
		`+ These are some facts about how modules interact with other modules both during the build, and during installation.`
		`+`
		`+ === Runtime`
		`+`
		`+ During installation, modules can:`
		`+`
		`+ * use packages from the base as dependencies`
		`+ * use other module streams as dependencies`
		`+ * override/replace other packages in base`
		`+`
		`+ === Build`
		`+`
		`+ * can use packages from the base as build dependencies`
		`+ * can use other module streams as build dependencies`
		`+ * can expand across multiple modules or bases (one source produces several binaries, Stream Expansion)`
		`\ No newline at end of file`

en-US/making-modules/Naming_and_organizing_modules.adoc

file added

+59

		`@@ -0,0 +1,59 @@`
		`+ = Naming and organizing modules`
		`+`
		`+`
		`+ Modules are uniquely identified by NSVCA which stands for _name_, _stream_, _version_, _context_, and _architecture_.`
		`+`
		`+ When creating a new module, you only need to decide about the name (name of your module, such as _nodejs_), and the stream (the flavour of your module, mostly a major version, such as _8_).`
		`+`
		`+ == Deep Dive`
		`+`
		`+ If you want more details about the whole NSVCA, continue reading.`
		`+`
		`+ === Source level ID (NSV)`
		`+`
		`+ At the source level, modules are only identified by the first three: _name_, _stream_, and _version_.`
		`+`
		`+ ==== Name`
		`+`
		`+ Name of the module corresponds to the name of the application or the language stack it represents.`
		`+`
		`+ An example of a name could be _postgresql_ for a PostgreSQL database module, or _nodejs_ for a Node.js runtime.`
		`+`
		`+ ==== Stream`
		`+`
		`+ Streams are variants of a module with a certain promise.`
		`+`
		`+ In most cases, streams promise backwards compatibility with a major version of the application or the language stack they provide. For example, let's say the Node.js runtime is supported in two major versions: 6 and 8. In this case, the module _nodejs_ would have two streams: _6_ and _8_.`
		`+`
		`+ However, streams can also promise different things such as stability. A good example of this is the _calc_ package in Fedora which is maintained in two upstream branches: _stable_ for the latest stable release and _unstable_ for the latest development version. Using modularity, this package could be built as a _calc_ module in two different streams: _stable_ and _unstable_.`
		`+`
		`+ In addition to the version promise, streams are also a way for packagers to communicate the level of maintennance. Does the maintainer plan to apply every minor patch? Will they apply security fixes quickly? Or is the module updated only twice a year? This can also be part of the promise.`
		`+`
		`+ Other different example could be a stream that provides the software compiled using some experimental flags increasing the performance.`
		`+`
		`+ Anyway, you get the idea. Streams are very flexible and powerful tool. Use them wisely.`
		`+`
		`+ ==== Version`
		`+`
		`+ Versions are just updates of a given stream. Technically, version is a number generated by the build system. Higher number always wins.`
		`+`
		`+ === Binary level ID (NSVCA)`
		`+`
		`+ Building a module from one source can result in multiple different binaries. Different binaries are typically produced for different architectures (i.e. _x86_64_, _armv7hl_, etc.) and different Fedora releases (i.e. Fedora 28, Fedora 29, EPEL 7, etc.).`
		`+`
		`+ In addition to the _name_, _stream_, and _version_ fields described above, there are two more for binaries:`
		`+`
		`+ ==== Architecture`
		`+`
		`+ https://fedoraproject.org/wiki/Architectures[ Fedora is built for many different architectures]. The architecture field simply distinguishes architecture-specific binaries from each other.`
		`+`
		`+ The value is typically the same as with RPM packages, i.e. _x86_64_, _armv7hl_, etc.`
		`+`
		`+ ==== Context`
		`+`
		`+ Context is used to distinguish binaries built for different Fedora releases. Thanks to https://fedoraproject.org/wiki/Infrastructure/Factory2/Focus/StreamExpansion[stream expansion], modules can also be built against multiple streams of other modules, i.e. different versions of a language runtime etc.`
		`+`
		`+ The value is generated by the build system and is usually hidden from the user as it doesn't have any informational value by itself — it is a hash. However, the client tooling consuming this valie can present it in a useful way.`
		`+`
		`+ One way of representing the context could be listing the Fedora releases for which a certain module has been built.`
		`+`

en-US/making-modules/Storing_and_defining_sources.adoc

file added

+126

		`@@ -0,0 +1,126 @@`
		`+ = Storing and defining module sources`
		`+`
		`+ Module sources consist of two main parts:`
		`+`
		`+ . RPM package sources`
		`+ . module definition file`
		`+`
		`+ Both of these are stored in https://src.fedoraproject.org/[Fedora dist-git]. Dist-git is organized into repositories, each having multiple branches.`
		`+`
		`+ When creating a new module, follow the https://fedoraproject.org/wiki/Modularity/Adding_New_Modules_and_Managing_Defaults[process for adding new modules to Fedora].`
		`+`
		`+ == Stream branching`
		`+`
		`+ Modularity introduced https://fedoraproject.org/wiki/Changes/ArbitraryBranching[Stream Branching] (formerly Arbitrary Branching) that is used for both module definitions and RPM packages that are part of modules.`
		`+`
		`+ === Modules`
		`+`
		+ Module definitions are stored in the `/modules` namespace and only consist of a modulemd file that defines the module itself.
		`+`
		`+ Each module has a repository with branches corresponding to different streams. The repository and branch naming map to the module ID:`
		`+`
		`+ * Repository name -> module name`
		`+ * Branch name -> stream name`
		`+ * Commit timestamp -> module version`
		`+`
		`+ === Packages`
		`+`
		+ RPM Packages are stored in the `/rpms` namespace, and are also organized into stream branches. However, only the repository name map to the name of the package:
		`+`
		`+ * Repository name -> package name`
		`+ * Branch name doesn't map to anything, but is used as a reference in the module definition.`
		`+`
		`+ == Defining modules using modulemd`
		`+`
		`+ Modules are defined using a https://pagure.io/modulemd[modulemd file]. It defines the following information:`
		`+`
		`+ * summary and description`
		`+ * list of components (srpm name + branch)`
		`+ * "build" information`
		`+ ** build groups`
		`+ ** filter`
		`+ ** macros`
		`+ ** dependencies`
		`+ * "use" information`
		`+ ** installation profiles`
		`+ ** licenses`
		`+ ** refs to community, docs, bug tracker`
		`+ ** API`
		`+`
		`+ === Example`
		`+`
		`+ WARNING: The following example is modulemd version 1 that doesn't support stream expansion. We are introducing a new version very soon.`
		`+`
		`+ modulemd.yaml`
		`+ [source,yaml]`
		`+ ----`
		`+ document: modulemd`
		`+ version: 1`
		`+ data:`
		`+ summary: An example module <1>`
		`+ description: >-`
		`+ A module for the demonstration <2>`
		`+ of the metadata format.`
		`+ license:`
		`+ module:`
		`+ - MIT <3>`
		`+ dependencies: <4>`
		`+ buildrequires:`
		`+ platform: f27`
		`+ requires:`
		`+ platform: f27`
		`+ references: <5>`
		`+ community: http://www.example.com/`
		`+ documentation: http://www.example.com/`
		`+ tracker: http://www.example.com/`
		`+ profiles: <6>`
		`+ default:`
		`+ rpms:`
		`+ - foo`
		`+ - foo-extras`
		`+ minimal:`
		`+ description: Minimal profile.`
		`+ rpms:`
		`+ - foo`
		`+ api: <7>`
		`+ rpms:`
		`+ - foo`
		`+ components: <8>`
		`+ rpms:`
		`+ foo: <9>`
		`+ rationale: Our main package. <10>`
		`+ ref: 2.4 <11>`
		`+ bar:`
		`+ rationale: Some another package.`
		`+ ref: latest`
		`+ ----`
		`+`
		`+ <1> A short summary describing the module.`
		`+`
		`+ <2> A longer summary describing the module.`
		`+`
		`+ <3> Licence of this modulemd file.`
		`+`
		`+ <4> Other modules and their streams that are used as runtime and build dependencies.`
		`+ "platform" is a reserved word for the Fedora releases.`
		`+ The stream names follow the usual short names for the releases i.e. "f26", "f27", "epel7", etc.`
		`+ In this version of modulemd (v1) there is no support for stream expansion.`
		`+ That means that only one release can be selected.`
		`+ However, in the upcoming version of modulemd (v2) there will be an option to list multiple ones.`
		`+`
		`+ <5> Various references to the upstream.`
		`+`
		`+ <6> Installation profiles that will help users to install the module.`
		`+ Keep in mind that not all the packages from the module need to be installed.`
		`+`
		`+ <7> The module's public RPM-level API.`
		`+ A list of binary RPM names that are considered to be the main and stable feature of the module`
		`+`
		`+ <8> List of packages that are part of this module.`
		`+`
		`+ <9> Name of a package.`
		`+`
		`+ <10> A rationale why the package has been included.`
		`+ This is only for humans.`
		`+`
		`+ <11> A dist-git branch of the package.`
		`\ No newline at end of file`